getTableDef() mostly working in postgres

diff --git a/lib/schema.php b/lib/schema.php
index a7f64ebed10cfce99fb780756a6fffa78831df83..6292a3d56b090a47114fc62c749d55832017b022 100644 (file)
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -94,7 +94,12 @@ class Schema
 
     public function getTableDef($name)
     {
-        $res = $this->conn->query('DESCRIBE ' . $name);
+        if(common_config('db','type') == 'pgsql') {
+            $res = $this->conn->query("select column_default as default, is_nullable as Null, udt_name as Type, column_name AS Field from INFORMATION_SCHEMA.COLUMNS where table_name = '$name'");
+        }
+        else { 
+            $res = $this->conn->query('DESCRIBE ' . $name);
+        }
 
         if (PEAR::isError($res)) {
             throw new Exception($res->getMessage());
@@ -108,12 +113,16 @@ class Schema
         $row = array();
 
         while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
+            //lower case the keys, because the php postgres driver is case insentive for column names
+           foreach($row as $k=>$v) {
+               $row[strtolower($k)] = $row[$k];
+            }
 
             $cd = new ColumnDef();
 
-            $cd->name = $row['Field'];
+            $cd->name = $row['field'];
 
-            $packed = $row['Type'];
+            $packed = $row['type'];
 
             if (preg_match('/^(\w+)\((\d+)\)$/', $packed, $match)) {
                 $cd->type = $match[1];
@@ -122,9 +131,9 @@ class Schema
                 $cd->type = $packed;
             }
 
-            $cd->nullable = ($row['Null'] == 'YES') ? true : false;
+            $cd->nullable = ($row['null'] == 'YES') ? true : false;
             $cd->key      = $row['Key'];
-            $cd->default  = $row['Default'];
+            $cd->default  = $row['default'];
             $cd->extra    = $row['Extra'];
 
             $td->columns[] = $cd;