diff options
Diffstat (limited to 'libs/Zend/Db/Table/Select.php')
| -rw-r--r-- | libs/Zend/Db/Table/Select.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/Zend/Db/Table/Select.php b/libs/Zend/Db/Table/Select.php index c99a5ad8de..699c071884 100644 --- a/libs/Zend/Db/Table/Select.php +++ b/libs/Zend/Db/Table/Select.php @@ -16,22 +16,22 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @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: Select.php 18200 2009-09-17 21:25:37Z beberlei $ + * @version $Id: Select.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @see Zend_Db_Select */ -require_once 'Zend/Db/Select.php'; +// require_once 'Zend/Db/Select.php'; /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; +// require_once 'Zend/Db/Table/Abstract.php'; /** @@ -40,7 +40,7 @@ require_once 'Zend/Db/Table/Abstract.php'; * @category Zend * @package Zend_Db * @subpackage Table - * @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 */ class Zend_Db_Table_Select extends Zend_Db_Select @@ -195,7 +195,7 @@ class Zend_Db_Table_Select extends Zend_Db_Select if (count($this->_parts[self::UNION]) == 0) { - + // If no fields are specified we assume all fields from primary table if (!count($fields)) { $this->from($primary, self::SQL_WILDCARD, $schema); @@ -211,7 +211,7 @@ class Zend_Db_Table_Select extends Zend_Db_Select // Check each column to ensure it only references the primary table if ($column) { if (!isset($from[$table]) || $from[$table]['tableName'] != $primary) { - require_once 'Zend/Db/Table/Select/Exception.php'; + // require_once 'Zend/Db/Table/Select/Exception.php'; throw new Zend_Db_Table_Select_Exception('Select query cannot join with another table'); } } |