Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Databases/MySQL.php

Author: rkrx

composer.json

@@ -7,7 +7,8 @@
 		"email": "[email protected]"
 	}],
 	"require": {
-		"php": ">= 5.4"
+		"php": ">= 5.4",
+		"psr/log": "~1"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "~4.0",

src/Builder/Select.php

@@ -44,7 +44,14 @@ class Select extends Statement {
 	 */
 	public function field($expression, $alias = null) {
 		if(is_object($expression)) {
-			$expression = (string)$expression;
+			$expression = (string) $expression;
+			$expression = trim($expression);
+			$expression = rtrim($expression, ';');
+			$expression = trim($expression);
+			$lines = explode("\n", $expression);
+			$lines = array_map(function ($line) { return "\t\t{$line}"; }, $lines);
+			$expression = join("\n", $lines);
+			$expression = sprintf("(\n%s\n\t)", $expression);
 		}
 		if($alias === null) {
 			$this->fields[] = $expression;

src/Databases/MySQL.php

@@ -16,7 +16,7 @@ class MySQL implements Database {
 	 */
 	private static $tableFields = array();
 	/**
-	 * @var \PDO
+	 * @var PDO
 	 */
 	private $pdo;
 	/**

tests/Builder/SelectTest.php

@@ -157,4 +157,21 @@ public function testCount() {
 
 		$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);
 	}
+
+	public function testSubselectAsField() {
+		$query = TestSelect::create()
+		->field('COUNT(*)')
+		->from('t1', 'test1')
+		->joinInner('t2', 'test2', 't1.id=t2.id')
+		->where('t1.id > 10');
+
+		$query = TestSelect::create()
+		->field($query, 'testfield')
+		->from('t1', 'test1')
+		->joinInner('t2', 'test2', 't1.id=t2.id')
+		->where('t1.id > 10')
+		->asString();
+
+		$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);
+	}
 }