From 507350357c77703d4b5ff01c74d13034caf67c48 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Wed, 13 Sep 2023 11:23:34 +0100 Subject: [PATCH 1/4] CI - Update the list of MySQL containers --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3d28e6d..22c269b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,10 +23,13 @@ jobs: # https://hub.docker.com/_/mysql?tab=tags - "mysql:5.7.32" - "mysql:8.0.22" + - "mysql:8.1.0" # https://hub.docker.com/_/mariadb?tab=tags - "mariadb:10.1" - "mariadb:10.2" - "mariadb:10.5" + - "mariadb:10.6" + - "mariadb:11.1.2" # https://hub.docker.com/_/percona?tab=tags - "percona:8.0.22-13" From 2825a3a57c1f887adcae5b17171057fb1775bf82 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Wed, 13 Sep 2023 11:55:48 +0100 Subject: [PATCH 2/4] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 22c269b..02e6a5c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,7 +29,7 @@ jobs: - "mariadb:10.2" - "mariadb:10.5" - "mariadb:10.6" - - "mariadb:11.1.2" + - "mariadb:11.1.2-jammy" # https://hub.docker.com/_/percona?tab=tags - "percona:8.0.22-13" From 04d0b724ea11628e806e2f41d36123bf1b4c7425 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Wed, 13 Sep 2023 11:58:48 +0100 Subject: [PATCH 3/4] Update tests.yml --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 02e6a5c..b8b7095 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,7 +29,6 @@ jobs: - "mariadb:10.2" - "mariadb:10.5" - "mariadb:10.6" - - "mariadb:11.1.2-jammy" # https://hub.docker.com/_/percona?tab=tags - "percona:8.0.22-13" From 4ae64d461a1785a69a34e00c3527b4d23a99a250 Mon Sep 17 00:00:00 2001 From: macbre Date: Wed, 13 Sep 2023 12:01:53 +0100 Subject: [PATCH 4/4] TestDatabase: MySQL 8.1 and MariaDB 10.6 now default to utf8mb3 --- indexdigest/test/core/test_database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indexdigest/test/core/test_database.py b/indexdigest/test/core/test_database.py index 131299f..1fdefde 100644 --- a/indexdigest/test/core/test_database.py +++ b/indexdigest/test/core/test_database.py @@ -173,7 +173,7 @@ def test_get_table_columns(self): self.assertEqual(columns[1].name, 'foo') self.assertEqual(columns[1].type, 'varchar(16)') - self.assertEqual(columns[1].character_set, 'utf8') + self.assertIn(columns[1].character_set, ['utf8', 'utf8mb3']) self.assertEqual(len(columns), 2)