From 82e88b9b3031163d2f86f8e53450c1d779a08d8f Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Fri, 6 Apr 2012 21:18:59 +0300
Subject: Update _delete() and _update() with removal of unsupported LIMIT and
 ORDER BY

---
 system/database/drivers/postgre/postgre_driver.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'system/database/drivers/postgre/postgre_driver.php')

diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index a5e296718..707aaaebe 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -493,11 +493,9 @@ class CI_DB_postgre_driver extends CI_DB {
 	 * @param	string	the table name
 	 * @param	array	the update data
 	 * @param	array	the where clause
-	 * @param	array	the orderby clause
-	 * @param	array	the limit clause
 	 * @return	string
 	 */
-	protected function _update($table, $values, $where, $orderby = array(), $limit = FALSE)
+	protected function _update($table, $values, $where)
 	{
 		foreach ($values as $key => $val)
 		{
@@ -505,9 +503,7 @@ class CI_DB_postgre_driver extends CI_DB {
 		}
 
 		return 'UPDATE '.$table.' SET '.implode(', ', $valstr)
-			.(($where != '' && count($where) > 0) ? ' WHERE '.implode(' ', $where) : '')
-			.(count($orderby) > 0 ? ' ORDER BY '.implode(', ', $orderby) : '')
-			.( ! $limit ? '' : ' LIMIT '.$limit);
+			.(($where != '' && count($where) > 0) ? ' WHERE '.implode(' ', $where) : '');
 	}
 
 	// --------------------------------------------------------------------
@@ -519,10 +515,9 @@ class CI_DB_postgre_driver extends CI_DB {
 	 *
 	 * @param	string	the table name
 	 * @param	array	the where clause
-	 * @param	string	the limit clause
 	 * @return	string
 	 */
-	protected function _delete($table, $where = array(), $like = array(), $limit = FALSE)
+	protected function _delete($table, $where = array(), $like = array())
 	{
 		if (count($where) > 0 OR count($like) > 0)
 		{
@@ -539,6 +534,7 @@ class CI_DB_postgre_driver extends CI_DB {
 	}
 
 	// --------------------------------------------------------------------
+
 	/**
 	 * Limit string
 	 *
-- 
cgit v1.2.3-24-g4f1b