wgu-opensource · schagantiwgu · Jul 13, 2023 · Jul 6, 2023 · Jul 6, 2023 · Jul 12, 2023
diff --git a/api/pom.xml b/api/pom.xml
@@ -36,7 +36,8 @@
         <kotlin.code.style>official</kotlin.code.style>
         <kotlin.coroutines.version>1.5.1</kotlin.coroutines.version>
         <exposed.version>0.24.1</exposed.version>
-        <flywaydb.version>7.15.0</flywaydb.version>
+        <flywaydb.version>8.5.13</flywaydb.version>
+        <flyway-mysql>8.5.13</flyway-mysql>
         <okta.version>2.1.5</okta.version>
 <!--        TODO - is this needed?-->
         <kotest.version>4.1.3</kotest.version>
@@ -231,6 +232,12 @@
             <artifactId>flyway-core</artifactId>
             <version>${flywaydb.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-mysql</artifactId>
+            <version>${flyway-mysql}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>

diff --git a/api/src/main/resources/db/migration/V2023.07.05__alter_schema.sql b/api/src/main/resources/db/migration/V2023.07.05__alter_schema.sql
@@ -0,0 +1,76 @@
+USE osmt_db;
+
+ALTER SCHEMA osmt_db
+DEFAULT CHARACTER SET = utf8mb4;
+
+ALTER SCHEMA osmt_db
+DEFAULT COLLATE = utf8mb4_unicode_ci;
+
+-- AuditLog: table
+ALTER TABLE `AuditLog`
+    DEFAULT CHARSET=utf8mb4,
+    MODIFY `user` varchar(256) COLLATE utf8mb4_unicode_ci NOT NULL,
+    MODIFY `operationType` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL,
+    MODIFY `tableName` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL,
+    MODIFY `changedFields` text COLLATE utf8mb4_unicode_ci NOT NULL;
+
+-- Collection: table
+ALTER TABLE `Collection`
+    DEFAULT CHARSET=utf8mb4,
+    MODIFY `uuid` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL,
+    MODIFY `name` text COLLATE utf8mb4_unicode_ci NOT NULL,
+    MODIFY `workspace_owner` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+    MODIFY `status` enum('unarchived','deleted','workspace','published','archived','draft') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'draft',
+    MODIFY `description` text COLLATE utf8mb4_unicode_ci;
+
+-- CollectionSkills: table
+ALTER TABLE `CollectionSkills`
+    DEFAULT CHARSET=utf8mb4,
+    DEFAULT COLLATE = utf8mb4_unicode_ci;
+
+-- JobCode: table
+ALTER TABLE `JobCode`
+    DEFAULT CHARSET=utf8mb4,
+    MODIFY `code` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL,
+    MODIFY `name` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    MODIFY `major` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    MODIFY `minor` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    MODIFY `broad` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    MODIFY `detailed` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    MODIFY `description` text COLLATE utf8mb4_unicode_ci,
+    MODIFY `framework` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    MODIFY `url` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL;
+
+-- Keyword: table
+ALTER TABLE `Keyword`
+    DEFAULT CHARSET=utf8mb4,
+    MODIFY `value` varchar(767) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    MODIFY `uri` varchar(767) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    MODIFY `keyword_type_enum` enum('Category','Keyword','Standard','Certification','Alignment','Employer','Author') COLLATE utf8mb4_unicode_ci NOT NULL,
+    MODIFY `framework` varchar(767) COLLATE utf8mb4_unicode_ci DEFAULT NULL;
+
+-- RichSkillDescriptor: table
+ALTER TABLE `RichSkillDescriptor`
+    DEFAULT CHARSET=utf8mb4,
+    MODIFY `uuid` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL,
+    MODIFY `name` text COLLATE utf8mb4_unicode_ci NOT NULL,
+    MODIFY `statement` text COLLATE utf8mb4_unicode_ci NOT NULL;
+
+-- RichSkillJobCodes: table
+ALTER TABLE `RichSkillJobCodes`
+    DEFAULT CHARSET=utf8mb4,
+    DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+-- RichSkillKeywords: table
+ALTER TABLE `RichSkillKeywords`
+    DEFAULT CHARSET=utf8mb4,
+    DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+-- flyway_schema_history: table
+ALTER TABLE `flyway_schema_history`
+    DEFAULT CHARSET=utf8mb4,
+    MODIFY `version` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    MODIFY `description` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL,
+    MODIFY `type` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL,
+    MODIFY `script` varchar(1000) COLLATE utf8mb4_unicode_ci NOT NULL,
+    MODIFY `installed_by` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL;
diff --git a/docker-compose.quickstart.yml b/docker-compose.quickstart.yml
@@ -33,7 +33,7 @@ services:
 
   db:
     image: library/mysql:8.0
-    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb3 --collation-server=utf8mb3_unicode_ci
+    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     volumes:
       - sql_db:/var/lib/mysql:rw
       - ./docker/mysql-init:/docker-entrypoint-initdb.d

diff --git a/docker/dev-stack.yml b/docker/dev-stack.yml
@@ -4,7 +4,7 @@ version: '3.3'
 services:
   db:
     image: library/mysql:8.0
-    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb3 --collation-server=utf8mb3_unicode_ci
+    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     volumes:
       - sql_db:/var/lib/mysql:rw
       - ./mysql-init:/docker-entrypoint-initdb.d

diff --git a/test/sql/fixed_ci_dataset.sql b/test/sql/fixed_ci_dataset.sql
@@ -98335,3 +98335,7 @@ INSERT INTO `flyway_schema_history` (`installed_rank`, `version`, `description`,
     VALUES (8,'2023.02.20','richskill-multiple-authors','SQL','V2023.02.20__richskill-multiple-authors.sql',-825485982,'osmt_db_user','2023-03-29 19:55:03',172,1);
 INSERT INTO `flyway_schema_history` (`installed_rank`, `version`, `description`, `type`, `script`, `checksum`, `installed_by`, `installed_on`, `execution_time`, `success`)
     VALUES (9,'2023.03.07','richskill-multiple-categories','SQL','V2023.03.07__richskill-multiple-categories.sql',-2042363497,'osmt_db_user','2023-03-29 20:46:24',471,1);
+INSERT INTO `flyway_schema_history` (`installed_rank`, `version`, `description`, `type`, `script`, `checksum`, `installed_by`, `installed_on`, `execution_time`, `success`)
+    VALUES (10,'2023.03.22','workspace update statement','SQL','V2023.03.22__workspace_update_statement.sql',481912727,'osmt_db_user','2023-07-05 20:32:21',9,1);
+INSERT INTO `flyway_schema_history` (`installed_rank`, `version`, `description`, `type`, `script`, `checksum`, `installed_by`, `installed_on`, `execution_time`, `success`)
+    VALUES (11,'2023.07.05','alter schema','SQL','V2023.07.05__alter_schema.sql',-2134506806,'osmt_db_user','2023-07-12 20:41:02',116,1);