diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-03-06 00:37:21 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-03-06 00:37:21 +0100 |
commit | 3018c96ea6c52831d69e38bc64ed454fd0fde498 (patch) | |
tree | 004dfc1f716b60783ea26ac0ed7e2749e77b2dd7 /system/database/drivers/postgre | |
parent | 567474528e0c1a4e305dbe8787b83e526b46eb02 (diff) | |
parent | 92d68cc37dd8644563bfcc7199fec29e89ecc1ba (diff) |
Merge pull request #1133 from SammyK/develop
Fixed bug for PostgreSQL driver where limit() & order_by() throws error
Diffstat (limited to 'system/database/drivers/postgre')
-rw-r--r-- | system/database/drivers/postgre/postgre_driver.php | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index df0f50da5..5b248e9bc 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -587,16 +587,10 @@ class CI_DB_postgre_driver extends CI_DB { $valstr[] = $key." = ".$val; } - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; - $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; - $sql .= $orderby.$limit; - return $sql; } @@ -647,9 +641,7 @@ class CI_DB_postgre_driver extends CI_DB { $conditions .= implode("\n", $like); } - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - return "DELETE FROM ".$table.$conditions.$limit; + return "DELETE FROM ".$table.$conditions; } // -------------------------------------------------------------------- |