Merge pull request #66 from graze/utf8mb3-diff-ignore

charset & collation diff utf8mb3 as utf8
graze · May 1, 2024 · a89058f · a89058f
2 parents b4c7027 + c97c569
commit a89058f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/Parse/CollationInfo.php b/src/Parse/CollationInfo.php
@@ -193,6 +193,11 @@ public function setCharset($charset)
     public function setCollation($collation)
     {
         $collation = strtolower($collation);
+        if (str_contains($collation, 'utf8mb3')) {
+            $collation = str_replace('utf8mb3', 'utf8', $collation);
+            $this->charset =  str_replace('utf8mb3', 'utf8', $this->charset);
+        }
+
         $charset = self::getCollationCharset($collation);
         if (is_null($charset)) {
             throw new RuntimeException("unknown collation '$collation'");

diff --git a/src/Parse/CreateTable.php b/src/Parse/CreateTable.php
@@ -475,6 +475,13 @@ private function diffColumns(CreateTable $that)
                 // An existing column is being changed
                 $thisDefinition = $this->columns[$columnName]->toString($this->getCollation());
                 $thatDefinition = $that->columns[$columnName]->toString($that->getCollation());
+
+                if (str_contains($thisDefinition, 'utf8mb3')) {
+                    $thisDefinition = str_replace('utf8mb3', 'utf8', $thisDefinition);
+                }
+                if (str_contains($thatDefinition, 'utf8mb3')) {
+                    $thatDefinition = str_replace('utf8mb3', 'utf8', $thatDefinition);
+                }
 
                 // about to 'add' $columnName - get its location in the currently
                 // permuted state of the tabledef