diff --git a/README.md b/README.md index b78ae65a..2648e912 100644 --- a/README.md +++ b/README.md @@ -29,13 +29,13 @@ buildscript { } } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.3.2.RELEASE") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.4.0-M2") } } dependencies { implementation("org.springframework.boot:spring-boot-starter-data-jdbc") - implementation("com.navercorp.spring:spring-boot-starter-data-jdbc-plus-sql:2.0.2.RELEASE") + implementation("com.navercorp.spring:spring-boot-starter-data-jdbc-plus-sql:2.4.0-M2") } ``` @@ -44,7 +44,7 @@ dependencies { org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.4.0-M2 @@ -56,7 +56,7 @@ dependencies { com.navercorp.spring spring-boot-starter-data-jdbc-plus-sql - 2.0.2.RELEASE + 2.4.0-M2 ``` diff --git a/build.gradle b/build.gradle index 14264ad2..6e30ede6 100644 --- a/build.gradle +++ b/build.gradle @@ -9,13 +9,13 @@ buildscript { } } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.3.2.RELEASE") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.4.0-M2") } } allprojects { group = "com.navercorp.spring" - version = "2.1.0-M1" + version = "2.1.0-M2" } subprojects { diff --git a/guide-projects/plus-repository-guide/build.gradle b/guide-projects/plus-repository-guide/build.gradle index 840a0f7b..6ca902c0 100644 --- a/guide-projects/plus-repository-guide/build.gradle +++ b/guide-projects/plus-repository-guide/build.gradle @@ -5,9 +5,9 @@ dependencies { implementation("org.projectlombok:lombok") annotationProcessor("org.projectlombok:lombok") - implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1") - implementation("org.springframework.data:spring-data-relational:2.1.0-M1") - implementation("org.springframework.data:spring-data-commons:2.4.0-M1") + implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2") + implementation("org.springframework.data:spring-data-relational:2.1.0-M2") + implementation("org.springframework.data:spring-data-commons:2.4.0-M2") testImplementation("org.springframework.boot:spring-boot-starter-test") { exclude group: "org.junit.vintage", module: "junit-vintage-engine" diff --git a/guide-projects/plus-sql-java-groovy-guide/build.gradle b/guide-projects/plus-sql-java-groovy-guide/build.gradle index 4fe1dfde..c039d94f 100644 --- a/guide-projects/plus-sql-java-groovy-guide/build.gradle +++ b/guide-projects/plus-sql-java-groovy-guide/build.gradle @@ -39,15 +39,15 @@ dependencies { implementation("org.codehaus.groovy:groovy:2.5.8") implementation("com.h2database:h2") - implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1") - implementation("org.springframework.data:spring-data-relational:2.1.0-M1") - implementation("org.springframework.data:spring-data-commons:2.4.0-M1") + implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2") + implementation("org.springframework.data:spring-data-relational:2.1.0-M2") + implementation("org.springframework.data:spring-data-commons:2.4.0-M2") implementation project(":spring-data-plus-sql-gen") annotationProcessor project(":spring-data-plus-sql-gen") - annotationProcessor("org.springframework.data:spring-data-jdbc:2.1.0-M1") - annotationProcessor("org.springframework.data:spring-data-relational:2.1.0-M1") - annotationProcessor("org.springframework.data:spring-data-commons:2.4.0-M1") + annotationProcessor("org.springframework.data:spring-data-jdbc:2.1.0-M2") + annotationProcessor("org.springframework.data:spring-data-relational:2.1.0-M2") + annotationProcessor("org.springframework.data:spring-data-commons:2.4.0-M2") compileOnly("org.projectlombok:lombok") annotationProcessor("org.projectlombok:lombok") diff --git a/guide-projects/plus-sql-java-kotlin-guide/build.gradle b/guide-projects/plus-sql-java-kotlin-guide/build.gradle index 5d305b74..7adeef55 100644 --- a/guide-projects/plus-sql-java-kotlin-guide/build.gradle +++ b/guide-projects/plus-sql-java-kotlin-guide/build.gradle @@ -37,9 +37,9 @@ dependencies { implementation("org.projectlombok:lombok") annotationProcessor("org.projectlombok:lombok") - implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1") - implementation("org.springframework.data:spring-data-relational:2.1.0-M1") - implementation("org.springframework.data:spring-data-commons:2.4.0-M1") + implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2") + implementation("org.springframework.data:spring-data-relational:2.1.0-M2") + implementation("org.springframework.data:spring-data-commons:2.4.0-M2") testImplementation("org.springframework.boot:spring-boot-starter-test") { exclude group: "org.junit.vintage", module: "junit-vintage-engine" diff --git a/guide-projects/plus-sql-kotlin-guide/build.gradle.kts b/guide-projects/plus-sql-kotlin-guide/build.gradle.kts index ab6027eb..9071baf4 100644 --- a/guide-projects/plus-sql-kotlin-guide/build.gradle.kts +++ b/guide-projects/plus-sql-kotlin-guide/build.gradle.kts @@ -27,9 +27,9 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("com.h2database:h2") - implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1") - implementation("org.springframework.data:spring-data-relational:2.1.0-M1") - implementation("org.springframework.data:spring-data-commons:2.4.0-M1") + implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2") + implementation("org.springframework.data:spring-data-relational:2.1.0-M2") + implementation("org.springframework.data:spring-data-commons:2.4.0-M2") testImplementation("org.springframework.boot:spring-boot-starter-test") { exclude(group = "org.junit.vintage", module = "junit-vintage-engine") diff --git a/spring-boot-autoconfigure-data-jdbc-plus/build.gradle b/spring-boot-autoconfigure-data-jdbc-plus/build.gradle index 4d1d4314..fdc1c330 100644 --- a/spring-boot-autoconfigure-data-jdbc-plus/build.gradle +++ b/spring-boot-autoconfigure-data-jdbc-plus/build.gradle @@ -5,9 +5,9 @@ dependencies { implementation project(":spring-data-jdbc-plus-sql") implementation project(":spring-data-jdbc-plus-repository") - implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1") - implementation("org.springframework.data:spring-data-relational:2.1.0-M1") - implementation("org.springframework.data:spring-data-commons:2.4.0-M1") + implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2") + implementation("org.springframework.data:spring-data-relational:2.1.0-M2") + implementation("org.springframework.data:spring-data-commons:2.4.0-M2") implementation("io.projectreactor:reactor-core") testImplementation("org.junit.jupiter:junit-jupiter") diff --git a/spring-boot-starter-data-jdbc-plus-repository/build.gradle b/spring-boot-starter-data-jdbc-plus-repository/build.gradle index f76547de..28033ff2 100644 --- a/spring-boot-starter-data-jdbc-plus-repository/build.gradle +++ b/spring-boot-starter-data-jdbc-plus-repository/build.gradle @@ -3,7 +3,7 @@ dependencies { compile(project(":spring-data-jdbc-plus-repository")) compile("org.springframework.boot:spring-boot-starter-jdbc") - implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1") - implementation("org.springframework.data:spring-data-relational:2.1.0-M1") - implementation("org.springframework.data:spring-data-commons:2.4.0-M1") + implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2") + implementation("org.springframework.data:spring-data-relational:2.1.0-M2") + implementation("org.springframework.data:spring-data-commons:2.4.0-M2") } diff --git a/spring-boot-starter-data-jdbc-plus-sql/build.gradle b/spring-boot-starter-data-jdbc-plus-sql/build.gradle index 857fd247..f860eff4 100644 --- a/spring-boot-starter-data-jdbc-plus-sql/build.gradle +++ b/spring-boot-starter-data-jdbc-plus-sql/build.gradle @@ -3,7 +3,7 @@ dependencies { compile(project(":spring-data-jdbc-plus-sql")) compile("org.springframework.boot:spring-boot-starter-jdbc") - implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1") - implementation("org.springframework.data:spring-data-relational:2.1.0-M1") - implementation("org.springframework.data:spring-data-commons:2.4.0-M1") + implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2") + implementation("org.springframework.data:spring-data-relational:2.1.0-M2") + implementation("org.springframework.data:spring-data-commons:2.4.0-M2") } diff --git a/spring-data-jdbc-plus-repository/build.gradle b/spring-data-jdbc-plus-repository/build.gradle index 3c0b646f..0e6407b7 100644 --- a/spring-data-jdbc-plus-repository/build.gradle +++ b/spring-data-jdbc-plus-repository/build.gradle @@ -1,9 +1,9 @@ compileJava.dependsOn(processResources) dependencies { - compile("org.springframework.data:spring-data-jdbc:2.1.0-M1") - compile("org.springframework.data:spring-data-relational:2.1.0-M1") - compile("org.springframework.data:spring-data-commons:2.4.0-M1") + compile("org.springframework.data:spring-data-jdbc:2.1.0-M2") + compile("org.springframework.data:spring-data-relational:2.1.0-M2") + compile("org.springframework.data:spring-data-commons:2.4.0-M2") testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.junit.jupiter:junit-jupiter-api") diff --git a/spring-data-jdbc-plus-sql/build.gradle b/spring-data-jdbc-plus-sql/build.gradle index 3f64b829..dc8eea48 100644 --- a/spring-data-jdbc-plus-sql/build.gradle +++ b/spring-data-jdbc-plus-sql/build.gradle @@ -2,9 +2,9 @@ compileJava.dependsOn(processResources) dependencies { compile project(":spring-jdbc-plus-support") - compile("org.springframework.data:spring-data-jdbc:2.1.0-M1") - compile("org.springframework.data:spring-data-relational:2.1.0-M1") - compile("org.springframework.data:spring-data-commons:2.4.0-M1") + compile("org.springframework.data:spring-data-jdbc:2.1.0-M2") + compile("org.springframework.data:spring-data-relational:2.1.0-M2") + compile("org.springframework.data:spring-data-commons:2.4.0-M2") compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.3.72") compileOnly("org.jetbrains.kotlin:kotlin-reflect:1.3.72") compileOnly("io.projectreactor:reactor-core") diff --git a/spring-data-jdbc-plus-sql/src/test/java/com/navercorp/spring/data/jdbc/plus/sql/convert/SqlGeneratorFixedNamingStrategyTest.java b/spring-data-jdbc-plus-sql/src/test/java/com/navercorp/spring/data/jdbc/plus/sql/convert/SqlGeneratorFixedNamingStrategyTest.java index 02afb9af..08ce33b5 100644 --- a/spring-data-jdbc-plus-sql/src/test/java/com/navercorp/spring/data/jdbc/plus/sql/convert/SqlGeneratorFixedNamingStrategyTest.java +++ b/spring-data-jdbc-plus-sql/src/test/java/com/navercorp/spring/data/jdbc/plus/sql/convert/SqlGeneratorFixedNamingStrategyTest.java @@ -80,12 +80,12 @@ public void findOneWithOverriddenFixedTableName() { + "FROM \"FIXEDCUSTOMSCHEMA\".\"FIXEDCUSTOMTABLEPREFIX_DUMMYENTITY\" " + "LEFT OUTER JOIN \"FIXEDCUSTOMSCHEMA\"" + ".\"FIXEDCUSTOMTABLEPREFIX_REFERENCEDENTITY\" " - + "AS \"ref\" " + + "\"ref\" " + "ON \"ref\".\"FIXEDCUSTOMTABLEPREFIX_DUMMYENTITY\" = " + "\"FIXEDCUSTOMSCHEMA\".\"FIXEDCUSTOMTABLEPREFIX_DUMMYENTITY\"" + ".\"FIXEDCUSTOMPROPERTYPREFIX_ID\" " + "LEFT OUTER JOIN \"FIXEDCUSTOMSCHEMA\"" - + ".\"FIXEDCUSTOMTABLEPREFIX_SECONDLEVELREFERENCEDENTITY\" AS \"ref_further\" " + + ".\"FIXEDCUSTOMTABLEPREFIX_SECONDLEVELREFERENCEDENTITY\" \"ref_further\" " + "ON \"ref_further\".\"FIXEDCUSTOMTABLEPREFIX_REFERENCEDENTITY\" " + "= \"ref\".\"FIXEDCUSTOMPROPERTYPREFIX_L1ID\" " + "WHERE \"FIXEDCUSTOMSCHEMA\".\"FIXEDCUSTOMTABLEPREFIX_DUMMYENTITY\"" @@ -108,9 +108,9 @@ public void findOneWithUppercasedTablesAndLowercasedColumns() { + "\"ref_further\".\"L2ID\" AS \"REF_FURTHER_L2ID\", " + "\"ref_further\".\"SOMETHING\" AS \"REF_FURTHER_SOMETHING\" " + "FROM \"DUMMYENTITY\" " - + "LEFT OUTER JOIN \"REFERENCEDENTITY\" AS \"ref\" " + + "LEFT OUTER JOIN \"REFERENCEDENTITY\" \"ref\" " + "ON \"ref\".\"DUMMYENTITY\" = \"DUMMYENTITY\".\"ID\" " - + "LEFT OUTER JOIN \"SECONDLEVELREFERENCEDENTITY\" AS \"ref_further\" " + + "LEFT OUTER JOIN \"SECONDLEVELREFERENCEDENTITY\" \"ref_further\" " + "ON \"ref_further\".\"REFERENCEDENTITY\" = \"ref\".\"L1ID\" " + "WHERE \"DUMMYENTITY\".\"ID\" = :id"); softAssertions.assertAll(); diff --git a/spring-data-jdbc-plus-sql/src/test/java/com/navercorp/spring/data/jdbc/plus/sql/convert/SqlGeneratorTest.java b/spring-data-jdbc-plus-sql/src/test/java/com/navercorp/spring/data/jdbc/plus/sql/convert/SqlGeneratorTest.java index e785223d..1380f950 100644 --- a/spring-data-jdbc-plus-sql/src/test/java/com/navercorp/spring/data/jdbc/plus/sql/convert/SqlGeneratorTest.java +++ b/spring-data-jdbc-plus-sql/src/test/java/com/navercorp/spring/data/jdbc/plus/sql/convert/SqlGeneratorTest.java @@ -178,9 +178,9 @@ public void findAllSortedBySingleField() { "ref_further.x_l2id AS ref_further_x_l2id", // "ref_further.x_something AS ref_further_x_something", // "FROM dummy_entity ", // - "LEFT OUTER JOIN referenced_entity AS ref " + "LEFT OUTER JOIN referenced_entity ref " + "ON ref.dummy_entity = dummy_entity.id1", // - "LEFT OUTER JOIN second_level_referenced_entity AS ref_further " + "LEFT OUTER JOIN second_level_referenced_entity ref_further " + "ON ref_further.referenced_entity = ref.x_l1id", // "ORDER BY x_name ASC"); } @@ -202,9 +202,9 @@ public void findAllSortedByMultipleFields() { "ref_further.x_l2id AS ref_further_x_l2id", // "ref_further.x_something AS ref_further_x_something", // "FROM dummy_entity ", // - "LEFT OUTER JOIN referenced_entity AS ref " + "LEFT OUTER JOIN referenced_entity ref " + "ON ref.dummy_entity = dummy_entity.id1", // - "LEFT OUTER JOIN second_level_referenced_entity AS ref_further " + "LEFT OUTER JOIN second_level_referenced_entity ref_further " + "ON ref_further.referenced_entity = ref.x_l1id", // "ORDER BY x_name DESC", // "x_other ASC"); @@ -232,9 +232,9 @@ public void findAllPaged() { "ref_further.x_l2id AS ref_further_x_l2id", // "ref_further.x_something AS ref_further_x_something", // "FROM dummy_entity ", // - "LEFT OUTER JOIN referenced_entity AS ref " + "LEFT OUTER JOIN referenced_entity ref " + "ON ref.dummy_entity = dummy_entity.id1", // - "LEFT OUTER JOIN second_level_referenced_entity AS ref_further " + "LEFT OUTER JOIN second_level_referenced_entity ref_further " + "ON ref_further.referenced_entity = ref.x_l1id", // "OFFSET 40", // "LIMIT 20"); @@ -254,9 +254,9 @@ public void findAllPagedAndSorted() { "ref_further.x_l2id AS ref_further_x_l2id", // "ref_further.x_something AS ref_further_x_something", // "FROM dummy_entity ", // - "LEFT OUTER JOIN referenced_entity AS ref " + "LEFT OUTER JOIN referenced_entity ref " + "ON ref.dummy_entity = dummy_entity.id1", // - "LEFT OUTER JOIN second_level_referenced_entity AS ref_further " + "LEFT OUTER JOIN second_level_referenced_entity ref_further " + "ON ref_further.referenced_entity = ref.x_l1id", // "ORDER BY x_name ASC", // "OFFSET 30", // @@ -278,9 +278,9 @@ public void findAllByProperty() { "ref_further.x_l2id AS ref_further_x_l2id", // "ref_further.x_something AS ref_further_x_something", // "FROM dummy_entity ", // - "LEFT OUTER JOIN referenced_entity AS ref " + "LEFT OUTER JOIN referenced_entity ref " + "ON ref.dummy_entity = dummy_entity.id1", // - "LEFT OUTER JOIN second_level_referenced_entity AS ref_further " + "LEFT OUTER JOIN second_level_referenced_entity ref_further " + "ON ref_further.referenced_entity = ref.x_l1id", // "WHERE dummy_entity.backref = :backref"); } @@ -302,8 +302,8 @@ public void findAllByPropertyWithMultipartIdentifier() { "ref_further.x_l2id AS ref_further_x_l2id", // "ref_further.x_something AS ref_further_x_something", // "FROM dummy_entity ", // - "LEFT OUTER JOIN referenced_entity AS ref ON ref.dummy_entity = dummy_entity.id1", // - "LEFT OUTER JOIN second_level_referenced_entity AS ref_further " + "LEFT OUTER JOIN referenced_entity ref ON ref.dummy_entity = dummy_entity.id1", // + "LEFT OUTER JOIN second_level_referenced_entity ref_further " + "ON ref_further.referenced_entity = ref.x_l1id", // "dummy_entity.backref = :backref", // "dummy_entity.backref_key = :backref_key"); @@ -324,9 +324,9 @@ public void findAllByPropertyWithKey() { + "AS ref_further_x_something, " // + "dummy_entity.key-column AS key-column " // + "FROM dummy_entity " // - + "LEFT OUTER JOIN referenced_entity AS ref " + + "LEFT OUTER JOIN referenced_entity ref " + "ON ref.dummy_entity = dummy_entity.id1 " // - + "LEFT OUTER JOIN second_level_referenced_entity AS ref_further " + + "LEFT OUTER JOIN second_level_referenced_entity ref_further " + "ON ref_further.referenced_entity = ref.x_l1id " // + "WHERE dummy_entity.backref = :backref"); } @@ -350,8 +350,8 @@ public void findAllByPropertyWithKeyOrdered() { + "AS ref_further_x_something, " // + "dummy_entity.key-column AS key-column " // + "FROM dummy_entity " // - + "LEFT OUTER JOIN referenced_entity AS ref ON ref.dummy_entity = dummy_entity.id1 " // - + "LEFT OUTER JOIN second_level_referenced_entity AS ref_further " + + "LEFT OUTER JOIN referenced_entity ref ON ref.dummy_entity = dummy_entity.id1 " // + + "LEFT OUTER JOIN second_level_referenced_entity ref_further " + "ON ref_further.referenced_entity = ref.x_l1id " // + "WHERE dummy_entity.backref = :backref " + "ORDER BY key-column"); } diff --git a/spring-data-plus-sql-gen/build.gradle b/spring-data-plus-sql-gen/build.gradle index 57370fee..7b9609e1 100644 --- a/spring-data-plus-sql-gen/build.gradle +++ b/spring-data-plus-sql-gen/build.gradle @@ -1,6 +1,6 @@ dependencies { - compile("org.springframework.data:spring-data-relational:2.1.0-M1") - compile("org.springframework.data:spring-data-commons:2.4.0-M1") + compile("org.springframework.data:spring-data-relational:2.1.0-M2") + compile("org.springframework.data:spring-data-commons:2.4.0-M2") compile project(":spring-data-jdbc-plus-sql") compile("com.squareup:javapoet:1.12.1")