Expand Query named binds recognition (#4769)

paulbalandan · web-flow · commit a5fc431c84f9 · 2021-06-04T20:33:34.000+08:00
diff --git a/system/Database/Query.php b/system/Database/Query.php
@@ -315,13 +315,13 @@ public function getOriginalQuery(): string
 	 *
 	 * @return void
 	 *
-	 * @see https://regex101.com/r/EUEhay/1 Test
+	 * @see https://regex101.com/r/EUEhay/4
 	 */
 	protected function compileBinds()
 	{
 		$sql = $this->finalQueryString;
 
-		$hasNamedBinds = preg_match('/:[a-z\d.)_(]+:/i', $sql) === 1;
+		$hasNamedBinds = preg_match('/:((?!=).+):/', $sql) === 1;
 
 		if (empty($this->binds)
 			|| empty($this->bindMarker)

Original file line number	Diff line number	Diff line change
`@@ -315,13 +315,13 @@ public function getOriginalQuery(): string`
`315`	`315`	`*`
`316`	`316`	`* @return void`
`317`	`317`	`*`
`318`		`- * @see https://regex101.com/r/EUEhay/1 Test`
	`318`	`+ * @see https://regex101.com/r/EUEhay/4`
`319`	`319`	`*/`
`320`	`320`	`protected function compileBinds()`
`321`	`321`	`{`
`322`	`322`	`$sql = $this->finalQueryString;`
`323`	`323`
`324`		`- $hasNamedBinds = preg_match('/:[a-z\d.)_(]+:/i', $sql) === 1;`
	`324`	`+ $hasNamedBinds = preg_match('/:((?!=).+):/', $sql) === 1;`
`325`	`325`
`326`	`326`	`if (empty($this->binds)`
`327`	`327`	`\|\| empty($this->bindMarker)`