Adding test for DboSource::group() and virtual fields

Closes #184
cakephp · Jan 11, 2010 · aa9258c · aa9258c
1 parent 3fe4b46
commit aa9258c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
@@ -2333,7 +2333,6 @@ function group($group, $model = null) {
 			if (!is_array($group)) {
 				$group = array($group);
 			}
-
 			foreach($group as $index => $key) {
 				if ($model->isVirtualField($key)) {
 					$group[$index] = '(' . $model->getVirtualField($key) . ')';

diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -4240,5 +4240,23 @@ function testVirtualFieldsFetch() {
 		));
 		$this->assertEqual($expected, $result);
 	}
+
+/**
+ * test calculate to generate claculate statements on virtual fields
+ *
+ * @return void
+ */
+	function testVirtualFieldsInGroup() {
+		$this->loadFixtures('Article');
+
+		$Article =& ClassRegistry::init('Article');
+		$Article->virtualFields = array(
+			'this_year' => 'YEAR(Article.created)'
+		);
+
+		$result = $this->db->group('this_year',$Article);
+		$expected = " GROUP BY (YEAR(`Article`.`created`))";
+		$this->assertEqual($expected, $result);
+	}
 }
 ?>