Merge pull request #19 from VonChange/develop

Develop

Author: VonChange

README.md

@@ -84,3 +84,24 @@ public class JdbcMybatisTestApplication {
 ```
 
 
+
+## official spring data jdbc extend mybatis dynamic sql
+
+see spring-data-jdbc-demo
+
+configuration
+```
+@Configuration
+public class MybatisQuerySupportConfig {
+    @Bean
+    public NamedParameterJdbcOperations namedParameterJdbcOperations(DataSource dataSource) {
+        return new MybatisJdbcTemplate(dataSource) {@Override protected Dialect dialect() {return new MySQLDialect();}};
+    }
+}
+```
+use
+```
+    @Query("user.queryByUserCode")
+    List<UserDTO> queryByUserCode(@Param("userCode") String userCode);
+```
+but SpEL support became available with Spring Data JDBC 3.0 RC1 

README.zh-CN.md

@@ -7,8 +7,32 @@
 [![](https://gitee.com/vonchange/spring-data-jdbc-mybatis/badge/star.svg?theme=dark)
 ](https://gitee.com/vonchange/spring-data-jdbc-mybatis) 
 
-**spring data jdbc 扩展 mybatis 动态sql能力**
-## What Is This?
+**简单点 开发的方法简单点 繁琐的功能请省略 你有不是个AI**
+## spring data jdbc 扩展 mybatis 动态sql能力
+### spring data jdbc官方直接 扩展 mybatis动态sql能力
+
+使用方式和官方教程一直 引入spring-boot-starter-data-jdbc 即可
+只需要配置魔改的NamedParameterJdbcTemplate 即可
+```
+@Configuration
+public class MybatisQuerySupportConfig {
+    @Bean
+    public NamedParameterJdbcOperations namedParameterJdbcOperations(DataSource dataSource) {
+        return new MybatisJdbcTemplate(dataSource) {@Override protected Dialect dialect() {return new MySQLDialect();}};
+    }
+}
+```
+@Query 的ID 是user.md里面ID是queryByUserCode的sql片段
+```
+    @Query("user.queryByUserCode")
+    List<UserDTO> queryByUserCode(@Param("userCode") String userCode);
+```
+具体使用参考spring-data-jdbc-demo  
+但是 @Query spring 6(jdk17以上) 以上才支持SPEL 不支持实体参数
+通过改代码可以解决(支持mybatis版本的) 但有代码侵入性  
+无法直接 根据方法名 自动查找sql片段
+
+### 更推荐自研版本spring data jdbc扩展 mybatis动态sql能力
 * 底层 jdbcTemplate 复杂SQL才需要mybatis动态模板能力 无QueryDSL 提供crudClient 和jdbcClient
 
 * 和spring data jdbc一样的追求简单,使用jdbcTemplate,调用jdbc。不提供缓存、延迟加载、QueryDSL等JPA或mybatis的许多特性。一个简单、有限、固执己见的ORM

jdbc-mybatis/pom.xml

@@ -9,12 +9,12 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jdbc-mybatis</artifactId>
-    <version>2.5.0.1</version>
+    <version>2.5.1</version>
     <dependencies>
         <dependency>
             <groupId>com.vonchange.common</groupId>
             <artifactId>mybatis-sql-extend</artifactId>
-            <version>2.5.0.1</version>
+            <version>2.5.1</version>
         </dependency>
         <dependency>
             <groupId>com.vonchange.common</groupId>

jdbc-mybatis/src/main/java/com/vonchange/jdbc/core/CrudClient.java renamed to jdbc-mybatis/src/main/java/com/vonchange/jdbc/client/CrudClient.java

@@ -1,4 +1,4 @@
-package com.vonchange.jdbc.core;/*
+package com.vonchange.jdbc.client;/*
  * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +15,8 @@
  */
 
 
-import com.vonchange.jdbc.client.JdbcClient;
 import com.vonchange.jdbc.config.ConstantJdbc;
+import com.vonchange.jdbc.core.DefaultCrudClient;
 import com.vonchange.jdbc.mapper.AbstractPageWork;
 import com.vonchange.jdbc.model.DataSourceWrapper;
 import com.vonchange.mybatis.dialect.MySQLDialect;

jdbc-mybatis/src/main/java/com/vonchange/jdbc/core/DefaultCrudClient.java

@@ -2,6 +2,7 @@
 
 import com.vonchange.common.util.ConvertUtil;
 import com.vonchange.common.util.StringPool;
+import com.vonchange.jdbc.client.CrudClient;
 import com.vonchange.jdbc.client.JdbcClient;
 import com.vonchange.jdbc.config.ConstantJdbc;
 import com.vonchange.jdbc.config.EnumRWType;
@@ -29,7 +30,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class DefaultCrudClient implements CrudClient{
+public class DefaultCrudClient implements CrudClient {
     private static final Logger log = LoggerFactory.getLogger(DefaultCrudClient.class);
     private final MyJdbcTemplate classicOps;
     private final DataSourceWrapper dataSourceWrapper;

jdbc-mybatis/src/main/java/com/vonchange/jdbc/mybatis/MybatisJdbcTemplate.java

@@ -0,0 +1,115 @@
+package com.vonchange.jdbc.mybatis;
+
+import com.vonchange.common.util.StringPool;
+import com.vonchange.jdbc.model.SqlParam;
+import com.vonchange.jdbc.util.JdbcUtil;
+import com.vonchange.jdbc.util.MybatisTpl;
+import com.vonchange.mybatis.dialect.Dialect;
+import org.springframework.jdbc.core.JdbcOperations;
+import org.springframework.jdbc.core.PreparedStatementCreator;
+import org.springframework.jdbc.core.PreparedStatementCreatorFactory;
+import org.springframework.jdbc.core.SqlParameter;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.core.namedparam.NamedParameterUtils;
+import org.springframework.jdbc.core.namedparam.ParsedSql;
+import org.springframework.jdbc.core.namedparam.SqlParameterSource;
+import org.springframework.jdbc.support.JdbcUtils;
+import org.springframework.lang.Nullable;
+
+import javax.sql.DataSource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
+public abstract class MybatisJdbcTemplate extends NamedParameterJdbcTemplate {
+    public MybatisJdbcTemplate(DataSource dataSource) {
+        super(dataSource);
+    }
+
+    public MybatisJdbcTemplate(JdbcOperations classicJdbcTemplate) {
+        super(classicJdbcTemplate);
+    }
+
+    protected PreparedStatementCreator getPreparedStatementCreator(String sql, SqlParameterSource paramSource,
+                                                                   @Nullable Consumer<PreparedStatementCreatorFactory> customizer) {
+        Map<String,Object> param =toMap(paramSource);
+        SqlParam sqlParam = genSqlParam(sql,param);
+        if(null==sqlParam){
+            return getPreparedStatementCreatorOriginal(sql,paramSource,customizer);
+        }
+        Object[] paramObj=sqlParam.getParams().toArray();
+        List<SqlParameter> declaredParameters = buildSqlParameterList(sqlParam.getParams());
+        PreparedStatementCreatorFactory pscf = new PreparedStatementCreatorFactory(sqlParam.getSql(),declaredParameters);
+        if (customizer != null) {
+            customizer.accept(pscf);
+        }
+        return pscf.newPreparedStatementCreator(sqlParam.getSql(),paramObj);
+    }
+    protected PreparedStatementCreator getPreparedStatementCreatorOriginal(String sql, SqlParameterSource paramSource,
+                                                                           @Nullable Consumer<PreparedStatementCreatorFactory> customizer) {
+
+        ParsedSql parsedSql = getParsedSql(sql);
+        PreparedStatementCreatorFactory pscf = getPreparedStatementCreatorFactory(parsedSql, paramSource);
+        if (customizer != null) {
+            customizer.accept(pscf);
+        }
+        Object[] params = NamedParameterUtils.buildValueArray(parsedSql, paramSource, null);
+        return pscf.newPreparedStatementCreator(params);
+    }
+    protected abstract Dialect dialect();
+    private  SqlParam genSqlParam(String sql,Map<String,Object> param){
+        if(!sql.contains(StringPool.SPACE)){
+            return MybatisTpl.generate("sql."+sql,param,dialect());
+        }
+        if(sql.contains("[@")){//#{ spel 也有的 ||sql.contains("#{"
+            return MybatisTpl.generate(sql,sql,param,dialect());
+        }
+        if(sql.contains("#{")){
+           if(!sql.contains(":#{")){
+               return MybatisTpl.generate(sql,sql,param,dialect());
+           }
+        }
+        return null;
+    }
+    public static List<SqlParameter> buildSqlParameterList(Collection<?> param) {
+        List<SqlParameter> params = new ArrayList<>(param.size());
+        for (Object value : param) {
+            if(null==value){
+                params.add(new SqlParameter(JdbcUtils.TYPE_UNKNOWN));
+                continue;
+            }
+            params.add(new SqlParameter(JdbcUtil.sqlTypeFor(value.getClass())));
+        }
+        return params;
+    }
+    public static List<SqlParameter> buildSqlParameterListX(SqlParameterSource paramSource) {
+        String[] paramNames = paramSource.getParameterNames();
+        if (paramNames == null) {
+            return new ArrayList<>();
+        }
+        List<SqlParameter> params = new ArrayList<>(paramNames.length);
+        for (String paramName : paramNames) {
+            params.add(new SqlParameter(
+                    paramName, paramSource.getSqlType(paramName), paramSource.getTypeName(paramName)));
+        }
+        return params;
+    }
+
+    private Map<String,Object> toMap( SqlParameterSource paramSource){
+        String[] parameterNames = paramSource.getParameterNames();
+        Map<String,Object> map = new HashMap<>();
+        if(null==parameterNames){
+            return map;
+        }
+        for (String paramName : parameterNames) {
+            map.put(paramName,paramSource.getValue(paramName));
+        }
+        return map;
+    }
+
+
+
+}

jdbc-mybatis/src/main/java/com/vonchange/jdbc/util/JdbcUtil.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2017-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vonchange.jdbc.util;
+
+
+import org.springframework.jdbc.support.JdbcUtils;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Date;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Contains methods dealing with the quirks of JDBC, independent of any Entity, Aggregate or Repository abstraction.
+ *
+ * @author Jens Schauder
+ */
+public class JdbcUtil {
+
+	private static final Map<Class<?>, Integer> sqlTypeMappings = new HashMap<>();
+
+	static {
+
+		sqlTypeMappings.put(String.class, Types.VARCHAR);
+		sqlTypeMappings.put(BigInteger.class, Types.BIGINT);
+		sqlTypeMappings.put(BigDecimal.class, Types.NUMERIC);
+		sqlTypeMappings.put(Byte.class, Types.TINYINT);
+		sqlTypeMappings.put(byte.class, Types.TINYINT);
+		sqlTypeMappings.put(Short.class, Types.SMALLINT);
+		sqlTypeMappings.put(short.class, Types.SMALLINT);
+		sqlTypeMappings.put(Integer.class, Types.INTEGER);
+		sqlTypeMappings.put(int.class, Types.INTEGER);
+		sqlTypeMappings.put(Long.class, Types.BIGINT);
+		sqlTypeMappings.put(long.class, Types.BIGINT);
+		sqlTypeMappings.put(Double.class, Types.DOUBLE);
+		sqlTypeMappings.put(double.class, Types.DOUBLE);
+		sqlTypeMappings.put(Float.class, Types.REAL);
+		sqlTypeMappings.put(float.class, Types.REAL);
+		sqlTypeMappings.put(Boolean.class, Types.BIT);
+		sqlTypeMappings.put(boolean.class, Types.BIT);
+		sqlTypeMappings.put(byte[].class, Types.VARBINARY);
+		sqlTypeMappings.put(Date.class, Types.DATE);
+		sqlTypeMappings.put(Time.class, Types.TIME);
+		sqlTypeMappings.put(Timestamp.class, Types.TIMESTAMP);
+	}
+
+	public static int sqlTypeFor(Class<?> type) {
+		return sqlTypeMappings.keySet().stream() //
+				.filter(k -> k.isAssignableFrom(type)) //
+				.findFirst() //
+				.map(sqlTypeMappings::get) //
+				.orElse(JdbcUtils.TYPE_UNKNOWN);
+	}
+}

mybatis-sql-extend-test/pom.xml

@@ -14,7 +14,7 @@
     <artifactId>mybatis-sql-extend-test</artifactId>
     <version>2.5.0</version>
     <properties>
-        <spring.jdbc.mybatis>2.5.0</spring.jdbc.mybatis>
+        <spring.jdbc.mybatis>2.5.1</spring.jdbc.mybatis>
         <mysql-connector-java.version>8.0.15</mysql-connector-java.version>
     </properties>
 <dependencies>

mybatis-sql-extend/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mybatis-sql-extend</artifactId>
-    <version>2.5.0.1</version>
+    <version>2.5.1</version>
     <dependencies>
         <dependency>
             <groupId>com.vonchange.common</groupId>

mybatis-sql-extend/src/main/java/com/vonchange/mybatis/dialect/H2MySqlDialect.java

@@ -0,0 +1,18 @@
+package com.vonchange.mybatis.dialect;
+
+public class H2MySqlDialect extends MySQLDialect {
+    @Override
+    public int getBigDataFetchSize() {
+        return 500;
+    }
+
+    @Override
+    public int getFetchSize() {
+        return -1;
+    }
+
+    @Override
+    public String getDialogName() {
+        return "h2-mysql";
+    }
+}