MAGETWO-42973: upgrade ZF1 to 1.12.16

Dale Sikkema · Dale Sikkema · commit 625c75599ab3 · 2015-09-23T15:36:00.000-05:00
diff --git a/library/Zend/Db/Select.php b/library/Zend/Db/Select.php
@@ -511,7 +511,7 @@ public function group($spec)
         }
 
         foreach ($spec as $val) {
-            if (preg_match('/\(.*\)/', (string) $val)) {
+            if (preg_match(self::REGEX_COLUMN_EXPR, (string) $val)) {
                 $val = new Zend_Db_Expr($val);
             }
             $this->_parts[self::GROUP][] = $val;
@@ -603,7 +603,7 @@ public function order($spec)
                     $val = trim($matches[1]);
                     $direction = $matches[2];
                 }
-                if (preg_match('/^[\w]*\(.*\)$/', $val)) {
+                if (preg_match(self::REGEX_COLUMN_EXPR, $val)) {
                     $val = new Zend_Db_Expr($val);
                 }
                 $this->_parts[self::ORDER][] = array($val, $direction);
@@ -945,7 +945,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('/\(.*\)/', $col)) {
+                if (preg_match(self::REGEX_COLUMN_EXPR, $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
`@@ -511,7 +511,7 @@ public function group($spec)`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`foreach ($spec as $val) {`
`514`		`- if (preg_match('/\(.*\)/', (string) $val)) {`
	`514`	`+ if (preg_match(self::REGEX_COLUMN_EXPR, (string) $val)) {`
`515`	`515`	`$val = new Zend_Db_Expr($val);`
`516`	`516`	`}`
`517`	`517`	`$this->_parts[self::GROUP][] = $val;`
`@@ -603,7 +603,7 @@ public function order($spec)`
`603`	`603`	`$val = trim($matches[1]);`
`604`	`604`	`$direction = $matches[2];`
`605`	`605`	`}`
`606`		`- if (preg_match('/^[\w]\(.\)$/', $val)) {`
	`606`	`+ if (preg_match(self::REGEX_COLUMN_EXPR, $val)) {`
`607`	`607`	`$val = new Zend_Db_Expr($val);`
`608`	`608`	`}`
`609`	`609`	`$this->_parts[self::ORDER][] = array($val, $direction);`
`@@ -945,7 +945,7 @@ protected function _tableCols($correlationName, $cols, $afterCorrelationName = n`
`945`	`945`	`$alias = $m[2];`
`946`	`946`	`}`
`947`	`947`	`// Check for columns that look like functions and convert to Zend_Db_Expr`
`948`		`- if (preg_match('/\(.*\)/', $col)) {`
	`948`	`+ if (preg_match(self::REGEX_COLUMN_EXPR, $col)) {`
`949`	`949`	`$col = new Zend_Db_Expr($col);`
`950`	`950`	`} elseif (preg_match('/(.+)\.(.+)/', $col, $m)) {`
`951`	`951`	`$currentCorrelationName = $m[1];`