Skip to content

Revert "Feature/utf8mb4" #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
schagantiwgu wants to merge 1 commit into from
Closed

Revert "Feature/utf8mb4" #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
<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>8.5.13</flywaydb.version>
<flyway-mysql>8.5.13</flyway-mysql>
<flywaydb.version>7.15.0</flywaydb.version>
<okta.version>2.1.5</okta.version>
<!-- TODO - is this needed?-->
<kotest.version>4.1.3</kotest.version>
Expand Down Expand Up @@ -232,12 +231,6 @@
<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>
Expand Down
76 changes: 0 additions & 76 deletions api/src/main/resources/db/migration/V2023.07.05__alter_schema.sql
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion docker-compose.quickstart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:

db:
image: library/mysql:8.0
command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb3 --collation-server=utf8mb3_unicode_ci
volumes:
- sql_db:/var/lib/mysql:rw
- ./docker/mysql-init:/docker-entrypoint-initdb.d
Expand Down
2 changes: 1 addition & 1 deletion docker/dev-stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: '3.3'
services:
db:
image: library/mysql:8.0
command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb3 --collation-server=utf8mb3_unicode_ci
volumes:
- sql_db:/var/lib/mysql:rw
- ./mysql-init:/docker-entrypoint-initdb.d
Expand Down
4 changes: 0 additions & 4 deletions test/sql/fixed_ci_dataset.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98335,7 +98335,3 @@ 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);