You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/05/15 06:20:14 UTC
[shardingsphere] branch master updated: Make jooq as default translator (#17659)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 7e62c955845 Make jooq as default translator (#17659)
7e62c955845 is described below
commit 7e62c955845987f0ec0cd28fda686fea9d645ead
Author: iisheng <op...@gmail.com>
AuthorDate: Sun May 15 14:20:06 2022 +0800
Make jooq as default translator (#17659)
* Make jooq as default translator
* Add spring-tx and spring-jdbc dependencies
Co-authored-by: zhangliang <zh...@apache.org>
---
pom.xml | 12 ++++++++++++
shardingsphere-infra/shardingsphere-infra-rewrite/pom.xml | 5 +++++
.../shardingsphere-jdbc-core-spring-boot-starter/pom.xml | 8 ++++++++
.../shardingsphere/sqltranslator/jooq/JooQSQLTranslator.java | 5 +++++
.../sqltranslator/natived/NativeSQLTranslator.java | 5 -----
.../shardingsphere-integration-test-scaling/pom.xml | 1 -
6 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 28dccea780a..4076f15a895 100644
--- 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
index 789d04f9282..f95f0047dad 100644
--- 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/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/pom.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/pom.xml
index 3e5e33fc5b3..37490e3385e 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/pom.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/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/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-jooq-provider/src/main/java/org/apache/shardingsphere/sqltranslator/jooq/JooQSQLTranslator.java b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-jooq-provider/src/main/java/org/apache/shardingsphere/sqltranslator/jooq/JooQSQLTranslator.java
index 18b62ed41b6..c69f59b38f8 100644
--- a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-jooq-provider/src/main/java/org/apache/shardingsphere/sqltranslator/jooq/JooQSQLTranslator.java
+++ b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-jooq-provider/src/main/java/org/apache/shardingsphere/sqltranslator/jooq/JooQSQLTranslator.java
@@ -46,4 +46,9 @@ public final class JooQSQLTranslator implements SQLTranslator {
public String getType() {
return "JOOQ";
}
+
+ @Override
+ public boolean isDefault() {
+ return true;
+ }
}
diff --git a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-native-provider/src/main/java/org/apache/shardingsphere/sqltranslator/natived/NativeSQLTranslator.java b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-native-provider/src/main/java/org/apache/shardingsphere/sqltranslator/natived/NativeSQLTranslator.java
index f1bde814bca..62eecf32c9c 100644
--- a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-native-provider/src/main/java/org/apache/shardingsphere/sqltranslator/natived/NativeSQLTranslator.java
+++ b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-native-provider/src/main/java/org/apache/shardingsphere/sqltranslator/natived/NativeSQLTranslator.java
@@ -36,9 +36,4 @@ public final class NativeSQLTranslator implements SQLTranslator {
public String getType() {
return "NATIVE";
}
-
- @Override
- public boolean isDefault() {
- return true;
- }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/pom.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/pom.xml
index 075296d0e5b..d38bf0ecd89 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/pom.xml
+++ b/shardingsphere-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>