diff --git a/lib/Doctrine/Cache/Query/Sqlite.php b/lib/Doctrine/Cache/Query/Sqlite.php index 018a9ac7b..207a0c3db 100644 --- a/lib/Doctrine/Cache/Query/Sqlite.php +++ b/lib/Doctrine/Cache/Query/Sqlite.php @@ -1,4 +1,35 @@ . + */ +/** + * Doctrine_Cache_Query_Sqlite + * + * + * @package Doctrine + * @license http://www.opensource.org/licenses/lgpl-license.php LGPL + * @category Object Relational Mapping + * @link www.phpdoctrine.com + * @since 1.0 + * @version $Revision$ + * @author Konsta Vesterinen + */ class Doctrine_Cache_Query_Sqlite implements Countable { /** * doctrine cache @@ -22,7 +53,7 @@ class Doctrine_Cache_Query_Sqlite implements Countable { $connection = Doctrine_Manager::getInstance()->getCurrentConnection(); $this->session = $connection; - $dir = $this->session->getAttribute(Doctrine::ATTR_CACHE_DIR); + $dir = 'cache'; $this->path = $dir.DIRECTORY_SEPARATOR; $this->dbh = new PDO("sqlite::memory:"); @@ -122,4 +153,3 @@ class Doctrine_Cache_Query_Sqlite implements Countable { return $data[0]; } } - diff --git a/lib/Doctrine/Configurable.php b/lib/Doctrine/Configurable.php index d7a24cbb0..ea877967f 100644 --- a/lib/Doctrine/Configurable.php +++ b/lib/Doctrine/Configurable.php @@ -117,10 +117,6 @@ abstract class Doctrine_Configurable { case Doctrine::ATTR_AUTO_TYPE_VLD: case Doctrine::ATTR_QUERY_LIMIT: - break; - case Doctrine::ATTR_CACHE: - if($value != Doctrine::CACHE_SQLITE && $value != Doctrine::CACHE_NONE) - throw new Doctrine_Exception("Unknown cache container. See Doctrine::CACHE_* constants for availible containers."); break; default: throw new Doctrine_Exception("Unknown attribute.");