Skip to content
Browse files

Merge pull request #1133 from SammyK/develop

Fixed bug for PostgreSQL driver where limit() & order_by() throws error
  • Loading branch information...
2 parents 5674745 + 92d68cc commit 3018c96ea6c52831d69e38bc64ed454fd0fde498 @narfbg narfbg committed Mar 5, 2012
Showing with 2 additions and 9 deletions.
  1. +1 −9 system/database/drivers/postgre/postgre_driver.php
  2. +1 −0 user_guide_src/source/changelog.rst
View
10 system/database/drivers/postgre/postgre_driver.php
@@ -587,16 +587,10 @@ function _update($table, $values, $where, $orderby = array(), $limit = FALSE)
$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 @@ function _delete($table, $where = array(), $like = array(), $limit = FALSE)
$conditions .= implode("\n", $like);
}
- $limit = ( ! $limit) ? '' : ' LIMIT '.$limit;
-
- return "DELETE FROM ".$table.$conditions.$limit;
+ return "DELETE FROM ".$table.$conditions;
}
// --------------------------------------------------------------------
View
1 user_guide_src/source/changelog.rst
@@ -63,6 +63,7 @@ Release Date: Not Released
- Added db_set_charset() support.
- Added _optimize_table() support for the :doc:`Database Utility Class <database/utilities>` (rebuilds table indexes).
- Added a constructor to the DB_result class and moved all driver-specific properties and logic out of the base DB_driver class to allow better abstraction.
+ - Removed limit() and order_by() support for UPDATE and DELETE queries in PostgreSQL driver. Postgres does not support those features.
- Libraries

0 comments on commit 3018c96

Please sign in to comment.
Something went wrong with that request. Please try again.