Changeset 2165 for trunk/system/libraries/drivers/Database/Pgsql.php

Timestamp:

02/25/2008 09:37:34 AM (11 months ago)

Author:

zombor

Message:

Fixing #422.

Files:

• trunk/system/libraries/drivers/Database/Pgsql.php (modified) (1 diff)

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

@@ -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