Switch to Postgres

micronaut-projects · Jan 22, 2024 · 37c1afc · radovanradic · Jan 22, 2024 · alvarosanchez
1 parent f635ea5
commit 37c1afc
Show file tree

Hide file tree

Showing 38 changed files with 60 additions and 81 deletions.
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -62,7 +62,7 @@ jobs:
 
       - name: Eagerly pull Docker images
         run: |
-          docker pull mysql:latest
+          docker pull postgres:latest
 
       - name: Run tests
         run: |

diff --git a/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/pom.xml
@@ -83,8 +83,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -108,11 +108,11 @@
                     <testResourcesDependencies>
                         <dependency>
                             <groupId>io.micronaut.testresources</groupId>
-                            <artifactId>micronaut-test-resources-jdbc-mysql</artifactId>
+                            <artifactId>micronaut-test-resources-jdbc-postgresql</artifactId>
                         </dependency>
                         <dependency>
-                            <groupId>mysql</groupId>
-                            <artifactId>mysql-connector-java</artifactId>
+                            <groupId>org.postgresql</groupId>
+                            <artifactId>postgresql</artifactId>
                         </dependency>
                     </testResourcesDependencies>
                 </configuration>

diff --git a/...resources-custom-dependency/src/main/java/io/micronaut/build/examples/BookRepository.java b/...resources-custom-dependency/src/main/java/io/micronaut/build/examples/BookRepository.java
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface BookRepository extends CrudRepository<Book, Long> {
     @Override
     List<Book> findAll();

diff --git a/...resources-custom-dependency/src/main/java/io/micronaut/build/examples/UserRepository.java b/...resources-custom-dependency/src/main/java/io/micronaut/build/examples/UserRepository.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 //@Repository("users")
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface UserRepository extends CrudRepository<User, Long> {
     @Override
     List<User> findAll();

diff --git a/...egration-tests/src/it/test-resources-custom-dependency/src/main/resources/application.yml b/...egration-tests/src/it/test-resources-custom-dependency/src/main/resources/application.yml
@@ -7,9 +7,6 @@ netty:
       max-order: 3
 datasources:
   default:
-    schema-generate: CREATE
-    dialect: MYSQL
-#  users:
-#    driverClassName: org.postgresql.Driver
-#    schema-generate: CREATE_DROP
-#    dialect: POSTGRES
+    driverClassName: org.postgresql.Driver
+    schema-generate: CREATE_DROP
+    dialect: POSTGRES
diff --git a/.../test-resources-custom-dependency/src/test/java/io/micronaut/build/examples/DemoTest.java b/.../test-resources-custom-dependency/src/test/java/io/micronaut/build/examples/DemoTest.java
@@ -28,7 +28,7 @@ void testCustomProperty() {
     }
 */
     @Test
-    @DisplayName("A MySQL test container is required to run this test")
+    @DisplayName("A POSTGRES test container is required to run this test")
     void testItWorks() {
         Book book = new Book();
         book.setTitle("Yet Another Book " + UUID.randomUUID());

diff --git a/micronaut-maven-integration-tests/src/it/test-resources-disabled/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-disabled/pom.xml
@@ -82,8 +82,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/...maven-integration-tests/src/it/test-resources-disabled/src/main/resources/application.yml b/...maven-integration-tests/src/it/test-resources-disabled/src/main/resources/application.yml
@@ -7,9 +7,6 @@ netty:
       max-order: 3
 datasources:
   default:
+    driverClassName: org.postgresql.Driver
     schema-generate: CREATE
-    dialect: MYSQL
-#  users:
-#    driverClassName: org.postgresql.Driver
-#    schema-generate: CREATE_DROP
-#    dialect: POSTGRES
+    dialect: POSTGRES
diff --git a/micronaut-maven-integration-tests/src/it/test-resources-failing-test/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-failing-test/pom.xml
@@ -83,8 +83,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/...test-resources-failing-test/src/main/java/io/micronaut/build/examples/BookRepository.java b/...test-resources-failing-test/src/main/java/io/micronaut/build/examples/BookRepository.java
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface BookRepository extends CrudRepository<Book, Long> {
     @Override
     List<Book> findAll();

diff --git a/...test-resources-failing-test/src/main/java/io/micronaut/build/examples/UserRepository.java b/...test-resources-failing-test/src/main/java/io/micronaut/build/examples/UserRepository.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 //@Repository("users")
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface UserRepository extends CrudRepository<User, Long> {
     @Override
     List<User> findAll();

diff --git a/...n-integration-tests/src/it/test-resources-failing-test/src/main/resources/application.yml b/...n-integration-tests/src/it/test-resources-failing-test/src/main/resources/application.yml
@@ -8,8 +8,5 @@ netty:
 datasources:
   default:
     schema-generate: CREATE
-    dialect: MYSQL
-#  users:
-#    driverClassName: org.postgresql.Driver
-#    schema-generate: CREATE_DROP
-#    dialect: POSTGRES
+    driverClassName: org.postgresql.Driver
+    dialect: POSTGRES
diff --git a/...rc/it/test-resources-failing-test/src/test/java/io/micronaut/build/examples/DemoTest.java b/...rc/it/test-resources-failing-test/src/test/java/io/micronaut/build/examples/DemoTest.java
@@ -18,7 +18,7 @@ class DemoTest {
     BookRepository bookRepository;
 
     @Test
-    @DisplayName("A MySQL test container is required to run this test")
+    @DisplayName("A POSTGRES test container is required to run this test")
     void testItWorks() {
         Book book = new Book();
         book.setTitle("Yet Another Book " + UUID.randomUUID());

diff --git a/micronaut-maven-integration-tests/src/it/test-resources-run/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-run/pom.xml
@@ -83,8 +83,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/...s/src/it/test-resources-run/src/main/java/io/micronaut/build/examples/BookRepository.java b/...s/src/it/test-resources-run/src/main/java/io/micronaut/build/examples/BookRepository.java
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface BookRepository extends CrudRepository<Book, Long> {
     @Override
     List<Book> findAll();

diff --git a/...s/src/it/test-resources-run/src/main/java/io/micronaut/build/examples/UserRepository.java b/...s/src/it/test-resources-run/src/main/java/io/micronaut/build/examples/UserRepository.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 //@Repository("users")
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface UserRepository extends CrudRepository<User, Long> {
     @Override
     List<User> findAll();

diff --git a/...naut-maven-integration-tests/src/it/test-resources-run/src/main/resources/application.yml b/...naut-maven-integration-tests/src/it/test-resources-run/src/main/resources/application.yml
@@ -8,8 +8,5 @@ netty:
 datasources:
   default:
     schema-generate: CREATE
-    dialect: MYSQL
-#  users:
-#    driverClassName: org.postgresql.Driver
-#    schema-generate: CREATE_DROP
-#    dialect: POSTGRES
+    driverClassName: org.postgresql.Driver
+    dialect: POSTGRES
diff --git a/...n-tests/src/it/test-resources-run/src/test/java/io/micronaut/build/examples/DemoTest.java b/...n-tests/src/it/test-resources-run/src/test/java/io/micronaut/build/examples/DemoTest.java
@@ -28,7 +28,7 @@ void testCustomProperty() {
     }
 */
     @Test
-    @DisplayName("A MySQL test container is required to run this test")
+    @DisplayName("A postgres test container is required to run this test")
     void testItWorks() {
         Book book = new Book();
         book.setTitle("Yet Another Book " + UUID.randomUUID());

diff --git a/micronaut-maven-integration-tests/src/it/test-resources-run/verify.groovy b/micronaut-maven-integration-tests/src/it/test-resources-run/verify.groovy
@@ -3,7 +3,7 @@ assert log.exists()
 assert log.text.contains("BUILD SUCCESS") : "Build did not succeed"
 assert log.text.contains("Starting Micronaut Test Resources service") : "Test Resources service was not started"
 assert log.text.contains("Shutting down Micronaut Test Resources service") : "Test Resources service was not shutdown"
-assert log.text.contains("Container mysql:latest started") : "mysql container was not started"
+assert log.text.contains("Container postgres:latest started") : "postgres container was not started"
 assert log.text.contains("Startup completed in") : "Startup was not completed"
 
 String port = new File(basedir, "target/test-resources-port.txt").text

diff --git a/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/pom.xml
@@ -83,8 +83,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/...-resources-shared-namespace/src/main/java/io/micronaut/build/examples/BookRepository.java b/...-resources-shared-namespace/src/main/java/io/micronaut/build/examples/BookRepository.java
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface BookRepository extends CrudRepository<Book, Long> {
     @Override
     List<Book> findAll();

diff --git a/...-resources-shared-namespace/src/main/java/io/micronaut/build/examples/UserRepository.java b/...-resources-shared-namespace/src/main/java/io/micronaut/build/examples/UserRepository.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 //@Repository("users")
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface UserRepository extends CrudRepository<User, Long> {
     @Override
     List<User> findAll();

diff --git a/...tegration-tests/src/it/test-resources-shared-namespace/src/main/resources/application.yml b/...tegration-tests/src/it/test-resources-shared-namespace/src/main/resources/application.yml
@@ -8,8 +8,5 @@ netty:
 datasources:
   default:
     schema-generate: CREATE
-    dialect: MYSQL
-#  users:
-#    driverClassName: org.postgresql.Driver
-#    schema-generate: CREATE_DROP
-#    dialect: POSTGRES
+    driverClassName: org.postgresql.Driver
+    dialect: POSTGRES
diff --git a/...t/test-resources-shared-namespace/src/test/java/io/micronaut/build/examples/DemoTest.java b/...t/test-resources-shared-namespace/src/test/java/io/micronaut/build/examples/DemoTest.java
@@ -28,7 +28,7 @@ void testCustomProperty() {
     }
 */
     @Test
-    @DisplayName("A MySQL test container is required to run this test")
+    @DisplayName("A postgres test container is required to run this test")
     void testItWorks() {
         Book book = new Book();
         book.setTitle("Yet Another Book " + UUID.randomUUID());

diff --git a/micronaut-maven-integration-tests/src/it/test-resources-shared/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-shared/pom.xml
@@ -83,8 +83,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/...rc/it/test-resources-shared/src/main/java/io/micronaut/build/examples/BookRepository.java b/...rc/it/test-resources-shared/src/main/java/io/micronaut/build/examples/BookRepository.java
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface BookRepository extends CrudRepository<Book, Long> {
     @Override
     List<Book> findAll();

diff --git a/...rc/it/test-resources-shared/src/main/java/io/micronaut/build/examples/UserRepository.java b/...rc/it/test-resources-shared/src/main/java/io/micronaut/build/examples/UserRepository.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 //@Repository("users")
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface UserRepository extends CrudRepository<User, Long> {
     @Override
     List<User> findAll();

diff --git a/...t-maven-integration-tests/src/it/test-resources-shared/src/main/resources/application.yml b/...t-maven-integration-tests/src/it/test-resources-shared/src/main/resources/application.yml
@@ -8,8 +8,5 @@ netty:
 datasources:
   default:
     schema-generate: CREATE
-    dialect: MYSQL
-#  users:
-#    driverClassName: org.postgresql.Driver
-#    schema-generate: CREATE_DROP
-#    dialect: POSTGRES
+    driverClassName: org.postgresql.Driver
+    dialect: POSTGRES
diff --git a/...ests/src/it/test-resources-shared/src/test/java/io/micronaut/build/examples/DemoTest.java b/...ests/src/it/test-resources-shared/src/test/java/io/micronaut/build/examples/DemoTest.java
@@ -28,7 +28,7 @@ void testCustomProperty() {
     }
 */
     @Test
-    @DisplayName("A MySQL test container is required to run this test")
+    @DisplayName("A postgres test container is required to run this test")
     void testItWorks() {
         Book book = new Book();
         book.setTitle("Yet Another Book " + UUID.randomUUID());

diff --git a/micronaut-maven-integration-tests/src/it/test-resources-start-stop/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-start-stop/pom.xml
@@ -83,8 +83,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/...t/test-resources-start-stop/src/main/java/io/micronaut/build/examples/BookRepository.java b/...t/test-resources-start-stop/src/main/java/io/micronaut/build/examples/BookRepository.java
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface BookRepository extends CrudRepository<Book, Long> {
     @Override
     List<Book> findAll();

diff --git a/...t/test-resources-start-stop/src/main/java/io/micronaut/build/examples/UserRepository.java b/...t/test-resources-start-stop/src/main/java/io/micronaut/build/examples/UserRepository.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 //@Repository("users")
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface UserRepository extends CrudRepository<User, Long> {
     @Override
     List<User> findAll();

diff --git a/...ven-integration-tests/src/it/test-resources-start-stop/src/main/resources/application.yml b/...ven-integration-tests/src/it/test-resources-start-stop/src/main/resources/application.yml
@@ -8,8 +8,5 @@ netty:
 datasources:
   default:
     schema-generate: CREATE
-    dialect: MYSQL
-#  users:
-#    driverClassName: org.postgresql.Driver
-#    schema-generate: CREATE_DROP
-#    dialect: POSTGRES
+    driverClassName: org.postgresql.Driver
+    dialect: POSTGRES
diff --git a/micronaut-maven-integration-tests/src/it/test-resources/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources/pom.xml
@@ -63,8 +63,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/...tests/src/it/test-resources/src/main/java/io/micronaut/build/examples/BookRepository.java b/...tests/src/it/test-resources/src/main/java/io/micronaut/build/examples/BookRepository.java
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface BookRepository extends CrudRepository<Book, Long> {
     @Override
     List<Book> findAll();

diff --git a/...tests/src/it/test-resources/src/main/java/io/micronaut/build/examples/UserRepository.java b/...tests/src/it/test-resources/src/main/java/io/micronaut/build/examples/UserRepository.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 //@Repository("users")
-@JdbcRepository(dialect = Dialect.MYSQL)
+@JdbcRepository(dialect = Dialect.POSTGRES)
 public interface UserRepository extends CrudRepository<User, Long> {
     @Override
     List<User> findAll();

diff --git a/micronaut-maven-integration-tests/src/it/test-resources/src/main/resources/application.yml b/micronaut-maven-integration-tests/src/it/test-resources/src/main/resources/application.yml
@@ -3,7 +3,7 @@ micronaut:
     name: test-resources
 datasources:
   default:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    db-type: mysql
-    schema-generate: CREATE
-    dialect: MYSQL
+    driver-class-name: org.postgresql.Driver
+    db-type: postgres
+    schema-generate: CREATE_DROP
+    dialect: POSTGRES
diff --git a/...ation-tests/src/it/test-resources/src/test/java/io/micronaut/build/examples/DemoTest.java b/...ation-tests/src/it/test-resources/src/test/java/io/micronaut/build/examples/DemoTest.java
@@ -28,7 +28,7 @@ void testCustomProperty() {
     }
 */
     @Test
-    @DisplayName("A MySQL test container is required to run this test")
+    @DisplayName("A postgres test container is required to run this test")
     void testItWorks() {
         Book book = new Book();
         book.setTitle("Yet Another Book " + UUID.randomUUID());