Home Explore Help
Sign In
githab
/
cakephp
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fix issues with insert() and subqueries.

insert queries should accept subqueries as values for columns. This lets
the query builder be more composable and cover even more use cases
without much overhead. I've also added the missing traverse()
implementation as @lorenzo pointed out.
mark_story 11 years ago
parent
bbbe6a9abe
commit
ac5282d70f
2 changed files with 31 additions and 14 deletions
Split View Show Diff Stats
  1. 17 6
      src/Database/Expression/ValuesExpression.php
  2. 14 8
      tests/TestCase/Database/QueryTest.php

+ 17 - 6
src/Database/Expression/ValuesExpression.php
View File 

@@ -146,25 +146,28 @@ class ValuesExpression implements ExpressionInterface {
 
 
 		$i = 0;
 
 		$defaults = array_fill_keys($this->_columns, null);
 
+		$placeholders = [];
 
+
 
 		foreach ($this->_values as $row) {
 
 			$row = array_merge($defaults, $row);
 
+			$rowPlaceholders = [];
 
 			foreach ($row as $column => $value) {
 
 				if ($value instanceof ExpressionInterface) {
 
-					$value = $value->sql($generator);
 
+					$rowPlaceholders[] = '(' . $value->sql($generator) . ')';
 
+					continue;
 
 				}
 
 				$type = $this->typeMap()->type($column);
 
-				$generator->bind($i++, $value, $type);
 
+				$placeholder = $generator->placeholder($i);
 
+				$rowPlaceholders[] = $placeholder;
 
+				$generator->bind($placeholder, $value, $type);
 
 			}
 
+			$placeholders[] = implode(', ', $rowPlaceholders);
 
 		}
 
 
 		if ($this->query()) {
 
 			return ' ' . $this->query()->sql($generator);
 
 		}
 
 
-		$placeholders = [];
 
-		$numColumns = count($this->_columns);
 
-		$rowPlaceholders = implode(', ', array_fill(0, $numColumns, '?'));
 
-		$placeholders = array_fill(0, count($this->_values), $rowPlaceholders);
 
 		return sprintf(' VALUES (%s)', implode('), (', $placeholders));
 
 	}
 
 
@@ -186,6 +189,14 @@ class ValuesExpression implements ExpressionInterface {
 
 			if ($v instanceof ExpressionInterface) {
 
 				$v->traverse($visitor);
 
 			}
 
+			if (!is_array($v)) {
 
+				continue;
 
+			}
 
+			foreach ($v as $column => $field) {
 
+				if ($field instanceof ExpressionInterface) {
 
+					$field->traverse($visitor);
 
+				}
 
+			}
 
 		}
 
 	}

+ 14 - 8
tests/TestCase/Database/QueryTest.php
View File 

@@ -2130,7 +2130,7 @@ class QueryTest extends TestCase {
 
 		$result = $query->sql();
 
 		$this->assertQuotedQuery(
 
 			'INSERT INTO <articles> \(<title>, <body>\) ' .
 
-			'VALUES \(\?, \?\)',
 
+			'VALUES \(:c0, :c1\)',
 
 			$result,
 
 			true
 
 		);
 
@@ -2166,7 +2166,7 @@ class QueryTest extends TestCase {
 
 		$result = $query->sql();
 
 		$this->assertQuotedQuery(
 
 			'INSERT INTO <articles> \(<title>, <body>\) ' .
 
-			'VALUES \(\?, \?\)',
 
+			'VALUES \(:c0, :c1\)',
 
 			$result,
 
 			true
 
 		);
 
@@ -2305,12 +2305,18 @@ class QueryTest extends TestCase {
 
 			->into('articles')
 
 			->values(['title' => $query->newExpr("SELECT 'jose'")]);
 
 
-		$result = $query->sql();
 
-		$this->assertQuotedQuery(
 
-			"INSERT INTO <articles> \(<title>\) VALUES (?)",
 
-			$result,
 
-			true
 
-		);
 
+		$result = $query->execute();
 
+		$this->assertCount(1, $result);
 
+
 
+		$subquery = new Query($this->connection);
 
+		$subquery->select(['name'])
 
+			->from('authors')
 
+			->where(['id' => 1]);
 
+
 
+		$query = new Query($this->connection);
 
+		$query->insert(['title'])
 
+			->into('articles')
 
+			->values(['title' => $subquery]);
 
 		$result = $query->execute();
 
 		$this->assertCount(1, $result);
 
 	}