From 73afe4c468ced0d11c2deeda4bf6c54e5351a976 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 5 Jan 2022 09:49:47 +0100 Subject: [PATCH] Use a -2 suffix in H2's JDBC URLs to indicate H2 2.0 This avoids incompatibilities with files that might be lying around from H2 1.4 --- jOOQ-examples/jOOQ-flyway-example/pom.xml | 2 +- .../java/org/jooq/example/flyway/AfterMigrationTestJava.java | 2 +- .../jOOQ-javafx-example/src/main/resources/config.properties | 2 +- .../jOOQ-kotlin-example/src/main/resources/config.properties | 2 +- .../jOOQ-spark-example/src/main/resources/config.properties | 2 +- .../src/main/resources/application.properties | 2 +- .../jOOQ-spring-example/src/main/resources/config.properties | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jOOQ-examples/jOOQ-flyway-example/pom.xml b/jOOQ-examples/jOOQ-flyway-example/pom.xml index d74ba6e57d..0c5c1fa9ec 100644 --- a/jOOQ-examples/jOOQ-flyway-example/pom.xml +++ b/jOOQ-examples/jOOQ-flyway-example/pom.xml @@ -24,7 +24,7 @@ UTF-8 3.2.6.RELEASE - jdbc:h2:~/flyway-test + jdbc:h2:~/jooq-flyway-example-2 sa diff --git a/jOOQ-examples/jOOQ-flyway-example/src/test/java/org/jooq/example/flyway/AfterMigrationTestJava.java b/jOOQ-examples/jOOQ-flyway-example/src/test/java/org/jooq/example/flyway/AfterMigrationTestJava.java index e07fc655b1..76c0edb525 100644 --- a/jOOQ-examples/jOOQ-flyway-example/src/test/java/org/jooq/example/flyway/AfterMigrationTestJava.java +++ b/jOOQ-examples/jOOQ-flyway-example/src/test/java/org/jooq/example/flyway/AfterMigrationTestJava.java @@ -20,7 +20,7 @@ public class AfterMigrationTestJava { @Test public void testQueryingAfterMigration() throws Exception { - try (Connection c = DriverManager.getConnection("jdbc:h2:~/flyway-test", "sa", "")) { + try (Connection c = DriverManager.getConnection("jdbc:h2:~/jooq-flyway-example-2", "sa", "")) { Result result = DSL.using(c) .select( diff --git a/jOOQ-examples/jOOQ-javafx-example/src/main/resources/config.properties b/jOOQ-examples/jOOQ-javafx-example/src/main/resources/config.properties index 42fe6bba62..87370379a0 100644 --- a/jOOQ-examples/jOOQ-javafx-example/src/main/resources/config.properties +++ b/jOOQ-examples/jOOQ-javafx-example/src/main/resources/config.properties @@ -1,6 +1,6 @@ #Database Configuration db.driver=org.h2.Driver -db.url=jdbc:h2:~/jooq-javafx-example +db.url=jdbc:h2:~/jooq-javafx-example-2 db.username=sa db.password= diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/resources/config.properties b/jOOQ-examples/jOOQ-kotlin-example/src/main/resources/config.properties index cee314fcf0..f03bdeaeb2 100644 --- a/jOOQ-examples/jOOQ-kotlin-example/src/main/resources/config.properties +++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/resources/config.properties @@ -1,6 +1,6 @@ #Database Configuration db.driver=org.h2.Driver -db.url=jdbc:h2:~/jooq-kotlin-example +db.url=jdbc:h2:~/jooq-kotlin-example-2 db.username=sa db.password= diff --git a/jOOQ-examples/jOOQ-spark-example/src/main/resources/config.properties b/jOOQ-examples/jOOQ-spark-example/src/main/resources/config.properties index a4627ea8a7..22e28edd89 100644 --- a/jOOQ-examples/jOOQ-spark-example/src/main/resources/config.properties +++ b/jOOQ-examples/jOOQ-spark-example/src/main/resources/config.properties @@ -1,6 +1,6 @@ #Database Configuration db.driver=org.h2.Driver -db.url=jdbc:h2:~/jooq-spark-example +db.url=jdbc:h2:~/jooq-spark-example-2 db.username=sa db.password= diff --git a/jOOQ-examples/jOOQ-spring-boot-example/src/main/resources/application.properties b/jOOQ-examples/jOOQ-spring-boot-example/src/main/resources/application.properties index 41f2bbe6c4..3140207a2f 100644 --- a/jOOQ-examples/jOOQ-spring-boot-example/src/main/resources/application.properties +++ b/jOOQ-examples/jOOQ-spring-boot-example/src/main/resources/application.properties @@ -1,6 +1,6 @@ #Database Configuration spring.datasource.driverClassName=org.h2.Driver -spring.datasource.url=jdbc:h2:~/jooq-spring-boot-example +spring.datasource.url=jdbc:h2:~/jooq-spring-boot-example-2 spring.datasource.username=sa spring.datasource.password= diff --git a/jOOQ-examples/jOOQ-spring-example/src/main/resources/config.properties b/jOOQ-examples/jOOQ-spring-example/src/main/resources/config.properties index 8f7cf94db7..0546a8cc5e 100644 --- a/jOOQ-examples/jOOQ-spring-example/src/main/resources/config.properties +++ b/jOOQ-examples/jOOQ-spring-example/src/main/resources/config.properties @@ -1,6 +1,6 @@ #Database Configuration db.driver=org.h2.Driver -db.url=jdbc:h2:~/jooq-spring-example +db.url=jdbc:h2:~/jooq-spring-example-2 db.username=sa db.password=