Make the SQL exports compatible for side by side comparison with old …

…exports Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Aug 20, 2015 · aed8527 · udan11 · Aug 20, 2015 · madhuracj
1 parent 932471e
commit aed8527
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php
@@ -1701,7 +1701,7 @@ public function getTableDef(
                         $sql_auto_increments_query .= ', AUTO_INCREMENT='
                             . $statement->entityOptions->has('AUTO_INCREMENT');
                     }
-                    $sql_auto_increments_query .= $alter_footer;
+                    $sql_auto_increments_query .= ';';
 
                     $sql_auto_increments = $this->generateComment(
                         $crlf, $sql_auto_increments,

diff --git a/libraries/sql-parser/src/Components/CreateDefinition.php b/libraries/sql-parser/src/Components/CreateDefinition.php
@@ -282,7 +282,7 @@ public static function build($component)
             foreach ($component as $c) {
                 $ret[] = static::build($c);
             }
-            return "(\n" . implode(",\n", $ret) . "\n)";
+            return "(\n  " . implode(",\n  ", $ret) . "\n)";
         } else {
             $tmp = '';
 

diff --git a/libraries/sql-parser/src/Components/DataType.php b/libraries/sql-parser/src/Components/DataType.php
@@ -158,10 +158,10 @@ public static function build($component)
     {
         $tmp = '';
         if (!empty($component->parameters)) {
-            $tmp = '(' . implode(', ', $component->parameters) . ')';
+            $tmp = '(' . implode(',', $component->parameters) . ')';
         }
         return trim(
-            $component->name . $tmp . ' '
+            strtolower($component->name) . $tmp . ' '
             . OptionsArray::build($component->options)
         );
     }

diff --git a/libraries/sql-parser/src/Components/Key.php b/libraries/sql-parser/src/Components/Key.php
@@ -163,7 +163,7 @@ public static function build($component)
         if (!empty($component->name)) {
             $ret .= Context::escape($component->name) . ' ';
         }
-        $ret .= '(' . implode(', ', Context::escape($component->columns)) . ')';
+        $ret .= '(' . implode(',', Context::escape($component->columns)) . ')';
         $ret .= OptionsArray::build($component->options);
         return trim($ret);
     }