Added ability to use statements as fields

Author: rkrx

src/Builder/Select.php

@@ -43,7 +43,7 @@ class Select extends Statement {
 	 * @return $this
 	 */
 	public function field($expression, $alias = null) {
-		if($alias !== null) {
+		if(is_object($expression)) {
 			$expression = (string) $expression;
 			$expression = trim($expression);
 			$expression = rtrim($expression, ';');

tests/Builder/SelectTest.php

@@ -163,8 +163,7 @@ public function testSubselectAsField() {
 		->field('COUNT(*)')
 		->from('t1', 'test1')
 		->joinInner('t2', 'test2', 't1.id=t2.id')
-		->where('t1.id > 10')
-		->asString();
+		->where('t1.id > 10');
 
 		$query = TestSelect::create()
 		->field($query, 'testfield')
@@ -173,6 +172,6 @@ public function testSubselectAsField() {
 		->where('t1.id > 10')
 		->asString();
 
-		$this->assertEquals("SELECT\n\tCOUNT(*)\nFROM\n\ttest1 t1\nINNER JOIN\n\ttest2 t2 ON t1.id=t2.id\nWHERE\n\t(t1.id > 10)\n;\n", $query);
+		$this->assertEquals("SELECT\n\t(\n\t\tSELECT\n\t\t\tCOUNT(*)\n\t\tFROM\n\t\t\ttest1 t1\n\t\tINNER JOIN\n\t\t\ttest2 t2 ON t1.id=t2.id\n\t\tWHERE\n\t\t\t(t1.id > 10)\n\t) AS `testfield`\nFROM\n\ttest1 t1\nINNER JOIN\n\ttest2 t2 ON t1.id=t2.id\nWHERE\n\t(t1.id > 10)\n;\n", $query);
 	}
 }