From 0d5187eadf3e19729c6aa25c3bf30d2787fd66a3 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 15 May 2012 09:33:43 -0700 Subject: Revert "Verify that where() clauses are well formed. Fixes #1865." This reverts commit 6a6b3f90f36293a40cba091c3ac387abb64f3c1a. --- modules/kohana23_compat/libraries/MY_Database_Builder.php | 6 ------ system/libraries/Database_Builder.php | 8 -------- 2 files changed, 14 deletions(-) diff --git a/modules/kohana23_compat/libraries/MY_Database_Builder.php b/modules/kohana23_compat/libraries/MY_Database_Builder.php index 54429ab1..0b9dbe28 100644 --- a/modules/kohana23_compat/libraries/MY_Database_Builder.php +++ b/modules/kohana23_compat/libraries/MY_Database_Builder.php @@ -25,9 +25,6 @@ class Database_Builder extends Database_Builder_Core { public function merge_where($tuples) { if ($tuples) { foreach ($tuples as $tuple) { - if (count($tuple) != 3) { - throw new Database_Exception("Column triplets require a column, op and value"); - } $this->where($tuple[0], $tuple[1], $tuple[2]); } } @@ -41,9 +38,6 @@ class Database_Builder extends Database_Builder_Core { public function merge_or_where($tuples) { if ($tuples) { foreach ($tuples as $tuple) { - if (count($tuple) != 3) { - throw new Database_Exception("Column triplets require a column, op and value"); - } $this->or_where($tuple[0], $tuple[1], $tuple[2]); } } diff --git a/system/libraries/Database_Builder.php b/system/libraries/Database_Builder.php index 553ffd98..e86ce379 100644 --- a/system/libraries/Database_Builder.php +++ b/system/libraries/Database_Builder.php @@ -190,8 +190,6 @@ class Database_Builder_Core { { foreach ($columns as $column) { - if (count($column) != 3) - throw new Database_Exception('Column triplets require a column, op and value'); $this->where[] = array('AND' => $column); } } @@ -218,8 +216,6 @@ class Database_Builder_Core { { foreach ($columns as $column) { - if (count($column) != 3) - throw new Database_Exception('Column triplets require a column, op and value'); $this->where[] = array('OR' => $column); } } @@ -426,8 +422,6 @@ class Database_Builder_Core { { foreach ($columns as $column) { - if (count($column) != 3) - throw new Database_Exception('Column triplets require a column, op and value'); $this->having[] = array('AND' => $column); } } @@ -453,8 +447,6 @@ class Database_Builder_Core { { foreach ($columns as $column) { - if (count($column) != 3) - throw new Database_Exception('Column triplets require a column, op and value'); $this->having[] = array('OR' => $column); } } -- cgit v1.2.3