From c396030673fbdfa4cfd1fb43927b7ba0e4e2d7d6 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Wed, 18 May 2022 17:13:36 +0200 Subject: [PATCH 1/2] moved mysql specific test into pdo-mysql --- tests/default/data/pdo-mysql.php | 15 +++++++++++++++ tests/default/data/pdo-prepare.php | 12 ------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/default/data/pdo-mysql.php b/tests/default/data/pdo-mysql.php index 7f5b61e65..802f3db0a 100644 --- a/tests/default/data/pdo-mysql.php +++ b/tests/default/data/pdo-mysql.php @@ -27,4 +27,19 @@ public function aggregateFunctions(PDO $pdo) $stmt = $pdo->query($query, PDO::FETCH_ASSOC); assertType('PDOStatement|null, MIN(adaid): int<-32768, 32767>|null, COUNT(adaid): int, AVG(adaid): float|null}>', $stmt); } + + public function placeholderInData(PDO $pdo) + { + $query = 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"'; + $stmt = $pdo->prepare($query); + assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); + $stmt->execute(); + assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); + + $query = "SELECT adaid FROM ada WHERE email LIKE ':gesperrt%'"; + $stmt = $pdo->prepare($query); + assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); + $stmt->execute(); + assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); + } } diff --git a/tests/default/data/pdo-prepare.php b/tests/default/data/pdo-prepare.php index dfb773d39..988aef832 100644 --- a/tests/default/data/pdo-prepare.php +++ b/tests/default/data/pdo-prepare.php @@ -60,18 +60,6 @@ public function placeholderInData(PDO $pdo) assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); $stmt->execute(); assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); - - $query = 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"'; - $stmt = $pdo->prepare($query); - assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); - $stmt->execute(); - assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); - - $query = "SELECT adaid FROM ada WHERE email LIKE ':gesperrt%'"; - $stmt = $pdo->prepare($query); - assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); - $stmt->execute(); - assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); } public function arrayParam(PDO $pdo) From 226dc790f3b293a90604cc9a3aeba7d5c4b276e3 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Wed, 18 May 2022 17:16:40 +0200 Subject: [PATCH 2/2] fix --- tests/default/data/pdo-mysql.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/default/data/pdo-mysql.php b/tests/default/data/pdo-mysql.php index 802f3db0a..507f58282 100644 --- a/tests/default/data/pdo-mysql.php +++ b/tests/default/data/pdo-mysql.php @@ -30,12 +30,14 @@ public function aggregateFunctions(PDO $pdo) public function placeholderInData(PDO $pdo) { + // double quotes within the query $query = 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"'; $stmt = $pdo->prepare($query); assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); $stmt->execute(); assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); + // single quotes within the query $query = "SELECT adaid FROM ada WHERE email LIKE ':gesperrt%'"; $stmt = $pdo->prepare($query); assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt);