Merge pull request bcit-ci#1133 from SammyK/develop

Fixed bug for PostgreSQL driver where limit() & order_by() throws error
chrisguiney · Mar 5, 2012 · 3018c96 · 3018c96
2 parents 5674745 + 92d68cc
commit 3018c96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/system/database/drivers/postgre/postgre_driver.php b/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;
 	}
 
 	// --------------------------------------------------------------------

diff --git a/user_guide_src/source/changelog.rst b/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