Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #492 from dkullmann/1.3-fix-cache-regex

1.3 fix cache regex
  • Loading branch information...
commit 9efeea50582e89ee937ebb2bdc6dddd844b68992 2 parents 9558943 + 47a8525
@markstory markstory authored
View
2  cake/libs/model/datasources/dbo_source.php
@@ -420,7 +420,7 @@ function fetchAll($sql, $cache = true, $modelName = null) {
}
if ($cache) {
- if (strpos(trim(strtolower($sql)), 'select') !== false) {
+ if (preg_match('/^\s*select/i', $sql)) {
$this->_queryCache[$sql] = $out;
}
}
View
19 cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -4251,6 +4251,25 @@ function testFetchAllBooleanReturns() {
}
/**
+ * test that query propery caches/doesn't cache selects
+ *
+ * @return void
+ * @author David Kullmann
+ */
+ function testFetchAllCaching() {
+ $query = "SELECT NOW() as TIME";
+ $result = $this->db->fetchAll($query);
+
+ $this->assertTrue(is_array($this->db->_queryCache[$query]));
+ $this->assertEqual($this->db->_queryCache[$query][0][0]['TIME'], $result[0][0]['TIME']);
+
+ $query = "DROP TABLE IF EXISTS select_test";
+ $result = $this->db->fetchAll($query);
+
+ $this->assertTrue(!isset($this->db->_queryCache[$query]));
+ }
+
+/**
* test ShowQuery generation of regular and error messages
*
* @return void
Please sign in to comment.
Something went wrong with that request. Please try again.