Sub-select in SELECT clause (without aliases and smart join)

FluentPDO/BaseQuery.php

@@ -182,7 +182,16 @@ protected function buildQuery() {
 		foreach ($this->clauses as $clause => $separator) {
 			if ($this->clauseNotEmpty($clause)) {
 				if (is_string($separator)) {
-					$query .= " $clause " . implode($separator, $this->statements[$clause]);
+					$t = $this;
+					$query .= " $clause " . implode($separator, array_map(function ($x) use ($t, $clause) {
+							if ($x instanceof SelectQuery) {
+								$x->disableSmartJoin(); // TODO: pass parent table aliases.
+								$t->parameters[$clause] = array_merge($t->parameters[$clause], $x->getParameters());
+								return '('.$x->getQuery().')';
+							} else {
+								return $x;
+							}
+						}, $this->statements[$clause]));
 				} elseif ($separator === null) {
 					$query .= " $clause " . $this->statements[$clause];
 				} elseif (is_callable($separator)) {
@@ -239,6 +248,11 @@ protected function quote($value) {
 		if (is_int($value) || $value instanceof FluentLiteral) { // number or SQL code - for example "NOW()"
 			return (string) $value;
 		}
+		if ($value instanceof SelectQuery) {
+			$value->disableSmartJoin(); // TODO: pass parent table aliases.
+			$this->parameters = array_merge($this->parameters, $value->getParameters());
+			return '('.($value->getQuery()).')';
+		}
 		return $this->fpdo->getPdo()->quote($value);
 	}
 

FluentPDO/CommonQuery.php

@@ -204,7 +204,7 @@ protected function buildQuery() {
 	 * @return string  rewrited $statement (e.g. tab1.tab2:col => tab2.col)
 	 */
 	private function createUndefinedJoins($statement) {
-		if (!$this->isSmartJoinEnabled) {
+		if (!$this->isSmartJoinEnabled || $statement instanceof SelectQuery) {
 			return $statement;
 		}
 

tests/53-subselect.phpt

@@ -0,0 +1,31 @@
+--TEST--
+Simple sub-select
+--FILE--
+<?php
+include_once dirname(__FILE__) . "/connect.inc.php";
+/* @var $fpdo FluentPDO */
+
+$subquery = $fpdo->from('article')->select(null)->select('COUNT(id)')->where('user_id', new FluentLiteral('user.id'));
+
+$query = $fpdo->from('user')->select($subquery)->where('id', 1);
+
+echo $query->getQuery() . "\n\n";
+print_r($query->getParameters()) . "\n";
+
+?>
+--EXPECTF--
+SELECT user.*, (SELECT COUNT(id)
+FROM article
+WHERE user_id = ?)
+FROM user
+WHERE id = ?
+
+Array
+(
+    [0] => FluentLiteral Object
+        (
+            [value:protected] => user.id
+        )
+
+    [1] => 1
+)