diff options
Diffstat (limited to 'libs/Zend/Db/Adapter/Abstract.php')
| -rw-r--r-- | libs/Zend/Db/Adapter/Abstract.php | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/libs/Zend/Db/Adapter/Abstract.php b/libs/Zend/Db/Adapter/Abstract.php index bd00da96f4..09ab9e692d 100644 --- a/libs/Zend/Db/Adapter/Abstract.php +++ b/libs/Zend/Db/Adapter/Abstract.php @@ -15,21 +15,21 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 18633 2009-10-17 05:36:58Z ralph $ + * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @see Zend_Db */ -require_once 'Zend/Db.php'; +// require_once 'Zend/Db.php'; /** * @see Zend_Db_Select */ -require_once 'Zend/Db/Select.php'; +// require_once 'Zend/Db/Select.php'; /** * Class for connecting to SQL databases and performing common operations. @@ -37,7 +37,7 @@ require_once 'Zend/Db/Select.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Adapter_Abstract @@ -175,7 +175,7 @@ abstract class Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('Adapter parameters must be in an array or a Zend_Config object'); } } @@ -230,7 +230,7 @@ abstract class Zend_Db_Adapter_Abstract break; default: /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('Case must be one of the following constants: ' . 'Zend_Db::CASE_NATURAL, Zend_Db::CASE_LOWER, Zend_Db::CASE_UPPER'); } @@ -272,7 +272,7 @@ abstract class Zend_Db_Adapter_Abstract // we need at least a dbname if (! array_key_exists('dbname', $config)) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance"); } @@ -280,7 +280,7 @@ abstract class Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'password' for login credentials"); } @@ -288,7 +288,7 @@ abstract class Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'username' for login credentials"); } } @@ -358,7 +358,7 @@ abstract class Zend_Db_Adapter_Abstract /** * @see Zend_Db_Profiler_Exception */ - require_once 'Zend/Db/Profiler/Exception.php'; + // require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception('Profiler argument must be an instance of either Zend_Db_Profiler' . ' or Zend_Config when provided as an object'); } @@ -379,16 +379,16 @@ abstract class Zend_Db_Adapter_Abstract } if ($profilerInstance === null) { - if (!class_exists($profilerClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($profilerClass); - } + // if (!class_exists($profilerClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($profilerClass); + // } $profilerInstance = new $profilerClass(); } if (!$profilerInstance instanceof Zend_Db_Profiler) { /** @see Zend_Db_Profiler_Exception */ - require_once 'Zend/Db/Profiler/Exception.php'; + // require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception('Class ' . get_class($profilerInstance) . ' does not extend ' . 'Zend_Db_Profiler'); } @@ -579,7 +579,7 @@ abstract class Zend_Db_Adapter_Abstract $i++; } else { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception(get_class($this) ." doesn't support positional or named binding"); } } @@ -902,7 +902,7 @@ abstract class Zend_Db_Adapter_Abstract return str_replace('?', $this->quote($value, $type), $text); } else { while ($count > 0) { - if (strpos($text, '?') != false) { + if (strpos($text, '?') !== false) { $text = substr_replace($text, $this->quote($value, $type), strpos($text, '?'), 1); } --$count; @@ -1097,7 +1097,7 @@ abstract class Zend_Db_Adapter_Abstract { if ($this->_allowSerialization == false) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception(get_class($this) ." is not allowed to be serialized"); } $this->_connection = false; |