diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-05-18 00:14:07 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-05-18 00:14:07 +0000 |
| commit | fd0c0a608a5de2b26c29d3c44a7929e5a3b2c042 (patch) | |
| tree | 387f2628cae3580b7f09682de6e908d002c5fbb0 /kohana/libraries/drivers/Database.php | |
| parent | 5a6aef9c23930b1de609c9914297e0f97bc49a11 (diff) | |
Updated kohana and modules/unit_test to upstream r4356
Diffstat (limited to 'kohana/libraries/drivers/Database.php')
| -rw-r--r-- | kohana/libraries/drivers/Database.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kohana/libraries/drivers/Database.php b/kohana/libraries/drivers/Database.php index 96562240..f5adf924 100644 --- a/kohana/libraries/drivers/Database.php +++ b/kohana/libraries/drivers/Database.php @@ -11,7 +11,7 @@ */ abstract class Database_Driver { - static $query_cache; + protected $query_cache; /** * Connect to our database. @@ -124,7 +124,7 @@ abstract class Database_Driver { } else { - if ( ! $this->has_operator($key)) + if ( ! $this->has_operator($key) AND ! empty($key)) { $key = $this->escape_column($key).' ='; } @@ -290,7 +290,7 @@ abstract class Database_Driver { */ public function has_operator($str) { - return (bool) preg_match('/[<>!=]|\sIS(?:\s+NOT\s+)?\b/i', trim($str)); + return (bool) preg_match('/[<>!=]|\sIS(?:\s+NOT\s+)?\b|BETWEEN/i', trim($str)); } /** @@ -337,7 +337,7 @@ abstract class Database_Driver { * * @return array */ - abstract public function list_tables(Database $db); + abstract public function list_tables(); /** * Lists all fields in a table. @@ -431,11 +431,11 @@ abstract class Database_Driver { { if (empty($sql)) { - self::$query_cache = array(); + $this->query_cache = array(); } else { - unset(self::$query_cache[$this->query_hash($sql)]); + unset($this->query_cache[$this->query_hash($sql)]); } Kohana::log('debug', 'Database cache cleared: '.get_class($this)); @@ -633,4 +633,4 @@ abstract class Database_Result implements ArrayAccess, Iterator, Countable { return $this->offsetExists($this->current_row); } -} // End Database Result Interface
\ No newline at end of file +} // End Database Result Interface |