From 6290b75e7d51e032e20694d6c8f61c0cfbed7e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Sat, 26 Aug 2023 15:49:43 +0800
Subject: [PATCH] refactor: change SqlConnector package

---
 .../com/mybatisflex/core/activerecord/query/QueryModel.java    | 1 +
 .../com/mybatisflex/core/activerecord/query/WhereBuilder.java  | 1 +
 .../com/mybatisflex/core/{query => constant}/SqlConnector.java | 3 +--
 .../main/java/com/mybatisflex/core/query/BaseQueryWrapper.java | 1 +
 .../src/main/java/com/mybatisflex/core/query/Brackets.java     | 1 +
 .../src/main/java/com/mybatisflex/core/query/CPI.java          | 1 +
 .../main/java/com/mybatisflex/core/query/QueryCondition.java   | 2 ++
 .../java/com/mybatisflex/core/query/QueryConditionBuilder.java | 1 +
 .../src/main/java/com/mybatisflex/core/query/QueryWrapper.java | 1 +
 .../java/com/mybatisflex/core/query/QueryWrapperAdapter.java   | 1 +
 .../java/com/mybatisflex/coretest/DynamicConditionTest.java    | 1 +
 11 files changed, 12 insertions(+), 2 deletions(-)
 rename mybatis-flex-core/src/main/java/com/mybatisflex/core/{query => constant}/SqlConnector.java (96%)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
index ad7484aa..ad5344f4 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
@@ -16,6 +16,7 @@
 
 package com.mybatisflex.core.activerecord.query;
 
+import com.mybatisflex.core.constant.SqlConnector;
 import com.mybatisflex.core.constant.SqlConsts;
 import com.mybatisflex.core.query.*;
 import com.mybatisflex.core.table.TableDef;
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java
index d504d305..1d4b174f 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java
@@ -15,6 +15,7 @@
  */
 package com.mybatisflex.core.activerecord.query;
 
+import com.mybatisflex.core.constant.SqlConnector;
 import com.mybatisflex.core.query.*;
 import com.mybatisflex.core.util.LambdaGetter;
 import com.mybatisflex.core.util.LambdaUtil;
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SqlConnector.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/constant/SqlConnector.java
similarity index 96%
rename from mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SqlConnector.java
rename to mybatis-flex-core/src/main/java/com/mybatisflex/core/constant/SqlConnector.java
index 93f909bb..1ba1fabf 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SqlConnector.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/constant/SqlConnector.java
@@ -13,12 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.mybatisflex.core.query;
+package com.mybatisflex.core.constant;
 
 /**
  * @author michael
  */
-
 public enum SqlConnector {
 
 
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/BaseQueryWrapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/BaseQueryWrapper.java
index 62b18f86..46a0b03b 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/BaseQueryWrapper.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/BaseQueryWrapper.java
@@ -15,6 +15,7 @@
  */
 package com.mybatisflex.core.query;
 
+import com.mybatisflex.core.constant.SqlConnector;
 import com.mybatisflex.core.exception.FlexExceptions;
 import com.mybatisflex.core.util.CollectionUtil;
 import com.mybatisflex.core.util.ObjectUtil;
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java
index 6f102929..e99873e3 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java
@@ -15,6 +15,7 @@
  */
 package com.mybatisflex.core.query;
 
+import com.mybatisflex.core.constant.SqlConnector;
 import com.mybatisflex.core.dialect.IDialect;
 import com.mybatisflex.core.util.ObjectUtil;
 import com.mybatisflex.core.util.StringUtil;
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java
index 93c8cb8f..f58dab3a 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java
@@ -15,6 +15,7 @@
  */
 package com.mybatisflex.core.query;
 
+import com.mybatisflex.core.constant.SqlConnector;
 import com.mybatisflex.core.dialect.IDialect;
 import com.mybatisflex.core.util.CollectionUtil;
 import com.mybatisflex.core.util.StringUtil;
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryCondition.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryCondition.java
index a273bc51..1f4862b1 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryCondition.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryCondition.java
@@ -16,6 +16,7 @@
 package com.mybatisflex.core.query;
 
 
+import com.mybatisflex.core.constant.SqlConnector;
 import com.mybatisflex.core.constant.SqlConsts;
 import com.mybatisflex.core.constant.SqlOperator;
 import com.mybatisflex.core.dialect.IDialect;
@@ -38,6 +39,7 @@ public class QueryCondition implements CloneSupport<QueryCondition> {
 
     //当前条件的上一个条件
     protected QueryCondition prev;
+
     //当前条件的下一个条件
     protected QueryCondition next;
 
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java
index d00e6b2e..60f039ce 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java
@@ -15,6 +15,7 @@
  */
 package com.mybatisflex.core.query;
 
+import com.mybatisflex.core.constant.SqlConnector;
 import com.mybatisflex.core.util.LambdaGetter;
 import com.mybatisflex.core.util.LambdaUtil;
 
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
index 3ca3d6a2..e773d01f 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
@@ -16,6 +16,7 @@
 package com.mybatisflex.core.query;
 
 import com.mybatisflex.core.FlexConsts;
+import com.mybatisflex.core.constant.SqlConnector;
 import com.mybatisflex.core.constant.SqlConsts;
 import com.mybatisflex.core.constant.SqlOperator;
 import com.mybatisflex.core.dialect.DialectFactory;
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java
index d1576cbc..6f7991df 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java
@@ -15,6 +15,7 @@
  */
 package com.mybatisflex.core.query;
 
+import com.mybatisflex.core.constant.SqlConnector;
 import com.mybatisflex.core.constant.SqlOperator;
 import com.mybatisflex.core.table.TableDef;
 import com.mybatisflex.core.util.LambdaGetter;
diff --git a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java
index 4abfd151..b2b33c95 100644
--- a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java
+++ b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java
@@ -16,6 +16,7 @@
 
 package com.mybatisflex.coretest;
 
+import com.mybatisflex.core.constant.SqlConnector;
 import com.mybatisflex.core.query.*;
 import com.mybatisflex.core.util.StringUtil;
 import org.junit.Test;