Fixing issues in DboSource::group(), which always expected an optiona…

…l argument. Fixes #1656
cakephp · May 21, 2011 · efbb647 · efbb647
1 parent 104f6a5
commit efbb647
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
@@ -2466,7 +2466,7 @@ function group($group, $model = null) {
 				$group = array($group);
 			}
 			foreach($group as $index => $key) {
-				if ($model->isVirtualField($key)) {
+				if (is_object($model) && $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
@@ -4555,6 +4555,16 @@ function testVirtualFieldsInGroup() {
 		$this->assertEqual($expected, $result);
 	}
 
+/**
+ * Test that group works without a model
+ *
+ * @return void
+ */
+	function testGroupNoModel() {
+		$result = $this->db->group('created');
+		$this->assertEqual(' GROUP BY created', $result);
+	}
+
 /**
  * test the permutations of fullTableName()
  *