Make StatusNet::initDefaults() public so we can call it from the installer.

[quix0rs-gnu-social.git] / lib / schema.php

diff --git a/lib/schema.php b/lib/schema.php
index f6543a21b176c9e26243653ef1ff23a8501da52c..2793906a461657c6b8815dab66257a87969484b1 100644 (file)
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -143,6 +143,7 @@ class Schema
      */
     public function buildCreateTable($name, $def)
     {
+        $def = $this->filterDef($def);
         $sql = array();
 
         foreach ($def['fields'] as $col => $colDef) {
@@ -234,7 +235,7 @@ class Schema
      */
     function appendUniqueKeyDef(array &$sql, $name, array $def)
     {
-        $sql[] = "UNIQUE $key " . $this->buildIndexList($def);
+        $sql[] = "UNIQUE $name " . $this->buildIndexList($def);
     }
 
     /**
@@ -487,28 +488,18 @@ class Schema
             }
         }
 
-        $cur = array_keys($old['fields']);
-        $new = array_keys($def['fields']);
+        $old = $this->filterDef($old);
+        $def = $this->filterDef($def);
 
-        $toadd  = array_diff($new, $cur);
-        $todrop = array_diff($cur, $new);
-        $same   = array_intersect($new, $cur);
-        $tomod  = array();
-
-        // Find which fields have actually changed definition
-        // in a way that we need to tweak them for this DB type.
-        foreach ($same as $name) {
-            $curCol = $old['fields'][$name];
-            $newCol = $cur['fields'][$name];
+        // @fixme check if not present
+        $fields = $this->diffArrays($old, $def, 'fields', array($this, 'columnsEqual'));
+        $uniques = $this->diffArrays($old, $def, 'unique keys');
+        $indexes = $this->diffArrays($old, $def, 'indexes');
 
-            if (!$this->columnsEqual($curCol, $newCol)) {
-                $tomod[] = $name;
-            }
-        }
-
-        if (count($toadd) + count($todrop) + count($tomod) == 0) {
+        $total = $fields['count'] + $uniques['count'] + $indexes['count'];
+        if ($total == 0) {
             // nothing to do
-            return true;
+            return array();
         }
 
         // For efficiency, we want this all in one
@@ -516,30 +507,67 @@ class Schema
 
         $phrase = array();
 
-        foreach ($toadd as $columnName) {
+        foreach ($uniques['del'] + $uniques['mod'] as $keyName) {
+            $this->appendAlterDropUnique($phrase, $keyName);
+        }
+
+        foreach ($fields['add'] as $columnName) {
             $this->appendAlterAddColumn($phrase, $columnName,
                     $def['fields'][$columnName]);
         }
 
-        foreach ($todrop as $columnName) {
+        foreach ($fields['mod'] as $columnName) {
             $this->appendAlterModifyColumn($phrase, $columnName,
                     $old['fields'][$columnName],
                     $def['fields'][$columnName]);
         }
 
-        foreach ($tomod as $columnName) {
+        foreach ($fields['del'] as $columnName) {
             $this->appendAlterDropColumn($phrase, $columnName);
         }
 
-        $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase);
+        foreach ($uniques['mod'] + $uniques['add'] as $keyName) {
+            $this->appendAlterAddUnique($phrase, $keyName, $def['unique keys'][$keyName]);
+        }
+
+        $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(",\n", $phrase);
 
-        $res = $this->conn->query($sql);
+        return array($sql);
+    }
 
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
+    function diffArrays($oldDef, $newDef, $section, $compareCallback=null)
+    {
+        $old = isset($oldDef[$section]) ? $oldDef[$section] : array();
+        $new = isset($newDef[$section]) ? $newDef[$section] : array();
 
-        return true;
+        $oldKeys = array_keys($old);
+        $newKeys = array_keys($new);
+
+        $toadd  = array_diff($newKeys, $oldKeys);
+        $todrop = array_diff($oldKeys, $newKeys);
+        $same   = array_intersect($newKeys, $oldKeys);
+        $tomod  = array();
+        $tokeep = array();
+
+        // Find which fields have actually changed definition
+        // in a way that we need to tweak them for this DB type.
+        foreach ($same as $name) {
+            if ($compareCallback) {
+                $same = call_user_func($compareCallback, $old[$name], $new[$name]);
+            } else {
+                $same = ($old[$name] == $new[$name]);
+            }
+            if ($same) {
+                $tokeep[] = $name;
+                continue;
+            }
+            $tomod[] = $name;
+        }
+        return array('add' => $toadd,
+                     'del' => $todrop,
+                     'mod' => $tomod,
+                     'keep' => $tokeep,
+                     'count' => count($toadd) + count($todrop) + count($tomod));
     }
 
     /**
@@ -587,6 +615,19 @@ class Schema
         $phrase[] = 'DROP COLUMN ' . $this->quoteIdentifier($columnName);
     }
 
+    function appendAlterAddUnique(array &$phrase, $keyName, array $def)
+    {
+        $sql = array();
+        $sql[] = 'ADD';
+        $this->appendUniqueKeyDef($sql, $keyName, $def);
+        $phrase[] = implode(' ', $sql);'ADD CONSTRAINT ' . $keyName;
+    }
+
+    function appendAlterDropUnique(array &$phrase, $keyName)
+    {
+        $phrase[] = 'DROP CONSTRAINT ' . $keyName;
+    }
+
     /**
      * Quote a db/table/column identifier if necessary.
      *
@@ -812,6 +853,20 @@ class Schema
         return $table;
     }
 
+    /**
+     * Filter the given table definition array to match features available
+     * in this database.
+     *
+     * This lets us strip out unsupported things like comments, foreign keys,
+     * or type variants that we wouldn't get back from getTableDef().
+     *
+     * @param array $tableDef
+     */
+    function filterDef(array $tableDef)
+    {
+        return $tableDef;
+    }
+
     function isNumericType($type)
     {
         $type = strtolower($type);