tweet_live: comparison web/lib/Zend/Db/Table/Abstract.php

equal deleted inserted replaced

-:5a6b6e770365
+:68c69c656a2c
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Db
 * @subpackage Table
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: Abstract.php 24958 2012-06-15 13:44:04Z adamlundrigan $
+* @version    $Id$
 */
 /**
 * @see Zend_Db_Adapter_Abstract
 */
 * Class for SQL table interface.
 *
 * @category   Zend
 * @package    Zend_Db
 * @subpackage Table
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 abstract class Zend_Db_Table_Abstract
 {
 * it's the _first_ column in the compound key.
 */
 $primary = (array) $this->_primary;
 $pkIdentity = $primary[(int)$this->_identity];
+/**
+* If the primary key can be generated automatically, and no value was
+* specified in the user-supplied data, then omit it from the tuple.
+*
+* Note: this checks for sensible values in the supplied primary key
+* position of the data.  The following values are considered empty:
+*   null, false, true, '', array()
+*/
+if (array_key_exists($pkIdentity, $data)) {
+if ($data[$pkIdentity] === null                                        // null
+|| $data[$pkIdentity] === ''                                       // empty string
+|| is_bool($data[$pkIdentity])                                     // boolean
+|| (is_array($data[$pkIdentity]) && empty($data[$pkIdentity]))) {  // empty array
+unset($data[$pkIdentity]);
+}
+}
 /**
 * If this table uses a database sequence object and the data does not
 * specify a value, then get the next ID from the sequence and add it
 * to the row.  We assume that only the first column in a compound
 * primary key takes a value from a sequence.
 */
 if (is_string($this->_sequence) && !isset($data[$pkIdentity])) {
 $data[$pkIdentity] = $this->_db->nextSequenceId($this->_sequence);
-$pkSuppliedBySequence = true;
-}
-/**
-* If the primary key can be generated automatically, and no value was
-* specified in the user-supplied data, then omit it from the tuple.
-*
-* Note: this checks for sensible values in the supplied primary key
-* position of the data.  The following values are considered empty:
-*   null, false, true, '', array()
-*/
-if (!isset($pkSuppliedBySequence) && array_key_exists($pkIdentity, $data)) {
-if ($data[$pkIdentity] === null                                        // null
-|| $data[$pkIdentity] === ''                                       // empty string
-|| is_bool($data[$pkIdentity])                                     // boolean
-|| (is_array($data[$pkIdentity]) && empty($data[$pkIdentity]))) {  // empty array
-unset($data[$pkIdentity]);
-}
 }
 /**
 * INSERT the new row.
 */
 /**
 * Execute cascading deletes against dependent tables
 */
 foreach ($depTables as $tableClass) {
 $t = self::getTableFromString($tableClass, $this);
-$t->_cascadeDelete($tableClass, $row->getPrimaryKey());
+$t->_cascadeDelete(
+get_class($this), $row->getPrimaryKey()
+);
 }
 }
 }
 }
 */
 public function _cascadeDelete($parentTableClassname, array $primaryKey)
 {
 // setup metadata
 $this->_setupMetadata();
 // get this class name
 $thisClass = get_class($this);
 if ($thisClass === 'Zend_Db_Table') {
 $thisClass = $this->_definitionConfigName;
 }
 $rowsAffected = 0;
 foreach ($this->_getReferenceMapNormalized() as $map) {
 if ($map[self::REF_TABLE_CLASS] == $parentTableClassname && isset($map[self::ON_DELETE])) {
 $where = array();
 // CASCADE or CASCADE_RECURSE
 if (in_array($map[self::ON_DELETE], array(self::CASCADE, self::CASCADE_RECURSE))) {
 for ($i = 0; $i < count($map[self::COLUMNS]); ++$i) {
 $col = $this->_db->foldCase($map[self::COLUMNS][$i]);
 $refCol = $this->_db->foldCase($map[self::REF_COLUMNS][$i]);
 $where[] = $this->_db->quoteInto(
 $this->_db->quoteIdentifier($col, true) . ' = ?',
 $primaryKey[$refCol], $type);
 }
 }
 // CASCADE_RECURSE
 if ($map[self::ON_DELETE] == self::CASCADE_RECURSE) {
 /**
 * Execute cascading deletes against dependent tables
 */
 $depTables = $this->getDependentTables();
 if (!empty($depTables)) {
 // CASCADE or CASCADE_RECURSE
 if (in_array($map[self::ON_DELETE], array(self::CASCADE, self::CASCADE_RECURSE))) {
 $rowsAffected += $this->delete($where);
 }
 }
 }
 return $rowsAffected;
 }
 $stmt = $this->_db->query($select);
 $data = $stmt->fetchAll(Zend_Db::FETCH_ASSOC);
 return $data;
 }
+/**
+* Get table gateway object from string
+*
+* @param  string                 $tableName
+* @param  Zend_Db_Table_Abstract $referenceTable
+* @throws Zend_Db_Table_Row_Exception
+* @return Zend_Db_Table_Abstract
+*/
 public static function getTableFromString($tableName, Zend_Db_Table_Abstract $referenceTable = null)
 {
 if ($referenceTable instanceof Zend_Db_Table_Abstract) {
 $tableDefinition = $referenceTable->getDefinition();
 $options[Zend_Db_Table_Abstract::DEFINITION] = $tableDefinition;
 }
 return new $tableName($options);
 }
 }

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd