X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fpgsqlschema.php;h=d50e35f660f65587c89809be2f85198d0c80b04f;hb=3d835bb8b5473783fffb571ccc7f51b6b82b225e;hp=e5442467c45dcdc169f136f887f4890a39970288;hpb=a923ef971912e7d095cd4cae335abb9095930ecb;p=quix0rs-gnu-social.git

diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index e5442467c4..d50e35f660 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -334,6 +334,20 @@ class PgsqlSchema extends Schema
         }
     }
 
+    /**
+     * Append an SQL statement to drop an index from a table.
+     * Note that in PostgreSQL, index names are DB-unique.
+     *
+     * @param array $statements
+     * @param string $table
+     * @param string $name
+     * @param array $def
+     */
+    function appendDropIndex(array &$statements, $table, $name)
+    {
+        $statements[] = "DROP INDEX $name";
+    }
+
     /**
      * Quote a db/table/column identifier if necessary.
      *
@@ -342,7 +356,7 @@ class PgsqlSchema extends Schema
      */
     function quoteIdentifier($name)
     {
-        return '"' . $name . '"';
+        return $this->conn->quoteIdentifier($name);
     }
 
     function mapType($column)
@@ -409,7 +423,33 @@ class PgsqlSchema extends Schema
             $col['type'] = $this->mapType($col);
             unset($col['size']);
         }
+        if (!empty($tableDef['primary key'])) {
+            $tableDef['primary key'] = $this->filterKeyDef($tableDef['primary key']);
+        }
+        if (!empty($tableDef['unique keys'])) {
+            foreach ($tableDef['unique keys'] as $i => $def) {
+                $tableDef['unique keys'][$i] = $this->filterKeyDef($def);
+            }
+        }
         return $tableDef;
     }
 
+    /**
+     * Filter the given key/index definition to match features available
+     * in this database.
+     *
+     * @param array $def
+     * @return array
+     */
+    function filterKeyDef(array $def)
+    {
+        // PostgreSQL doesn't like prefix lengths specified on keys...?
+        foreach ($def as $i => $item)
+        {
+            if (is_array($item)) {
+                $def[$i] = $item[0];
+            }
+        }
+        return $def;
+    }
 }