Zend_Db_Select v 1.12.9 changes reverted due to backward incompatibility

msavich · msavich · commit a0cb19f51f16 · 2014-11-12T13:48:51.000-06:00
diff --git a/library/Zend/Db/Select.php b/library/Zend/Db/Select.php
@@ -509,7 +509,7 @@ public function group($spec)
         }
 
         foreach ($spec as $val) {
-            if (preg_match('/^[\w]*\([^\)]*\)$/', (string) $val)) {
+            if (preg_match('/\(.*\)/', (string) $val)) {
                 $val = new Zend_Db_Expr($val);
             }
             $this->_parts[self::GROUP][] = $val;
@@ -601,7 +601,7 @@ public function order($spec)
                     $val = trim($matches[1]);
                     $direction = $matches[2];
                 }
-                if (preg_match('/^[\w]*\([^\)]*\)$/', $val)) {
+                if (preg_match('/^[\w]*\(.*\)$/', $val)) {
                     $val = new Zend_Db_Expr($val);
                 }
                 $this->_parts[self::ORDER][] = array($val, $direction);
@@ -943,7 +943,7 @@ protected function _tableCols($correlationName, $cols, $afterCorrelationName = n
                     $alias = $m[2];
                 }
                 // Check for columns that look like functions and convert to Zend_Db_Expr
-                if (preg_match('/^[\w]*\([^\)]*\)$/', $col)) {
+                if (preg_match('/\(.*\)/', $col)) {
                     $col = new Zend_Db_Expr($col);
                 } elseif (preg_match('/(.+)\.(.+)/', $col, $m)) {
                     $currentCorrelationName = $m[1];

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ public function group($spec)`
`509`	`509`	`}`
`510`	`510`
`511`	`511`	`foreach ($spec as $val) {`
`512`		`- if (preg_match('/^[\w]\([^\)]\)$/', (string) $val)) {`
	`512`	`+ if (preg_match('/\(.*\)/', (string) $val)) {`
`513`	`513`	`$val = new Zend_Db_Expr($val);`
`514`	`514`	`}`
`515`	`515`	`$this->_parts[self::GROUP][] = $val;`
`@@ -601,7 +601,7 @@ public function order($spec)`
`601`	`601`	`$val = trim($matches[1]);`
`602`	`602`	`$direction = $matches[2];`
`603`	`603`	`}`
`604`		`- if (preg_match('/^[\w]\([^\)]\)$/', $val)) {`
	`604`	`+ if (preg_match('/^[\w]\(.\)$/', $val)) {`
`605`	`605`	`$val = new Zend_Db_Expr($val);`
`606`	`606`	`}`
`607`	`607`	`$this->_parts[self::ORDER][] = array($val, $direction);`
`@@ -943,7 +943,7 @@ protected function _tableCols($correlationName, $cols, $afterCorrelationName = n`
`943`	`943`	`$alias = $m[2];`
`944`	`944`	`}`
`945`	`945`	`// Check for columns that look like functions and convert to Zend_Db_Expr`
`946`		`- if (preg_match('/^[\w]\([^\)]\)$/', $col)) {`
	`946`	`+ if (preg_match('/\(.*\)/', $col)) {`
`947`	`947`	`$col = new Zend_Db_Expr($col);`
`948`	`948`	`} elseif (preg_match('/(.+)\.(.+)/', $col, $m)) {`
`949`	`949`	`$currentCorrelationName = $m[1];`