Merge pull request #2773 from musmanikram/2762-fix-questionmark-bind

Fix ? bind with := bind
codeigniter4 · Mar 31, 2020 · b67f186 · b67f186
2 parents 2a40c22 + d7a47da
commit b67f186
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/system/Database/Query.php b/system/Database/Query.php
@@ -368,7 +368,7 @@ protected function compileBinds()
 	{
 		$sql = $this->finalQueryString;
 
-		$hasNamedBinds = strpos($sql, ':') !== false;
+		$hasNamedBinds = strpos($sql, ':') !== false && strpos($sql, ':=') === false;
 
 		if (empty($this->binds) || empty($this->bindMarker) ||
 				(strpos($sql, $this->bindMarker) === false &&

diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
@@ -316,4 +316,23 @@ public function testSetQueryBindsWithSetEscapeFalse()
 
 		$this->assertEquals($expected, $query->getQuery());
 	}
+
+	/**
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/2762
+	 */
+	public function testSetQueryBinds()
+	{
+		$query = new Query($this->db);
+
+		$binds = [
+			1,
+			2,
+		];
+
+		$query->setQuery('SELECT @factorA := ?, @factorB := ?', $binds);
+
+		$expected = 'SELECT @factorA := 1, @factorB := 2';
+
+		$this->assertEquals($expected, $query->getQuery());
+	}
 }