Changeset 2166

Timestamp:

02/25/2008 11:11:19 AM (11 months ago)

Author:

zombor

Message:

merging changes for release

Location:

releases/2.1.2/system/libraries

Files:

• Database.php (modified) (1 diff)
• drivers/Database/Pdosqlite.php (modified) (1 diff)
• drivers/Database/Pgsql.php (modified) (2 diffs)

releases/2.1.2/system/libraries/Database.php

@@ -1057 +1057 @@
 
         /**
+         * Escapes a table name for a query.
+         *
+         * @param   string  string to escape
+         * @return  string
+         */
+        public function escape_table($table)
+        {
+                return $this->driver->escape_table($table);
+        }
+
+        /**
+         * Escapes a column name for a query.
+         *
+         * @param   string  string to escape
+         * @return  string
+         */
+        public function escape_column($table)
+        {
+                return $this->driver->escape_column($table);
+        }
+
+        /**
          * Returns table prefix of current configuration.
          *

releases/2.1.2/system/libraries/drivers/Database/Pdosqlite.php

@@ -257 +257 @@
                 }
                 else
-                {
-                        return 'PRAGMA table_info('.$this->escape_table($table).')';
+                { 
+                        $result = $this->link->query( 'PRAGMA table_info('.$this->escape_table($table).')' );
+                        
+                        foreach($result as $row)
+                        {
+                                $tables[$table][$row['name']] = $this->sql_type($row['type']);
+                        }       
+
+                        return $tables[$table]; 
                 }
         }

releases/2.1.2/system/libraries/drivers/Database/Pgsql.php

@@ -88 +88 @@
         public function escape_table($table)
         {
-                return '\''.str_replace('.', '"."', $table).'\'';
+                return '"'.str_replace('.', '"."', $table).'"';
         }
 
@@ -351 +351 @@
                 if (is_resource($result))
                 {
-                        $this->current_row = 0;
-                        $this->total_rows  = pg_num_rows($this->result);
-                        $this->fetch_type = ($object === TRUE) ? 'pg_fetch_object' : 'pg_fetch_array';
-                }
-                elseif (is_bool($result))
-                {
-                        if ($result == FALSE)
-                        {
-                                // SQL error
-                                throw new Kohana_Database_Exception('database.error', pg_last_error().' - '.$sql);
+                        // Its an DELETE, INSERT, REPLACE, or UPDATE query
+                        if (preg_match('/^(?:delete|insert|replace|update)\s+/i', trim($sql), $matches))
+                        {
+                                $this->insert_id  = (strtolower($matches[0]) == 'insert') ? $this->get_insert_id($link) : FALSE;
+                                $this->total_rows = pg_affected_rows($link);
                         }
                         else
                         {
-                                // Its an DELETE, INSERT, REPLACE, or UPDATE query
-                                $this->insert_id  = $this->get_insert_id($link);
-                                $this->total_rows = pg_affected_rows($link);
-                        }
-                }
+                                $this->current_row = 0;
+                                $this->total_rows  = pg_num_rows($this->result);
+                                $this->fetch_type = ($object === TRUE) ? 'pg_fetch_object' : 'pg_fetch_array';
+                        }
+                }
+                else
+                        throw new Kohana_Database_Exception('database.error', pg_last_error().' - '.$sql);
 
                 // Set result type