joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Added ability to turn off database auto-cache from the config

Browse source 
Probably should make it a part of the model as well, assuming it doesn't already do that, pretty sure it doesn't. Would help me as one of my sites I need to migrate a ton of code, so being able to flip models on one by one would be excellent.
This commit is contained in:
Josh Sherman 2012-11-06 11:21:02 -05:00
parent b41f2c12e9
commit a0ad85e8e9
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
classes/Model.php
View file

@ -164,7 +164,7 @@ class Model extends Object
* @access protected * @access protected
* @var mixed * @var mixed
*/ */
protected $group = false; // GROUP BY protected $group = false; // GROUP BY
/** /**
* Having * Having
@ -300,6 +300,7 @@ class Model extends Object
// Gets an instance of the database and check which it is // Gets an instance of the database and check which it is
$this->db = Database::getInstance(); $this->db = Database::getInstance();
$this->use_cache = $this->db->cache;
$this->mysql = ($this->db->driver == 'pdo_mysql'); $this->mysql = ($this->db->driver == 'pdo_mysql');
$this->postgresql = ($this->db->driver == 'pdo_pgsql'); $this->postgresql = ($this->db->driver == 'pdo_pgsql');
@ -459,7 +460,7 @@ class Model extends Object
$query_database = true; $query_database = true;
if (isset($cache_key)) if (isset($cache_key) && $this->use_cache)
{ {
$cached = $this->cache->get($cache_key); $cached = $this->cache->get($cache_key);
} }
@ -475,7 +476,7 @@ class Model extends Object
(count($this->input_parameters) == 0 ? null : $this->input_parameters) (count($this->input_parameters) == 0 ? null : $this->input_parameters)
); );
if (isset($cache_key)) if (isset($cache_key) && $this->use_cache)
{ {
$this->cache->set($cache_key, $this->records); $this->cache->set($cache_key, $this->records);
} }
@ -1210,7 +1211,7 @@ class Model extends Object
$results = $this->db->execute($sql, $input_parameters); $results = $this->db->execute($sql, $input_parameters);
// Clears the cache // Clears the cache
if ($update) if ($update && $this->use_cache)
{ {
$this->cache->delete($this->model . '-' . $this->record[$this->columns['id']]); $this->cache->delete($this->model . '-' . $this->record[$this->columns['id']]);
} }
@ -1264,7 +1265,10 @@ class Model extends Object
$results = $this->db->execute($sql, $input_parameters); $results = $this->db->execute($sql, $input_parameters);
// Clears the cache // Clears the cache
$this->cache->delete($this->model . '-' . $this->record[$this->columns['id']]); if ($this->use_cache)
{
$this->cache->delete($this->model . '-' . $this->record[$this->columns['id']]);
}
return $results; return $results;
} }

14
jar.php
View file

@ -4229,7 +4229,7 @@ class Model extends Object
* @access protected * @access protected
* @var mixed * @var mixed
*/ */
protected $group = false; // GROUP BY protected $group = false; // GROUP BY
/** /**
* Having * Having
@ -4365,6 +4365,7 @@ class Model extends Object
// Gets an instance of the database and check which it is // Gets an instance of the database and check which it is
$this->db = Database::getInstance(); $this->db = Database::getInstance();
$this->use_cache = $this->db->cache;
$this->mysql = ($this->db->driver == 'pdo_mysql'); $this->mysql = ($this->db->driver == 'pdo_mysql');
$this->postgresql = ($this->db->driver == 'pdo_pgsql'); $this->postgresql = ($this->db->driver == 'pdo_pgsql');
@ -4524,7 +4525,7 @@ class Model extends Object
$query_database = true; $query_database = true;
if (isset($cache_key)) if (isset($cache_key) && $this->use_cache)
{ {
$cached = $this->cache->get($cache_key); $cached = $this->cache->get($cache_key);
} }
@ -4540,7 +4541,7 @@ class Model extends Object
(count($this->input_parameters) == 0 ? null : $this->input_parameters) (count($this->input_parameters) == 0 ? null : $this->input_parameters)
); );
if (isset($cache_key)) if (isset($cache_key) && $this->use_cache)
{ {
$this->cache->set($cache_key, $this->records); $this->cache->set($cache_key, $this->records);
} }
@ -5275,7 +5276,7 @@ class Model extends Object
$results = $this->db->execute($sql, $input_parameters); $results = $this->db->execute($sql, $input_parameters);
// Clears the cache // Clears the cache
if ($update) if ($update && $this->use_cache)
{ {
$this->cache->delete($this->model . '-' . $this->record[$this->columns['id']]); $this->cache->delete($this->model . '-' . $this->record[$this->columns['id']]);
} }
@ -5329,7 +5330,10 @@ class Model extends Object
$results = $this->db->execute($sql, $input_parameters); $results = $this->db->execute($sql, $input_parameters);
// Clears the cache // Clears the cache
$this->cache->delete($this->model . '-' . $this->record[$this->columns['id']]); if ($this->use_cache)
{
$this->cache->delete($this->model . '-' . $this->record[$this->columns['id']]);
}
return $results; return $results;
} }