diff --git a/pg4wp/rewriters/CreateTableSQLRewriter.php b/pg4wp/rewriters/CreateTableSQLRewriter.php index 3f23cc1..6120ca7 100644 --- a/pg4wp/rewriters/CreateTableSQLRewriter.php +++ b/pg4wp/rewriters/CreateTableSQLRewriter.php @@ -30,6 +30,7 @@ class CreateTableSQLRewriter extends AbstractSQLRewriter ' COLLATE utf8mb4_unicode_520_ci' => '', ' COLLATE utf8_general_ci' => '', ' CHARACTER SET utf8' => '', + ' DEFAULT CHARSET=utf8' => '', // For flash-album-gallery plugin ' tinyint' => ' smallint' @@ -46,7 +47,12 @@ class CreateTableSQLRewriter extends AbstractSQLRewriter $table = $matches[1]; // Remove trailing spaces - $sql = trim($sql) . ';'; + $sql = trim($sql); + + // Add a slash if needed + if (substr($sql,strlen($sql)-1, 1) != ";") { + $sql = $sql . ";"; + } // Translate types and some other replacements $sql = str_ireplace( diff --git a/tests/rewriteTest.php b/tests/rewriteTest.php index d71f75a..18bd6e4 100644 --- a/tests/rewriteTest.php +++ b/tests/rewriteTest.php @@ -280,6 +280,32 @@ final class rewriteTest extends TestCase $this->assertSame(trim($expected), trim($postgresql)); } + + public function test_it_removes_table_charsets() + { + $sql = <<assertSame(trim($expected), trim($postgresql)); + } + + + + protected function setUp(): void { global $wpdb;