Relaxing usage for Query::bind() and adding unit test for it

cakephp · Aug 10, 2013 · ed49d00 · ed49d00
1 parent 6cdf9ce
commit ed49d00
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/lib/Cake/Database/Query.php b/lib/Cake/Database/Query.php
@@ -1518,7 +1518,7 @@ public function defaultTypes(array $types = null) {
  * to database
  * @return Query
  */
-	public function bind($param, $value, $type) {
+	public function bind($param, $value, $type = 'string') {
 		$this->valueBinder()->bind($param, $value, $type);
 		return $this;
 	}

diff --git a/lib/Cake/Database/ValueBinder.php b/lib/Cake/Database/ValueBinder.php
@@ -44,7 +44,7 @@ class ValueBinder {
  * to database
  * @return void
  */
-	public function bind($param, $value, $type) {
+	public function bind($param, $value, $type = 'string') {
 		$this->_bindings[$param] = compact('value', 'type') + [
 			'placeholder' => is_numeric($param) ? $param : substr($param, 1)
 		];

diff --git a/lib/Cake/Test/TestCase/Database/QueryTest.php b/lib/Cake/Test/TestCase/Database/QueryTest.php
@@ -1094,7 +1094,7 @@ public function testSelectHaving() {
 		$this->assertEquals($expected, $result->fetchAll('assoc'));
 
 		$result = $query->having(function($e) {
-			return $e->add('count(author_id) = 1 + 1'); 
+			return $e->add('count(author_id) = 1 + 1');
 		}, [], true)
 			->execute();
 		$expected = [['total' => 2, 'author_id' => 1]];
@@ -1907,6 +1907,32 @@ public function testDefaultTypes() {
 		$this->assertCount(6, $results, 'All 6 rows should match.');
 	}
 
+/**
+ * Tests parameter binding
+ *
+ * @return void
+ */
+	public function testBind() {
+		$query = new Query($this->connection);
+		$results = $query->select(['id', 'comment'])
+			->from('comments')
+			->where(['created BETWEEN :foo AND :bar'])
+			->bind(':foo', new \DateTime('2007-03-18 10:50:00'), 'datetime')
+			->bind(':bar', new \DateTime('2007-03-18 10:52:00'), 'datetime')
+			->execute();
+		$expected = [['id' => '4', 'comment' => 'Fourth Comment for First Article']];
+		$this->assertEquals($expected, $results->fetchAll('assoc'));
+
+		$query = new Query($this->connection);
+		$results = $query->select(['id', 'comment'])
+			->from('comments')
+			->where(['created BETWEEN :foo AND :bar'])
+			->bind(':foo', '2007-03-18 10:50:00')
+			->bind(':bar','2007-03-18 10:52:00')
+			->execute();
+		$this->assertEquals($expected, $results->fetchAll('assoc'));
+	}
+
 /**
  * Assertion for comparing a table's contents with what is in it.
  *