Fixing complex expression handling in DboSource::fields(). Making AS …

…a variable controlled by implementing dbo. Test cases added. Fixes #38
cakephp · Aug 19, 2009 · cca3281 · cca3281
1 parent 5a971dd
commit cca3281
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
@@ -78,8 +78,8 @@ class DboSource extends DataSource {
  * @access protected
  */
 	var $_commands = array(
-		'begin'	   => 'BEGIN',
+		'begin' => 'BEGIN',
-		'commit'   => 'COMMIT',
+		'commit' => 'COMMIT',
 		'rollback' => 'ROLLBACK'
 	);
 /**
@@ -409,14 +409,15 @@ function name($data) {
 			$data[$i] = str_replace($this->startQuote . $this->startQuote, $this->startQuote, $data[$i]);
 			$data[$i] = str_replace($this->startQuote . '(', '(', $data[$i]);
 			$data[$i] = str_replace(')' . $this->startQuote, ')', $data[$i]);
+			$alias = !empty($this->alias) ? $this->alias : 'AS ';
 
-			if (preg_match('/\s+AS\s+/', $data[$i])) {
+			if (preg_match('/\s+' . $alias . '\s*/', $data[$i])) {
-				if (preg_match('/\w+\s+AS\s+/', $data[$i])) {
+				if (preg_match('/\w+\s+' . $alias . '\s*/', $data[$i])) {
-					$quoted = $this->endQuote . ' AS ' . $this->startQuote;
+					$quoted = $this->endQuote . ' ' . $alias . $this->startQuote;
-					$data[$i] = str_replace(' AS ', $quoted, $data[$i]);
+					$data[$i] = str_replace(' ' . $alias, $quoted, $data[$i]);
 				} else {
-					$quoted = ' AS ' . $this->startQuote;
+					$quoted = $alias . $this->startQuote;
-					$data[$i] = str_replace(' AS ', $quoted, $data[$i]) . $this->endQuote;
+					$data[$i] = str_replace($alias, $quoted, $data[$i]) . $this->endQuote;
 				}
 			}
 
@@ -1680,7 +1681,9 @@ function fields(&$model, $alias = null, $fields = array(), $quote = true) {
 
 		if ($count >= 1 && !in_array($fields[0], array('*', 'COUNT(*)'))) {
 			for ($i = 0; $i < $count; $i++) {
-				if (!preg_match('/^.+\\(.*\\)/', $fields[$i])) {
+				if (preg_match('/^\(.*\)\s' . $this->alias . '.*/i', $fields[$i])){
+					continue;
+				} elseif (!preg_match('/^.+\\(.*\\)/', $fields[$i])) {
 					$prepend = '';
 
 					if (strpos($fields[$i], 'DISTINCT') !== false) {

diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -2696,6 +2696,10 @@ function testFieldParsing() {
 		);
 		$this->assertEqual($result, $expected);
 
+		$result = $this->testDb->fields($this->Model, null, "(`Provider`.`star_total` / `Provider`.`total_ratings`) as `rating`");
+		$expected = array("(`Provider`.`star_total` / `Provider`.`total_ratings`) as `rating`");
+		$this->assertEqual($result, $expected);
+
 		$result = $this->testDb->fields($this->Model, 'Post');
 		$expected = array(
 			'`Post`.`id`', '`Post`.`client_id`', '`Post`.`name`', '`Post`.`login`',
@@ -2773,7 +2777,7 @@ function testFieldParsing() {
 		$expected = array(
 			'`Foo`.`id`',
 			'`Foo`.`title`',
-			'(user_count + discussion_count + post_count) AS `score`'
+			'(user_count + discussion_count + post_count) AS score'
 		);
 		$this->assertEqual($result, $expected);
 	}