Adding support for passing a closure to select(), it should return the

list of fields to be selected
cakephp · Mar 7, 2013 · 53c9297 · markstory · Mar 7, 2013 · lorenzo
1 parent ec73b23
commit 53c9297
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Query.php b/lib/Cake/Model/Datasource/Database/Query.php
@@ -331,6 +331,10 @@ public function select($fields = [], $overwrite = false) {
 			return $this->_parts['select'];
 		}
 
+		if (is_callable($fields)) {
+			$fields = $fields($this);
+		}
+
 		if (!is_array($fields)) {
 			$fields = [$fields];
 		}

diff --git a/lib/Cake/Test/TestCase/Model/Datasource/Database/QueryTest.php b/lib/Cake/Test/TestCase/Model/Datasource/Database/QueryTest.php
@@ -134,6 +134,20 @@ public function testSelectFieldsOnly() {
 		$this->assertEquals([3, 6], $result->fetch());
 	}
 
+/**
+ * Tests that it is possible to pass a closure as fields in select()
+ *
+ * @return void
+ */
+	public function testSelectClosure() {
+		$query = new Query($this->connection);
+		$result = $query->select(function($q) use ($query) {
+			$this->assertSame($query, $q);
+			return ['1 + 2', '1 + 5'];
+		})->execute();
+		$this->assertEquals([3, 6], $result->fetch());
+	}
+
 /**
  * Tests it is possible to select fields from tables with no conditions
  *