Merge remote-tracking branch 'origin/master'

bes2008 · Jun 13, 2022 · 1a03780 · 1a03780
2 parents ea2c70d + 5e18e8f
commit 1a03780
Show file tree

Hide file tree

Showing 53 changed files with 850 additions and 85 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.fangjinuo.sqlhelper</groupId>
     <artifactId>sqlhelper</artifactId>
-    <version>3.6.12</version>
+    <version>3.6.13</version>
     <name>${groupId}:${artifactId}:${version}</name>
     <description>
         JDBC Extensions:
@@ -89,7 +89,6 @@
         <mybatis.plus_3x.version>3.4.1</mybatis.plus_3x.version>
         -->
         <mybatis.plus_3x.version>3.4.2</mybatis.plus_3x.version>
-
         <mybatis.plus_2x.version>2.3.3</mybatis.plus_2x.version>
         <junit.version>4.13.1</junit.version>
         <spring.boot.version>1.5.22.RELEASE</spring.boot.version>

diff --git a/sqlhelper-batchinsert/pom.xml b/sqlhelper-batchinsert/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper</groupId>
         <artifactId>sqlhelper</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-cli-assembly/pom.xml b/sqlhelper-cli-assembly/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper</groupId>
         <artifactId>sqlhelper</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-cli/pom.xml b/sqlhelper-cli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper</groupId>
         <artifactId>sqlhelper</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-common/pom.xml b/sqlhelper-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper</groupId>
         <artifactId>sqlhelper</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-datasource-flyway/pom.xml b/sqlhelper-datasource-flyway/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper</groupId>
         <artifactId>sqlhelper</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-datasource/pom.xml b/sqlhelper-datasource/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper</groupId>
         <artifactId>sqlhelper</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-dbutils/pom.xml b/sqlhelper-dbutils/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper</groupId>
         <artifactId>sqlhelper</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-dialect/pom.xml b/sqlhelper-dialect/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper</groupId>
         <artifactId>sqlhelper</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-dialect/src/main/java/com/jn/sqlhelper/dialect/parameter/BaseQueryParameters.java b/sqlhelper-dialect/src/main/java/com/jn/sqlhelper/dialect/parameter/BaseQueryParameters.java
@@ -1,18 +1,4 @@
 
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the LGPL, Version 3.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at  http://www.gnu.org/licenses/lgpl-3.0.html
- *
- * 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.jn.sqlhelper.dialect.parameter;
 
 import com.jn.langx.util.collection.Collects;

diff --git a/sqlhelper-ebean/pom.xml b/sqlhelper-ebean/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper</groupId>
         <artifactId>sqlhelper</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-examples/pom.xml b/sqlhelper-examples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper</groupId>
         <artifactId>sqlhelper</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.fangjinuo.sqlhelper.examples</groupId>

diff --git a/sqlhelper-examples/sqlhelper-examples-client/pom.xml b/sqlhelper-examples/sqlhelper-examples-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper.examples</groupId>
         <artifactId>sqlhelper-examples</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-examples/sqlhelper-examples-client/sqlhelper-examples-client-feign/pom.xml b/sqlhelper-examples/sqlhelper-examples-client/sqlhelper-examples-client-feign/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper.examples.client</groupId>
         <artifactId>sqlhelper-examples-client</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-examples/sqlhelper-examples-client/sqlhelper-examples-client-sqlline/pom.xml b/sqlhelper-examples/sqlhelper-examples-client/sqlhelper-examples-client-sqlline/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper.examples.client</groupId>
         <artifactId>sqlhelper-examples-client</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-examples/sqlhelper-examples-db/pom.xml b/sqlhelper-examples/sqlhelper-examples-db/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.fangjinuo.sqlhelper.examples</groupId>
         <artifactId>sqlhelper-examples</artifactId>
-        <version>3.6.12</version>
+        <version>3.6.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sqlhelper-examples/sqlhelper-examples-db/src/main/resources/test.h2.db b/sqlhelper-examples/sqlhelper-examples-db/src/main/resources/test.h2.db