Merge branch 'dev' of https://github.com/babyfish-ct/jimmer into dev

Author: babyfish-ct

benchmark/build.gradle.kts

@@ -36,6 +36,7 @@ dependencies {
     implementation(libs.easyquery)
     implementation(libs.apijson)
     implementation(libs.apijson.framework)
+    implementation(libs.mug.safesql)
     implementation(libs.jmh.core)
     annotationProcessor(libs.jmh.generator.annprocess)
 

benchmark/gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
-kotlin = "1.9.25"
-ksp = "1.9.25-1.0.20"
+kotlin = "2.2.0"
+ksp = "2.2.0+"
 springboot = "2.7.0"
 spring-dependency-management = "1.1.6"
-jimmer = "0.9.10"
+jimmer = "0.9.104"
 eclipselink = "3.78.0"
 jooq = "3.16.6"
 mybatis = "2.2.2"
@@ -16,6 +16,7 @@ easyquery = "2.0.102"
 jmh = "1.37"
 h2 = "2.3.232"
 apijson = "6.3.0"
+mug = "9.1"
 
 [libraries]
 spring-boot-jdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc", version.ref = "springboot" }
@@ -40,6 +41,7 @@ jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess"
 h2 = { module = "com.h2database:h2", version.ref = "h2" }
 apijson = { module = "com.github.Tencent:APIJSON", version.ref = "apijson" }
 apijson-framework = { module = "com.github.APIJSON:apijson-framework", version.ref = "apijson" }
+mug-safesql = { module = "com.google.mug:mug-safesql", version.ref = "mug" }
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

benchmark/src/main/java/org/babyfish/jimmer/benchmark/OrmBenchmark.java

@@ -15,6 +15,7 @@
 import org.babyfish.jimmer.benchmark.jooq.JooqData;
 import org.babyfish.jimmer.benchmark.jooq.JooqDataTable;
 import org.babyfish.jimmer.benchmark.ktorm.KtormDataTable;
+import org.babyfish.jimmer.benchmark.mug.MugSafeSql;
 import org.babyfish.jimmer.benchmark.mybatis.MyBatisDataMapper;
 import org.babyfish.jimmer.benchmark.mybatis.plus.MyBatisPlusDataBaseMapper;
 import org.babyfish.jimmer.benchmark.nutz.NutzData;
@@ -75,6 +76,8 @@ public class OrmBenchmark {
 
     private APIJSONCreator<Long> apijsonCreator;
 
+    private MugSafeSql mug;
+
     @Setup
     public void initialize() throws SQLException, IOException {
         ApplicationContext ctx = SpringApplication.run(BenchmarkApplication.class);
@@ -106,6 +109,7 @@ public void initialize() throws SQLException, IOException {
         FakeObjSqlLoggerFactory.init();
 
         apijsonCreator = ctx.getBean(APIJSONCreator.class);
+        mug = ctx.getBean(MugSafeSql.class);
     }
 
     /*
@@ -244,6 +248,11 @@ public void runApiJson() {
                 "}");
     }
 
+    @Benchmark
+    public void runMug() {
+        mug.execute();
+    }
+
     @TearDown
     public void shutdown() {
         easyQueryClient.getRuntimeContext().getEasyTimeJobManager().shutdown();

benchmark/src/main/java/org/babyfish/jimmer/benchmark/mug/MugSafeSql.java

@@ -0,0 +1,21 @@
+package org.babyfish.jimmer.benchmark.mug;
+
+import com.google.mu.safesql.SafeSql;
+import org.springframework.stereotype.Component;
+
+import javax.sql.DataSource;
+
+@Component
+public class MugSafeSql {
+
+    private final DataSource dataSource;
+
+    public MugSafeSql(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+
+    public void execute() {
+        SafeSql.of("SELECT ID, VALUE_1, VALUE_2,  VALUE_3, VALUE_4, VALUE_5, VALUE_6, VALUE_7, VALUE_8, VALUE_9 FROM DATA").query(dataSource, MugSafeSqlData.class);
+    }
+}

benchmark/src/main/java/org/babyfish/jimmer/benchmark/mug/MugSafeSqlData.java

@@ -0,0 +1,73 @@
+package org.babyfish.jimmer.benchmark.mug;
+
+import com.google.mu.safesql.SqlName;
+
+/**
+ * @author Enaium
+ */
+public class MugSafeSqlData {
+
+    private final long id;
+    private final String value1;
+    private final String value2;
+    private final String value3;
+    private final String value4;
+    private final String value5;
+    private final String value6;
+    private final String value7;
+    private final String value8;
+    private final String value9;
+
+    public MugSafeSqlData(@SqlName("ID") long id, @SqlName("VALUE_1") String value1, @SqlName("VALUE_2") String value2, @SqlName("VALUE_3") String value3, @SqlName("VALUE_4") String value4, @SqlName("VALUE_5") String value5, @SqlName("VALUE_6") String value6, @SqlName("VALUE_7") String value7, @SqlName("VALUE_8") String value8, @SqlName("VALUE_9") String value9) {
+        this.id = id;
+        this.value1 = value1;
+        this.value2 = value2;
+        this.value3 = value3;
+        this.value4 = value4;
+        this.value5 = value5;
+        this.value6 = value6;
+        this.value7 = value7;
+        this.value8 = value8;
+        this.value9 = value9;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getValue1() {
+        return value1;
+    }
+
+    public String getValue2() {
+        return value2;
+    }
+
+    public String getValue3() {
+        return value3;
+    }
+
+    public String getValue4() {
+        return value4;
+    }
+
+    public String getValue5() {
+        return value5;
+    }
+
+    public String getValue6() {
+        return value6;
+    }
+
+    public String getValue7() {
+        return value7;
+    }
+
+    public String getValue8() {
+        return value8;
+    }
+
+    public String getValue9() {
+        return value9;
+    }
+}