issue #124 - fix mysql 5.7 support

makinacorpus · Apr 25, 2024 · a40f9ba · a40f9ba
1 parent b9b309e
commit a40f9ba
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 36 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -224,6 +224,7 @@ jobs:
         php-version:
           - "8.1"
         mysql-version:
+          - "5.7"
           - "8.0"
           - "8.2"
           - "8.3"

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": ">=8.1",
         "doctrine/doctrine-bundle": "^2.10.0",
-        "makinacorpus/query-builder": "^1.5.5",
+        "makinacorpus/query-builder": "^1.6.1",
         "symfony/config": "^6.0|^7.0",
         "symfony/console": "^6.0|^7.0",
         "symfony/dependency-injection": "^6.0|^7.0",

diff --git a/dev.sh b/dev.sh
@@ -161,9 +161,7 @@ do_test_mariadb11() {
 }
 
 do_test_mysql() {
-    # @todo Temporary deactivated MySQL 5.7 due to a bug.
-    # https://github.com/makinacorpus/DbToolsBundle/issues/124
-    # do_test_mysql57
+    do_test_mysql57 "$@"
     do_test_mysql80 "$@"
     do_test_mysql83 "$@"
     do_test_mariadb11 "$@"
@@ -256,9 +254,7 @@ do_test_sqlite() {
 do_test_all() {
     do_composer_update
 
-    # @todo Temporary deactivated MySQL 5.7 due to a bug.
-    # https://github.com/makinacorpus/DbToolsBundle/issues/124
-    # do_test_mysql57
+    do_test_mysql57 "$@"
     do_test_mysql80 "$@"
     do_test_mysql83 "$@"
     do_test_mariadb11 "$@"

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -40,6 +40,7 @@ services:
         restart: 'no'
         environment:
             MYSQL_DATABASE: test_db
+            MYSQL_ROOT_USER: root
             MYSQL_ROOT_PASSWORD: password
         ports:
             - 9501:3306

diff --git a/docs/content/getting-started/database-vendors.md b/docs/content/getting-started/database-vendors.md
@@ -5,7 +5,7 @@ Fully supported database vendors are:
 - PostgreSQL 10 and above
   <br><small>(previous versions from 9.5 are untested but should work)</small>
 - MariaDB 10.11 and above
-- MySQL 8.0 and above
+- MySQL 5.7, 8.0 and above
 
 Partially supported database vendors are:
 

diff --git a/docs/content/getting-started/installation.md b/docs/content/getting-started/installation.md
@@ -14,7 +14,7 @@ Currently supported database vendors:
 - PostgreSQL 10 and above
   <br><small>(previous versions from 9.5 are untested but should work)</small>
 - MariaDB 10.11 and above
-- MySQL 8.0 and above
+- MySQL 5.7, 8.0 and above
 - SQLite 3.0 and above
 - SQL Server 2019 and above
   <br><small>(previous versions from 2015 are untested but should work)</small>

diff --git a/src/Anonymization/Anonymizator.php b/src/Anonymization/Anonymizator.php
@@ -630,23 +630,43 @@ protected function addAnonymizerIdColumnMySql(string $table): void
         );
 
         try {
-            $this->databaseSession->executeStatement(
-                <<<SQL
-                CREATE FUNCTION IF NOT EXISTS ?::id() RETURNS BIGINT
-                DETERMINISTIC
-                BEGIN
-                    SELECT `value` + 1 INTO @value FROM ?::table LIMIT 1;
-                    UPDATE ?::table SET value = @value;
-                    RETURN @value;
-                END;
-                ;;
-                SQL,
-                [
-                    $functionName,
-                    $sequenceTableName,
-                    $sequenceTableName,
-                ],
-            );
+            if ($this->databaseSession->vendorVersionIs('8.0', '<')) {
+                $this->databaseSession->executeStatement(
+                    <<<SQL
+                    CREATE FUNCTION ?::id() RETURNS INTEGER
+                    DETERMINISTIC
+                    BEGIN
+                        SELECT `value` + 1 INTO @value FROM ?::table LIMIT 1;
+                        UPDATE ?::table SET value = @value;
+                        RETURN @value;
+                    END;
+                    ;;
+                    SQL,
+                    [
+                        $functionName,
+                        $sequenceTableName,
+                        $sequenceTableName,
+                    ],
+                );
+            } else {
+                $this->databaseSession->executeStatement(
+                    <<<SQL
+                    CREATE FUNCTION IF NOT EXISTS ?::id() RETURNS BIGINT
+                    DETERMINISTIC
+                    BEGIN
+                        SELECT `value` + 1 INTO @value FROM ?::table LIMIT 1;
+                        UPDATE ?::table SET value = @value;
+                        RETURN @value;
+                    END;
+                    ;;
+                    SQL,
+                    [
+                        $functionName,
+                        $sequenceTableName,
+                        $sequenceTableName,
+                    ],
+                );
+            }
 
             $this->databaseSession->executeStatement(
                 <<<SQL

diff --git a/src/Anonymization/Anonymizer/AbstractEnumAnonymizer.php b/src/Anonymization/Anonymizer/AbstractEnumAnonymizer.php
@@ -4,6 +4,7 @@
 
 namespace MakinaCorpus\DbToolsBundle\Anonymization\Anonymizer;
 
+use MakinaCorpus\QueryBuilder\Vendor;
 use MakinaCorpus\QueryBuilder\Query\Select;
 use MakinaCorpus\QueryBuilder\Query\Update;
 
@@ -50,11 +51,25 @@ public function anonymize(Update $update): void
         $sampleCount = $this->countTable($this->sampleTableName);
 
         $joinAlias = $this->sampleTableName . '_' . $this->columnName;
-        $join = (new Select($this->sampleTableName))
-            ->column('value')
-            ->columnRaw('ROW_NUMBER() OVER (ORDER BY ?)', 'rownum', [$expr->random()])
-            ->range($targetCount) // Avoid duplicate rows.
-        ;
+
+        if ($this->databaseSession->vendorIs(Vendor::MYSQL, '8.0', '<')) {
+            $inner = (new Select($this->sampleTableName))
+                ->column('value')
+                ->orderBy($expr->random())
+                ->range($targetCount) // Avoid duplicate rows.
+            ;
+            $join = (new Select($inner))
+                ->from($expr->raw('(SELECT @rownum := 0)'))
+                ->column('value')
+                ->columnRaw('@rownum := @rownum + 1', 'rownum')
+            ;
+        } else {
+            $join = (new Select($this->sampleTableName))
+                ->column('value')
+                ->columnRaw('ROW_NUMBER() OVER (ORDER BY ?)', 'rownum', [$expr->random()])
+                ->range($targetCount) // Avoid duplicate rows.
+            ;
+        }
 
         $update->leftJoin(
             $join,

diff --git a/src/Anonymization/Anonymizer/AbstractMultipleColumnAnonymizer.php b/src/Anonymization/Anonymizer/AbstractMultipleColumnAnonymizer.php
@@ -6,6 +6,7 @@
 
 use MakinaCorpus\QueryBuilder\Query\Select;
 use MakinaCorpus\QueryBuilder\Query\Update;
+use MakinaCorpus\QueryBuilder\Vendor;
 
 /**
  * Class of anonymizers that work on a Table target, and allow updating
@@ -95,11 +96,25 @@ public function anonymize(Update $update): void
         $sampleCount = $this->countTable($this->sampleTableName);
 
         $joinAlias = $this->sampleTableName . '_' . $this->columnName;
-        $join = (new Select($this->sampleTableName))
-            ->columns($columnOptions)
-            ->columnRaw('ROW_NUMBER() OVER (ORDER BY ?)', 'rownum', [$expr->random()])
-            ->range($targetCount) // Avoid duplicate rows.
-        ;
+
+        if ($this->databaseSession->vendorIs(Vendor::MYSQL, '8.0', '<')) {
+            $inner = (new Select($this->sampleTableName))
+                ->columns($columnOptions)
+                ->orderBy($expr->random())
+                ->range($targetCount) // Avoid duplicate rows.
+            ;
+            $join = (new Select($inner))
+                ->from($expr->raw('(SELECT @rownum := 0)'))
+                ->columns($columnOptions)
+                ->columnRaw('@rownum := @rownum + 1', 'rownum')
+            ;
+        } else {
+            $join = (new Select($this->sampleTableName))
+                ->columns($columnOptions)
+                ->columnRaw('ROW_NUMBER() OVER (ORDER BY ?)', 'rownum', [$expr->random()])
+                ->range($targetCount) // Avoid duplicate rows.
+            ;
+        }
 
         $update->leftJoin(
             $join,