diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-01-19 05:12:28 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-01-19 05:12:28 +0000 |
| commit | 5f1165698b6f1f94f43571283d9644394ec03315 (patch) | |
| tree | 3adc185bf91a521825a8f95bfa9a6a74fbdbd68d /kohana/libraries/ORM.php | |
| parent | 46d010e89d280d391935648f1f713fc784042050 (diff) | |
Change ORM and the MySql driver to clear static caches using
clear_cache().
This supercedes the TEST_MODE checks.
Upstream ticket: http://dev.kohanaphp.com/ticket/1062
Diffstat (limited to 'kohana/libraries/ORM.php')
| -rw-r--r-- | kohana/libraries/ORM.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kohana/libraries/ORM.php b/kohana/libraries/ORM.php index 72aab746..0783ebcd 100644 --- a/kohana/libraries/ORM.php +++ b/kohana/libraries/ORM.php @@ -890,7 +890,7 @@ class ORM_Core { { if ($force === TRUE OR empty($this->table_columns)) { - if (!TEST_MODE && isset(self::$column_cache[$this->object_name])) + if (isset(self::$column_cache[$this->object_name])) { // Use cached column information $this->table_columns = self::$column_cache[$this->object_name]; @@ -1105,6 +1105,8 @@ class ORM_Core { // Proxy to database $this->db->clear_cache($sql); + self::$column_cache = array(); + return $this; } |