From 08e2f0a0af8d13729728a1ddec22fc0cbefe8098 Mon Sep 17 00:00:00 2001 From: Ling Hengqian Date: Fri, 1 Sep 2023 13:44:13 +0800 Subject: [PATCH] Refactor Contribution Guidelines and unit tests (#559) --- CONTRIBUTING.md | 14 +++++++++++++- .../fixture/AddRemoveDatasourceTest.java | 2 +- .../fixture/LoadDatasourceFromJDBCTest.java | 4 ++-- .../datasource/fixture/NestDataSourceTest.java | 7 +++---- .../dynamic/datasource/fixture/SPELTest.java | 2 +- .../fixture/service/nest/StudentService.java | 5 +++-- .../fixture/service/nest/TeacherService.java | 4 ++-- .../resources/db/add-remove-datasource.sql | 18 ++++++++---------- .../db/spring-expression-language.sql | 5 ++--- .../fixture/AddRemoveDatasourceTest.java | 2 +- .../fixture/LoadDatasourceFromJDBCTest.java | 4 ++-- .../datasource/fixture/NestDataSourceTest.java | 7 +++---- .../dynamic/datasource/fixture/SPELTest.java | 2 +- .../fixture/service/nest/StudentService.java | 5 +++-- .../fixture/service/nest/TeacherService.java | 4 ++-- .../resources/db/add-remove-datasource.sql | 18 ++++++++---------- .../db/spring-expression-language.sql | 5 ++--- 17 files changed, 57 insertions(+), 51 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f79bfc9..e027525 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,17 @@ # FORK +Git Mirror 位于 https://github.com/baomidou/dynamic-datasource 。 + # RUN TEST -# PR \ No newline at end of file +此项目在 OpenJDK 17 下完成构建，输出产物指向 OpenJDK 7。 + +当项目导入 IntelliJ IDEA 或 VSCode 时，IDE 对项目的语言级别应当设置为 7。 +对于单独的 `com.baomidou:dynamic-datasource-spring-boot3-starter` 子模块，IDE 的语言级别应当设置为 17。 + +提交 PR 前，应在 OpenJDK 17 下执行 `./mvnw -T1C -B clean test` 以验证更改是否未破坏单元测试。若有需要请补充或更改单元测试。 + +# PR + +PR 应提交到位于 Github 的 Git Mirror，即 https://github.com/baomidou/dynamic-datasource 。 +位于 Github Actions 的 CI 将在 OpenJDK 8 和 OpenJDK 17 下对 PR 对应分支执行对应的单元测试。 diff --git a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/AddRemoveDatasourceTest.java b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/AddRemoveDatasourceTest.java index 4ee735e..064e034 100644 --- a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/AddRemoveDatasourceTest.java +++ b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/AddRemoveDatasourceTest.java @@ -53,7 +53,7 @@ public class AddRemoveDatasourceTest { dataSourceProperty.setUsername("sa"); dataSourceProperty.setPassword(""); dataSourceProperty.setType(SimpleDriverDataSource.class); - dataSourceProperty.setUrl("jdbc:h2:mem:test1;MODE=MySQL"); + dataSourceProperty.setUrl("jdbc:h2:mem:test1"); dataSourceProperty.setDriverClassName("org.h2.Driver"); DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource; ds.addDataSource(dataSourceProperty.getPoolName(), dataSourceCreator.createDataSource(dataSourceProperty)); diff --git a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/LoadDatasourceFromJDBCTest.java b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/LoadDatasourceFromJDBCTest.java index e884d28..b93364c 100644 --- a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/LoadDatasourceFromJDBCTest.java +++ b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/LoadDatasourceFromJDBCTest.java @@ -64,7 +64,7 @@ class LoadDatasourceFromJDBCApplication { @Bean public DynamicDataSourceProvider dynamicDataSourceProvider(DefaultDataSourceCreator dataSourceCreator) { - return new AbstractJdbcDataSourceProvider(dataSourceCreator, "org.h2.Driver", "jdbc:h2:mem:test;MODE=MySQL", "sa", "") { + return new AbstractJdbcDataSourceProvider(dataSourceCreator, "org.h2.Driver", "jdbc:h2:mem:test", "sa", "") { @Override protected Map executeStmt(Statement statement) throws SQLException { statement.execute("CREATE TABLE IF NOT EXISTS `DB`\n" + @@ -75,7 +75,7 @@ class LoadDatasourceFromJDBCApplication { " `url` VARCHAR(30) NULL DEFAULT NULL,\n" + " `driver` VARCHAR(30) NULL DEFAULT NULL\n" + ")"); - statement.executeUpdate("insert into DB values ('master','sa','','jdbc:h2:mem:test;MODE=MySQL','org.h2.Driver')"); + statement.executeUpdate("insert into DB values ('master','sa','','jdbc:h2:~/test','org.h2.Driver')"); statement.executeUpdate("insert into DB values ('db1','sa','','jdbc:h2:mem:test2','org.h2.Driver')"); statement.executeUpdate("insert into DB values ('db2','sa','','jdbc:h2:mem:test3','org.h2.Driver')"); statement.executeUpdate("insert into DB values ('db3','sa','','jdbc:h2:mem:test4','org.h2.Driver')"); diff --git a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/NestDataSourceTest.java b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/NestDataSourceTest.java index 64363d0..14ab628 100644 --- a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/NestDataSourceTest.java +++ b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/NestDataSourceTest.java @@ -21,7 +21,6 @@ import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator; import com.baomidou.dynamic.datasource.fixture.service.nest.SchoolService; import com.baomidou.dynamic.datasource.fixture.service.nest.Student; import com.baomidou.dynamic.datasource.fixture.service.nest.StudentService; -import com.baomidou.dynamic.datasource.fixture.service.nest.Teacher; import com.baomidou.dynamic.datasource.fixture.service.nest.TeacherService; import org.junit.Test; import org.junit.runner.RunWith; @@ -69,10 +68,10 @@ public class NestDataSourceTest { assertThat(ds.getDataSources().keySet()).contains("master", "teacher", "student"); assertThat(teacherService.addTeacherWithTx("ss", 1)).isEqualTo(1); assertThat(studentService.addStudentWithTx("tt", 2)).isEqualTo(1); - assertThat(teacherService.selectTeachers()).isEqualTo(Collections.singletonList(new Teacher(1, "tt", 2))); + assertThat(teacherService.selectTeachers()).isEmpty(); assertThat(studentService.selectStudents()).isEqualTo(Collections.singletonList(new Student(1, "tt", 2))); assertThat(schoolService.addTeacherAndStudentWithTx()).isEqualTo(2); - assertThat(teacherService.selectTeachers()).isEqualTo(Arrays.asList(new Teacher(1, "tt", 2), new Teacher(2, "bb", 4))); + assertThat(teacherService.selectTeachers()).isEmpty(); assertThat(studentService.selectStudents()).isEqualTo(Arrays.asList(new Student(1, "tt", 2), new Student(2, "bb", 4))); } @@ -80,7 +79,7 @@ public class NestDataSourceTest { DataSourceProperty result = new DataSourceProperty(); result.setPoolName(poolName); result.setDriverClassName("org.h2.Driver"); - result.setUrl("jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM 'classpath:db/add-remove-datasource.sql'"); + result.setUrl("jdbc:h2:mem:" + poolName + ";INIT=RUNSCRIPT FROM 'classpath:db/add-remove-datasource.sql'"); result.setUsername("sa"); result.setPassword(""); return result; diff --git a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/SPELTest.java b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/SPELTest.java index 82b1144..0c50979 100644 --- a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/SPELTest.java +++ b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/SPELTest.java @@ -103,7 +103,7 @@ public class SPELTest { DataSourceProperty result = new DataSourceProperty(); result.setPoolName(poolName); result.setDriverClassName("org.h2.Driver"); - result.setUrl("jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM 'classpath:db/spring-expression-language.sql'"); + result.setUrl("jdbc:h2:mem:" + poolName + ";INIT=RUNSCRIPT FROM 'classpath:db/spring-expression-language.sql'"); result.setUsername("sa"); result.setPassword(""); return result; diff --git a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/StudentService.java b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/StudentService.java index 53c4815..4eaf068 100644 --- a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/StudentService.java +++ b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/StudentService.java @@ -40,7 +40,8 @@ public class StudentService { @Transactional public int addStudentWithTx(String name, Integer age) { - try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement("insert into student (name,age) values (?,?)")) { + try (Connection connection = dataSource.getConnection(); + PreparedStatement preparedStatement = connection.prepareStatement("insert into student (`name`,age) values (?,?)")) { preparedStatement.setString(1, name); preparedStatement.setInt(2, age); return preparedStatement.executeUpdate(); @@ -51,7 +52,7 @@ public class StudentService { public int addStudentNoTx(String name, Integer age) { try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("insert into student (name,age) values (?,?)")) { + PreparedStatement preparedStatement = connection.prepareStatement("insert into student (`name`,age) values (?,?)")) { preparedStatement.setString(1, name); preparedStatement.setInt(2, age); return preparedStatement.executeUpdate(); diff --git a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/TeacherService.java b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/TeacherService.java index dda872f..868a74e 100644 --- a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/TeacherService.java +++ b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/TeacherService.java @@ -41,7 +41,7 @@ public class TeacherService { @Transactional public int addTeacherWithTx(String name, Integer age) { try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("insert into teacher (name,age) values (?,?)")) { + PreparedStatement preparedStatement = connection.prepareStatement("insert into teacher (`name`,age) values (?,?)")) { preparedStatement.setString(1, name); preparedStatement.setInt(2, age); return preparedStatement.executeUpdate(); @@ -53,7 +53,7 @@ public class TeacherService { public int addTeacherNoTx(String name, Integer age) { try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("insert into teacher (name,age) values (?,?)")) { + PreparedStatement preparedStatement = connection.prepareStatement("insert into teacher (`name`,age) values (?,?)")) { preparedStatement.setString(1, name); preparedStatement.setInt(2, age); return preparedStatement.executeUpdate(); diff --git a/dynamic-datasource-spring-boot-starter/src/test/resources/db/add-remove-datasource.sql b/dynamic-datasource-spring-boot-starter/src/test/resources/db/add-remove-datasource.sql index 97e13ac..6371362 100644 --- a/dynamic-datasource-spring-boot-starter/src/test/resources/db/add-remove-datasource.sql +++ b/dynamic-datasource-spring-boot-starter/src/test/resources/db/add-remove-datasource.sql @@ -1,15 +1,13 @@ -CREATE TABLE IF NOT EXISTS TEACHER +CREATE TABLE IF NOT EXISTS teacher ( - id BIGINT(20) NOT NULL AUTO_INCREMENT, - name VARCHAR(30) NULL DEFAULT NULL, - age INT(11) NULL DEFAULT NULL, - PRIMARY KEY (id) + `id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `name` VARCHAR(30) NULL DEFAULT NULL, + age INT NULL DEFAULT NULL ); -CREATE TABLE IF NOT EXISTS STUDENT +CREATE TABLE IF NOT EXISTS student ( - id BIGINT(20) NOT NULL AUTO_INCREMENT, - name VARCHAR(30) NULL DEFAULT NULL, - age INT(11) NULL DEFAULT NULL, - PRIMARY KEY (id) + `id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `name` VARCHAR(30) NULL DEFAULT NULL, + age INT NULL DEFAULT NULL ); diff --git a/dynamic-datasource-spring-boot-starter/src/test/resources/db/spring-expression-language.sql b/dynamic-datasource-spring-boot-starter/src/test/resources/db/spring-expression-language.sql index 5f426ae..ea7ad1d 100644 --- a/dynamic-datasource-spring-boot-starter/src/test/resources/db/spring-expression-language.sql +++ b/dynamic-datasource-spring-boot-starter/src/test/resources/db/spring-expression-language.sql @@ -1,7 +1,6 @@ CREATE TABLE IF NOT EXISTS t_user ( - id BIGINT(20) NOT NULL AUTO_INCREMENT, + id BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, name VARCHAR(30) NULL DEFAULT NULL, - age INT(11) NULL DEFAULT NULL, - PRIMARY KEY (id) + age INT NULL DEFAULT NULL ); diff --git a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/AddRemoveDatasourceTest.java b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/AddRemoveDatasourceTest.java index 384317b..4199696 100644 --- a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/AddRemoveDatasourceTest.java +++ b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/AddRemoveDatasourceTest.java @@ -50,7 +50,7 @@ public class AddRemoveDatasourceTest { dataSourceProperty.setUsername("sa"); dataSourceProperty.setPassword(""); dataSourceProperty.setType(SimpleDriverDataSource.class); - dataSourceProperty.setUrl("jdbc:h2:mem:test1;MODE=MySQL"); + dataSourceProperty.setUrl("jdbc:h2:mem:test1"); dataSourceProperty.setDriverClassName("org.h2.Driver"); DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource; ds.addDataSource(dataSourceProperty.getPoolName(), dataSourceCreator.createDataSource(dataSourceProperty)); diff --git a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/LoadDatasourceFromJDBCTest.java b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/LoadDatasourceFromJDBCTest.java index b87e2ea..753b9b1 100644 --- a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/LoadDatasourceFromJDBCTest.java +++ b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/LoadDatasourceFromJDBCTest.java @@ -61,7 +61,7 @@ class LoadDatasourceFromJDBCApplication { @Bean public DynamicDataSourceProvider dynamicDataSourceProvider(DefaultDataSourceCreator dataSourceCreator) { - return new AbstractJdbcDataSourceProvider(dataSourceCreator, "org.h2.Driver", "jdbc:h2:mem:test;MODE=MySQL", "sa", "") { + return new AbstractJdbcDataSourceProvider(dataSourceCreator, "org.h2.Driver", "jdbc:h2:mem:test", "sa", "") { @Override protected Map executeStmt(Statement statement) throws SQLException { statement.execute(""" @@ -73,7 +73,7 @@ class LoadDatasourceFromJDBCApplication { `url` VARCHAR(30) NULL DEFAULT NULL, `driver` VARCHAR(30) NULL DEFAULT NULL )"""); - statement.executeUpdate("insert into DB values ('master','sa','','jdbc:h2:mem:test;MODE=MySQL','org.h2.Driver')"); + statement.executeUpdate("insert into DB values ('master','sa','','jdbc:h2:~/test','org.h2.Driver')"); statement.executeUpdate("insert into DB values ('db1','sa','','jdbc:h2:mem:test2','org.h2.Driver')"); statement.executeUpdate("insert into DB values ('db2','sa','','jdbc:h2:mem:test3','org.h2.Driver')"); statement.executeUpdate("insert into DB values ('db3','sa','','jdbc:h2:mem:test4','org.h2.Driver')"); diff --git a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/NestDataSourceTest.java b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/NestDataSourceTest.java index 1350ce4..e0d4219 100644 --- a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/NestDataSourceTest.java +++ b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/NestDataSourceTest.java @@ -21,7 +21,6 @@ import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator; import com.baomidou.dynamic.datasource.fixture.service.nest.SchoolService; import com.baomidou.dynamic.datasource.fixture.service.nest.Student; import com.baomidou.dynamic.datasource.fixture.service.nest.StudentService; -import com.baomidou.dynamic.datasource.fixture.service.nest.Teacher; import com.baomidou.dynamic.datasource.fixture.service.nest.TeacherService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -65,10 +64,10 @@ public class NestDataSourceTest { assertThat(ds.getDataSources().keySet()).contains("master", "teacher", "student"); assertThat(teacherService.addTeacherWithTx("ss", 1)).isEqualTo(1); assertThat(studentService.addStudentWithTx("tt", 2)).isEqualTo(1); - assertThat(teacherService.selectTeachers()).isEqualTo(List.of(new Teacher(1, "tt", 2))); + assertThat(teacherService.selectTeachers()).isEmpty(); assertThat(studentService.selectStudents()).isEqualTo(List.of(new Student(1, "tt", 2))); assertThat(schoolService.addTeacherAndStudentWithTx()).isEqualTo(2); - assertThat(teacherService.selectTeachers()).isEqualTo(List.of(new Teacher(1, "tt", 2), new Teacher(2, "bb", 4))); + assertThat(teacherService.selectTeachers()).isEmpty(); assertThat(studentService.selectStudents()).isEqualTo(List.of(new Student(1, "tt", 2), new Student(2, "bb", 4))); } @@ -76,7 +75,7 @@ public class NestDataSourceTest { DataSourceProperty result = new DataSourceProperty(); result.setPoolName(poolName); result.setDriverClassName("org.h2.Driver"); - result.setUrl("jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM 'classpath:db/add-remove-datasource.sql'"); + result.setUrl("jdbc:h2:mem:" + poolName + ";INIT=RUNSCRIPT FROM 'classpath:db/add-remove-datasource.sql'"); result.setUsername("sa"); result.setPassword(""); return result; diff --git a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/SPELTest.java b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/SPELTest.java index be067f8..25799d1 100644 --- a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/SPELTest.java +++ b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/SPELTest.java @@ -97,7 +97,7 @@ public class SPELTest { DataSourceProperty result = new DataSourceProperty(); result.setPoolName(poolName); result.setDriverClassName("org.h2.Driver"); - result.setUrl("jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM 'classpath:db/spring-expression-language.sql'"); + result.setUrl("jdbc:h2:mem:" + poolName + ";INIT=RUNSCRIPT FROM 'classpath:db/spring-expression-language.sql'"); result.setUsername("sa"); result.setPassword(""); return result; diff --git a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/StudentService.java b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/StudentService.java index 6386a75..299fa78 100644 --- a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/StudentService.java +++ b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/StudentService.java @@ -41,7 +41,8 @@ public class StudentService { @Transactional public int addStudentWithTx(String name, Integer age) { - try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement("insert into student (name,age) values (?,?)")) { + try (Connection connection = dataSource.getConnection(); + PreparedStatement preparedStatement = connection.prepareStatement("insert into student (`name`,age) values (?,?)")) { preparedStatement.setString(1, name); preparedStatement.setInt(2, age); return preparedStatement.executeUpdate(); @@ -52,7 +53,7 @@ public class StudentService { public int addStudentNoTx(String name, Integer age) { try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("insert into student (name,age) values (?,?)")) { + PreparedStatement preparedStatement = connection.prepareStatement("insert into student (`name`,age) values (?,?)")) { preparedStatement.setString(1, name); preparedStatement.setInt(2, age); return preparedStatement.executeUpdate(); diff --git a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/TeacherService.java b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/TeacherService.java index bfdc1c4..b8d2b58 100644 --- a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/TeacherService.java +++ b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/service/nest/TeacherService.java @@ -42,7 +42,7 @@ public class TeacherService { @Transactional public int addTeacherWithTx(String name, Integer age) { try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("insert into teacher (name,age) values (?,?)")) { + PreparedStatement preparedStatement = connection.prepareStatement("insert into teacher (`name`,age) values (?,?)")) { preparedStatement.setString(1, name); preparedStatement.setInt(2, age); return preparedStatement.executeUpdate(); @@ -54,7 +54,7 @@ public class TeacherService { public int addTeacherNoTx(String name, Integer age) { try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("insert into teacher (name,age) values (?,?)")) { + PreparedStatement preparedStatement = connection.prepareStatement("insert into teacher (`name`,age) values (?,?)")) { preparedStatement.setString(1, name); preparedStatement.setInt(2, age); return preparedStatement.executeUpdate(); diff --git a/dynamic-datasource-spring-boot3-starter/src/test/resources/db/add-remove-datasource.sql b/dynamic-datasource-spring-boot3-starter/src/test/resources/db/add-remove-datasource.sql index 97e13ac..6371362 100644 --- a/dynamic-datasource-spring-boot3-starter/src/test/resources/db/add-remove-datasource.sql +++ b/dynamic-datasource-spring-boot3-starter/src/test/resources/db/add-remove-datasource.sql @@ -1,15 +1,13 @@ -CREATE TABLE IF NOT EXISTS TEACHER +CREATE TABLE IF NOT EXISTS teacher ( - id BIGINT(20) NOT NULL AUTO_INCREMENT, - name VARCHAR(30) NULL DEFAULT NULL, - age INT(11) NULL DEFAULT NULL, - PRIMARY KEY (id) + `id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `name` VARCHAR(30) NULL DEFAULT NULL, + age INT NULL DEFAULT NULL ); -CREATE TABLE IF NOT EXISTS STUDENT +CREATE TABLE IF NOT EXISTS student ( - id BIGINT(20) NOT NULL AUTO_INCREMENT, - name VARCHAR(30) NULL DEFAULT NULL, - age INT(11) NULL DEFAULT NULL, - PRIMARY KEY (id) + `id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `name` VARCHAR(30) NULL DEFAULT NULL, + age INT NULL DEFAULT NULL ); diff --git a/dynamic-datasource-spring-boot3-starter/src/test/resources/db/spring-expression-language.sql b/dynamic-datasource-spring-boot3-starter/src/test/resources/db/spring-expression-language.sql index 5f426ae..ea7ad1d 100644 --- a/dynamic-datasource-spring-boot3-starter/src/test/resources/db/spring-expression-language.sql +++ b/dynamic-datasource-spring-boot3-starter/src/test/resources/db/spring-expression-language.sql @@ -1,7 +1,6 @@ CREATE TABLE IF NOT EXISTS t_user ( - id BIGINT(20) NOT NULL AUTO_INCREMENT, + id BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, name VARCHAR(30) NULL DEFAULT NULL, - age INT(11) NULL DEFAULT NULL, - PRIMARY KEY (id) + age INT NULL DEFAULT NULL );