From 51097ab14751d67a83f3db0920cf66b46cfbf629 Mon Sep 17 00:00:00 2001
From: Dean Wette <wetted@objectcomputing.com>
Date: Fri, 18 Nov 2022 15:23:57 -0600
Subject: [PATCH] Remove references to postgres and use mysql consistently for
 guide

closes #1161
---
 guides/micronaut-flyway/metadata.json                       | 2 +-
 guides/micronaut-flyway/micronaut-flyway.adoc               | 6 +++---
 guides/micronaut-flyway/src/main/resources/application.yml  | 6 +++---
 .../src/main/resources/db/migration/V2__nullable-age.sql    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/guides/micronaut-flyway/metadata.json b/guides/micronaut-flyway/metadata.json
index 462dce6f0c..7b9e353859 100644
--- a/guides/micronaut-flyway/metadata.json
+++ b/guides/micronaut-flyway/metadata.json
@@ -8,7 +8,7 @@
   "apps": [
     {
       "name": "default",
-      "features": ["graalvm","data-jdbc","flyway","postgres", "management"]
+      "features": ["graalvm","data-jdbc","flyway","mysql", "management"]
     }
   ]
 }
diff --git a/guides/micronaut-flyway/micronaut-flyway.adoc b/guides/micronaut-flyway/micronaut-flyway.adoc
index 8c2bcee087..41e05b5499 100644
--- a/guides/micronaut-flyway/micronaut-flyway.adoc
+++ b/guides/micronaut-flyway/micronaut-flyway.adoc
@@ -15,7 +15,7 @@ common:cli-or-launch.adoc[]
 [source,bash]
 ----
 mn create-app example.micronaut.micronautguide \
-   --features=data-jdbc,postgres,flyway \
+   --features=data-jdbc,mysql,flyway \
    --build=@build@ --lang=@lang@
 ----
 
@@ -23,7 +23,7 @@ common:build-lang-arguments.adoc[]
 
 common:default-package.adoc[]
 
-NOTE: If you use https://launch.micronaut.io[Micronaut Launch], select "Micronaut Application" as application type and add `postgres`, `data-jdbc`, and `flyway` as features.
+NOTE: If you use https://launch.micronaut.io[Micronaut Launch], select "Micronaut Application" as application type and add `mysql`, `data-jdbc`, and `flyway` as features.
 
 common:annotationprocessors.adoc[]
 
@@ -116,7 +116,7 @@ test:FlywayEndpointTest[]
 callout:micronaut-test[1]
 callout:http-client[2]
 
-common:test-resources-postgres.adoc[]
+common:test-resources-mysql-datasource.adoc[]
 
 common:testApp.adoc[]
 
diff --git a/guides/micronaut-flyway/src/main/resources/application.yml b/guides/micronaut-flyway/src/main/resources/application.yml
index 9b14c2c052..7abcca2468 100644
--- a/guides/micronaut-flyway/src/main/resources/application.yml
+++ b/guides/micronaut-flyway/src/main/resources/application.yml
@@ -5,9 +5,9 @@ micronaut:
 #tag::datasource[]
 datasources:
   default:
-    driverClassName: org.postgresql.Driver  # <1>
-    dialect: POSTGRES # <2>
-    schema-generate: NONE # <3>
+    driverClassName: com.mysql.cj.jdbc.Driver  # <1>
+    db-type: mysql
+    dialect: MYSQL # <2>
 #end::datasource[]
 ---
 #tag::flyway[]
diff --git a/guides/micronaut-flyway/src/main/resources/db/migration/V2__nullable-age.sql b/guides/micronaut-flyway/src/main/resources/db/migration/V2__nullable-age.sql
index 9419efe177..aced3e7e80 100644
--- a/guides/micronaut-flyway/src/main/resources/db/migration/V2__nullable-age.sql
+++ b/guides/micronaut-flyway/src/main/resources/db/migration/V2__nullable-age.sql
@@ -1 +1 @@
-ALTER TABLE person ALTER COLUMN age DROP NOT NULL;
+ALTER TABLE person MODIFY age int default null;