Adding test for named params in queries

cakephp · Oct 14, 2012 · ea74b74 · ea74b74
1 parent 4c4a764
commit ea74b74
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Connection.php b/lib/Cake/Model/Datasource/Database/Connection.php
@@ -246,15 +246,24 @@ public function charset($collation) {
  * @return void
  **/
 	protected function _bindValues($statement, $params, $types) {
-		$offset = 1;
-		if (!empty($types) && is_int(key($types))) {
+		if (empty($params)) {
+			return;
+		}
+
+		if (!empty($types) && ctype_digit(key($types))) {
 			$params = array_values($params);
 		}
+
+		$annonymousParams = is_int(key($params)) ? true : false;
+		$offset = 1;
 		foreach ($params as $index => $value) {
+			if ($annonymousParams) {
+				$index += $offset;
+			}
 			if (isset($types[$index])) {
-				$statement->bindValue($index + $offset, $value, $type);
+				$statement->bindValue($index, $value, $type);
 			} else {
-				$statement->bindValue($index + $offset, $value);
+				$statement->bindValue($index, $value);
 			}
 		}
 	}

diff --git a/lib/Cake/Test/TestCase/Model/Datasource/Database/ConnectionTest.php b/lib/Cake/Test/TestCase/Model/Datasource/Database/ConnectionTest.php
@@ -116,6 +116,12 @@ public function testExecuteWithArguments() {
 		$this->assertCount(1, $statement);
 		$result = $statement->fetch('assoc');
 		$this->assertEquals(array('total' => 6), $result);
+
+		$sql = 'SELECT 1 + :one + :two AS total';
+		$statement = $this->connection->execute($sql, array('one' => 2, 'two' => 3));
+		$this->assertCount(1, $statement);
+		$result = $statement->fetch('assoc');
+		$this->assertEquals(array('total' => 6), $result);
 	}
 
 }