Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / scripts / dumpschema.php

diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
old mode 100644 (file)
new mode 100755 (executable)
index 2b238f0..05638cd
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -34,7 +34,7 @@ Attempt to pull a schema definition for a given table.
 END_OF_CHECKSCHEMA_HELP;
 
 $longoptions = array('diff', 'all', 'create', 'update', 'raw', 'checksum');
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 function indentOptions($indent)
 {
@@ -177,7 +177,7 @@ function dumpDiff($tableName, $filter)
         if ($section == 'fields') {
             // this shouldn't be needed maybe... wait what?
         }
-        $diff = $schema->diffArrays($old, $def, $section, $compare);
+        $diff = $schema->diffArrays($old, $def, $section);
         $chunks = array('del', 'mod', 'add');
         foreach ($chunks as $chunk) {
             if ($diff[$chunk]) {
@@ -205,6 +205,10 @@ function tweakPrimaryKey($def)
         $def['primary keys'] = array('primary key' => $def['primary key']);
         unset($def['primary key']);
     }
+    if (isset($def['description'])) {
+        $def['descriptions'] = array('description' => $def['description']);
+        unset($def['description']);
+    }
     return $def;
 }
 
@@ -246,4 +250,4 @@ if (count($args)) {
     }
 } else {
     show_help($helptext);
-}
\ No newline at end of file
+}