Fix table comment of table with options.

Author: prwater

.gitattributes

@@ -0,0 +1,7 @@
+/.gitattributes export-ignore
+/.github/       export-ignore
+/.gitignore     export-ignore
+/build.xml      export-ignore
+/phpunit.xml    export-ignore
+/README.md      export-ignore
+/test/          export-ignore

src/MySqlFix.php

@@ -264,8 +264,15 @@ public static function fixTableComments(string $source): string
       }
 
       // Enhance the column definition with comment.
-      $lines[$line_number] = mb_substr(rtrim($lines[$line_number]), 0, -1);
-      $lines[$line_number] .= " COMMENT '".self::escapeMysqlString($comment)."';";
+      if (mb_substr(rtrim($lines[$line_number]), -1)===';')
+      {
+        $lines[$line_number] = mb_substr(rtrim($lines[$line_number]), 0, -1);
+        $lines[$line_number] .= " COMMENT '".self::escapeMysqlString($comment)."';";
+      }
+      else
+      {
+        $lines[$line_number] .= " COMMENT '".self::escapeMysqlString($comment)."'";
+      }
     }
 
     return implode(PHP_EOL, $lines);

test/erd/php-erd-concepts.ecm

@@ -1433,7 +1433,7 @@
 </INDEXKEYS>
 <BC_SCRIPT></BC_SCRIPT>
 <AC_SCRIPT></AC_SCRIPT>
-<STORAGE></STORAGE>
+<STORAGE>engine=innodb</STORAGE>
 <VARIABLES></VARIABLES>
 </DATA>
 <DATA>

test/source/quoted/php-erd-concepts-create.ddl

@@ -42,7 +42,8 @@ CREATE TABLE `FOO1` (
   `c2` VARCHAR(40),
   `c3` VARCHAR(40),
   CONSTRAINT `PK_FOO1` PRIMARY KEY (`c1`)
-);
+)
+engine=innodb;
 
 /*
 COMMENT ON TABLE `FOO1`

test/source/unquoted/php-erd-concepts-create.ddl

@@ -42,7 +42,8 @@ CREATE TABLE FOO1 (
   c2 VARCHAR(40),
   c3 VARCHAR(40),
   CONSTRAINT PK_FOO1 PRIMARY KEY (c1)
-);
+)
+engine=innodb;
 
 /*
 COMMENT ON TABLE FOO1

test/template/quoted/column.ddl

@@ -42,7 +42,8 @@ CREATE TABLE `FOO1` (
   `c2` VARCHAR(40) COMMENT 'Column 2.',
   `c3` VARCHAR(40) COMMENT 'Column 3.',
   CONSTRAINT `PK_FOO1` PRIMARY KEY (`c1`)
-);
+)
+engine=innodb;
 
 /*
 COMMENT ON TABLE `FOO1`

test/template/quoted/index.ddl

@@ -42,7 +42,8 @@ CREATE TABLE `FOO1` (
   `c2` VARCHAR(40),
   `c3` VARCHAR(40),
   CONSTRAINT `PK_FOO1` PRIMARY KEY (`c1`)
-);
+)
+engine=innodb;
 
 /*
 COMMENT ON TABLE `FOO1`

test/template/quoted/table.ddl

@@ -44,7 +44,8 @@ CREATE TABLE `FOO1` (
   `c2` VARCHAR(40),
   `c3` VARCHAR(40),
   CONSTRAINT `PK_FOO1` PRIMARY KEY (`c1`)
-) COMMENT 'This is table FOO1.';
+) COMMENT 'This is table FOO1.'
+engine=innodb;
 
 /*
 COMMENT ON TABLE `FOO1`

test/template/unquoted/column.ddl

@@ -42,7 +42,8 @@ CREATE TABLE FOO1 (
   c2 VARCHAR(40) COMMENT 'Column 2.',
   c3 VARCHAR(40) COMMENT 'Column 3.',
   CONSTRAINT PK_FOO1 PRIMARY KEY (c1)
-);
+)
+engine=innodb;
 
 /*
 COMMENT ON TABLE FOO1

test/template/unquoted/index.ddl

@@ -42,7 +42,8 @@ CREATE TABLE FOO1 (
   c2 VARCHAR(40),
   c3 VARCHAR(40),
   CONSTRAINT PK_FOO1 PRIMARY KEY (c1)
-);
+)
+engine=innodb;
 
 /*
 COMMENT ON TABLE FOO1