tweet_live: comparison web/lib/Zend/Db/Select.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 Select
-* @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: Select.php 24833 2012-05-30 13:29:41Z adamlundrigan $
+* @version    $Id$
 */
 /**
 * @see Zend_Db_Adapter_Abstract
 * Class for SQL SELECT generation and results.
 *
 * @category   Zend
 * @package    Zend_Db
 * @subpackage Select
-* @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
 */
 class Zend_Db_Select
 {
 if (!is_array($spec)) {
 $spec = array($spec);
 }
 foreach ($spec as $val) {
-if (preg_match('/\(.*\)/', (string) $val)) {
+if (preg_match('/^([\w]*\(([^\)]|(?1))*\))$/', (string) $val)) {
 $val = new Zend_Db_Expr($val);
 }
 $this->_parts[self::GROUP][] = $val;
 }
 $direction = self::SQL_ASC;
 if (preg_match('/(.*\W)(' . self::SQL_ASC . '|' . self::SQL_DESC . ')\b/si', $val, $matches)) {
 $val = trim($matches[1]);
 $direction = $matches[2];
 }
-if (preg_match('/\(.*\)/', $val)) {
+if (preg_match('/^([\w]*\(([^\)]|(?1))*\))$/', (string) $val)) {
 $val = new Zend_Db_Expr($val);
 }
 $this->_parts[self::ORDER][] = array($val, $direction);
 }
 }
 $this->_parts[self::FOR_UPDATE] = (bool) $flag;
 return $this;
 }
 /**
-* Get part of the structured information for the currect query.
+* Get part of the structured information for the current query.
 *
 * @param string $part
 * @return mixed
 * @throws Zend_Db_Select_Exception
 */
 */
 public function reset($part = null)
 {
 if ($part == null) {
 $this->_parts = self::$_partsInit;
-} else if (array_key_exists($part, self::$_partsInit)) {
+} elseif (array_key_exists($part, self::$_partsInit)) {
 $this->_parts[$part] = self::$_partsInit[$part];
 }
 return $this;
 }
 throw new Zend_Db_Select_Exception("Invalid use of table with " . self::SQL_UNION);
 }
 if (empty($name)) {
 $correlationName = $tableName = '';
-} else if (is_array($name)) {
+} elseif (is_array($name)) {
 // Must be array($correlationName => $tableName) or array($ident, ...)
 foreach ($name as $_correlationName => $_tableName) {
 if (is_string($_correlationName)) {
 // We assume the key is the correlation name and value is the table name
 $tableName = $_tableName;
 $tableName = $_tableName;
 $correlationName = $this->_uniqueCorrelation($tableName);
 }
 break;
 }
-} else if ($name instanceof Zend_Db_Expr|| $name instanceof Zend_Db_Select) {
+} elseif ($name instanceof Zend_Db_Expr|| $name instanceof Zend_Db_Select) {
 $tableName = $name;
 $correlationName = $this->_uniqueCorrelation('t');
-} else if (preg_match('/^(.+)\s+AS\s+(.+)$/i', $name, $m)) {
+} elseif (preg_match('/^(.+)\s+AS\s+(.+)$/i', $name, $m)) {
 $tableName = $m[1];
 $correlationName = $m[2];
 } else {
 $tableName = $name;
 $correlationName = $this->_uniqueCorrelation($tableName);
 if (preg_match('/^(.+)\s+' . self::SQL_AS . '\s+(.+)$/i', $col, $m)) {
 $col = $m[1];
 $alias = $m[2];
 }
 // Check for columns that look like functions and convert to Zend_Db_Expr
-if (preg_match('/\(.*\)/', $col)) {
+if (preg_match('/^([\w]*\(([^\)]|(?1))*\))$/', (string) $col)) {
 $col = new Zend_Db_Expr($col);
 } elseif (preg_match('/(.+)\.(.+)/', $col, $m)) {
 $currentCorrelationName = $m[1];
 $col = $m[2];
 }
 $columns[] = $this->_adapter->quoteColumnAs(array($correlationName, $column), $alias, true);
 }
 }
 }
-return $sql .= ' ' . implode(', ', $columns);
+return $sql . ' ' . implode(', ', $columns);
 }
 /**
 * Render FROM clause
 *
 if(is_numeric($term[0]) && strval(intval($term[0])) == $term[0]) {
 $order[] = (int)trim($term[0]) . ' ' . $term[1];
 } else {
 $order[] = $this->_adapter->quoteIdentifier($term[0], true) . ' ' . $term[1];
 }
-} else if (is_numeric($term) && strval(intval($term)) == $term) {
+} elseif (is_numeric($term) && strval(intval($term)) == $term) {
 $order[] = (int)trim($term);
 } else {
 $order[] = $this->_adapter->quoteIdentifier($term, true);
 }
 }

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd