6543/CommunityID
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

import v1.1.0_beta1 | 2009-08-21

Browse Source
This commit is contained in:
6543
2019-07-17 22:16:19 +02:00
parent 2c1152f0d3
commit 8dee6b1a10
2306 changed files with 251360 additions and 23428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/Zend/Db/Table/Select.php
View File

@ -65,7 +65,7 @@ class Zend_Db_Table_Select extends Zend_Db_Select
* @var Zend_Db_Table_Abstract
*/
protected $_table;
/**
* Class constructor
*
@ -74,6 +74,7 @@ class Zend_Db_Table_Select extends Zend_Db_Select
public function __construct(Zend_Db_Table_Abstract $table)
{
parent::__construct($table->getAdapter());
$this->setTable($table);
}
@ -86,7 +87,7 @@ class Zend_Db_Table_Select extends Zend_Db_Select
{
return $this->_table;
}
/**
* Sets the primary table name and retrieves the table schema.
*
@ -98,7 +99,7 @@ class Zend_Db_Table_Select extends Zend_Db_Select
$this->_adapter = $table->getAdapter();
$this->_info = $table->info();
$this->_table = $table;
return $this;
}
@ -139,7 +140,7 @@ class Zend_Db_Table_Select extends Zend_Db_Select
if ($alias !== null) {
$column = $alias;
}
switch (true) {
case ($column == self::SQL_WILDCARD):
break;
@ -159,8 +160,8 @@ class Zend_Db_Table_Select extends Zend_Db_Select
*
* The table name can be expressed
*
* @param array|string|Zend_Db_Expr|Zend_Db_Table_Abstract $name The table name or an
associative array relating
* @param array|string|Zend_Db_Expr|Zend_Db_Table_Abstract $name The table name or an
associative array relating
table name to correlation
name.
* @param array|string|Zend_Db_Expr $cols The columns to select from this table.
@ -203,7 +204,7 @@ class Zend_Db_Table_Select extends Zend_Db_Select
if ($this->_integrityCheck !== false) {
foreach ($fields as $columnEntry) {
list($table, $column) = $columnEntry;
// Check each column to ensure it only references the primary table
if ($column) {
if (!isset($from[$table]) || $from[$table]['tableName'] != $primary) {
@ -216,4 +217,4 @@ class Zend_Db_Table_Select extends Zend_Db_Select
return parent::assemble();
}
}
}