Make jooq as default translator (apache#17659)

* Make jooq as default translator * Add spring-tx and spring-jdbc dependencies Co-authored-by: zhangliang <[email protected]>
jesesun · May 15, 2022 · 7e62c95 · 7e62c95
1 parent 3235922
commit 7e62c95
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -456,6 +456,18 @@
                 <version>${springframework.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-tx</artifactId>
+                <version>${springframework.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-jdbc</artifactId>
+                <version>${springframework.version}</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter</artifactId>

diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/pom.xml b/shardingsphere-infra/shardingsphere-infra-rewrite/pom.xml
@@ -43,5 +43,10 @@
             <artifactId>shardingsphere-sql-translator-native-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-sql-translator-jooq-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...ring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/pom.xml b/...ring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/pom.xml
@@ -91,6 +91,14 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>

diff --git a/...rovider/src/main/java/org/apache/shardingsphere/sqltranslator/jooq/JooQSQLTranslator.java b/...rovider/src/main/java/org/apache/shardingsphere/sqltranslator/jooq/JooQSQLTranslator.java
@@ -46,4 +46,9 @@ public String translate(final String sql, final SQLStatement statement, final Da
     public String getType() {
         return "JOOQ";
     }
+
+    @Override
+    public boolean isDefault() {
+        return true;
+    }
 }
diff --git a/...er/src/main/java/org/apache/shardingsphere/sqltranslator/natived/NativeSQLTranslator.java b/...er/src/main/java/org/apache/shardingsphere/sqltranslator/natived/NativeSQLTranslator.java
@@ -36,9 +36,4 @@ public String translate(final String sql, final SQLStatement statement, final Da
     public String getType() {
         return "NATIVE";
     }
-
-    @Override
-    public boolean isDefault() {
-        return true;
-    }
 }
diff --git a/...here-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/pom.xml b/...here-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/pom.xml
@@ -67,7 +67,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
-            <version>${springframework.version}</version>
             <scope>test</scope>
         </dependency>