diff options
Diffstat (limited to 'libs/Zend/Db/Adapter/Pdo/Pgsql.php')
-rw-r--r-- | libs/Zend/Db/Adapter/Pdo/Pgsql.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/Zend/Db/Adapter/Pdo/Pgsql.php b/libs/Zend/Db/Adapter/Pdo/Pgsql.php index bec14b569b..0c1d0ca2e8 100644 --- a/libs/Zend/Db/Adapter/Pdo/Pgsql.php +++ b/libs/Zend/Db/Adapter/Pdo/Pgsql.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pgsql.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pgsql.php 18646 2009-10-18 13:16:21Z mikaelkael $ */ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; +require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Abstract @@ -195,15 +195,15 @@ class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Abstract $desc = array(); foreach ($result as $key => $row) { $defaultValue = $row[$default_value]; - if ($row[$type] == 'varchar' || $row[$type] == 'bpchar' ) { - if (preg_match('/character(?: varying)?(?:\((\d+)\))?/', $row[$complete_type], $matches)) { + if ($row[$type] == 'varchar') { + if (preg_match('/character varying(?:\((\d+)\))?/', $row[$complete_type], $matches)) { if (isset($matches[1])) { $row[$length] = $matches[1]; } else { $row[$length] = null; // unlimited } } - if (preg_match("/^'(.*?)'::(?:character varying|bpchar)$/", $defaultValue, $matches)) { + if (preg_match("/^'(.*?)'::character varying$/", $defaultValue, $matches)) { $defaultValue = $matches[1]; } } @@ -249,7 +249,7 @@ class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_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("LIMIT argument count=$count is not valid"); } @@ -258,7 +258,7 @@ class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_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("LIMIT argument offset=$offset is not valid"); } |