Changeset 2075

Timestamp:

02/18/2008 02:13:05 PM (11 months ago)

Author:

zombor

Message:

Fixing #412. Thanks rusty_angel.

Files:

• trunk/system/libraries/drivers/Database/Pgsql.php (modified) (4 diffs)

trunk/system/libraries/drivers/Database/Pgsql.php

@@ -88 +88 @@
         public function escape_table($table)
         {
-                return '"'.str_replace('.', '"."', $table).'"';
+                return '\''.str_replace('.', '"."', $table).'\'';
         }
 
@@ -259 +259 @@
                 // WOW...REALLY?!?
                 // Taken from http://www.postgresql.org/docs/7.4/interactive/catalogs.html
-                return 'SELECT
+                $query = $this->query('SELECT
   -- Field
   pg_attribute.attname AS "Field",
@@ -276 +276 @@
   -- Default
   CASE pg_type.typname
-    WHEN \'varchar\' THEN substring(pg_attrdef.adsrc from \'^\'(.*)\'.*$\')
+    WHEN \'varchar\' THEN substring(pg_attrdef.adsrc from \'^(.*).*$\')
     ELSE pg_attrdef.adsrc
   END AS "Default"
@@ -287 +287 @@
     ON (pg_class.oid=pg_attrdef.adrelid AND pg_attribute.attnum=pg_attrdef.adnum)
 WHERE pg_class.relname=\''.$this->escape_table($table).'\' AND pg_attribute.attnum>=1 AND NOT pg_attribute.attisdropped
-ORDER BY pg_attribute.attnum';
+ORDER BY pg_attribute.attnum');
+                $fields = array();
+                foreach ($query as $row)
+                {
+                        $fields[$row->Field]=$row->Type;
+                }
+
+                return $fields;
 
         }