From d735d66ca347b18ba6e9e15545bd6f405b834130 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Wed, 18 May 2022 17:27:35 +0200 Subject: [PATCH 1/4] moved mysql specific tests --- tests/default/DbaInferenceTest.php | 2 +- tests/default/data/pdo.php | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/default/DbaInferenceTest.php b/tests/default/DbaInferenceTest.php index 70fdab376..456121672 100644 --- a/tests/default/DbaInferenceTest.php +++ b/tests/default/DbaInferenceTest.php @@ -50,7 +50,7 @@ public function dataFileAsserts(): iterable yield from $this->gatherAssertTypes(__DIR__.'/data/runMysqlQuery.php'); // XXX cases which are not yet supported by the PdoQueryReflector - if ('pdo' !== getenv('DBA_REFLECTOR')) { + if ('pdo' !== getenv('DBA_REFLECTOR') && 'pdo-pgsql' !== getenv('DBA_REFLECTOR')) { yield from $this->gatherAssertTypes(__DIR__.'/data/query-alias.php'); } diff --git a/tests/default/data/pdo.php b/tests/default/data/pdo.php index cb3807584..f55e1df56 100644 --- a/tests/default/data/pdo.php +++ b/tests/default/data/pdo.php @@ -153,10 +153,6 @@ public function placeholderInData(PDO $pdo) $stmt = $pdo->query($query, PDO::FETCH_ASSOC); assertType('PDOStatement}>', $stmt); - $query = 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"'; - $stmt = $pdo->query($query, PDO::FETCH_ASSOC); - assertType('PDOStatement}>', $stmt); - $query = "SELECT adaid FROM ada WHERE email LIKE ':gesperrt%'"; $stmt = $pdo->query($query, PDO::FETCH_ASSOC); assertType('PDOStatement}>', $stmt); From 698aab0d32cfab4b9cf9914c136e4406cf03ed24 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Wed, 18 May 2022 17:28:24 +0200 Subject: [PATCH 2/4] f --- tests/default/data/pdo-mysql.php | 10 +++++++++- tests/default/data/query-alias.php | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/default/data/pdo-mysql.php b/tests/default/data/pdo-mysql.php index 507f58282..b376dd3b9 100644 --- a/tests/default/data/pdo-mysql.php +++ b/tests/default/data/pdo-mysql.php @@ -28,7 +28,7 @@ public function aggregateFunctions(PDO $pdo) assertType('PDOStatement|null, MIN(adaid): int<-32768, 32767>|null, COUNT(adaid): int, AVG(adaid): float|null}>', $stmt); } - public function placeholderInData(PDO $pdo) + public function placeholderInDataExecute(PDO $pdo) { // double quotes within the query $query = 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"'; @@ -44,4 +44,12 @@ public function placeholderInData(PDO $pdo) $stmt->execute(); assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); } + + public function placeholderInDataPrepared(PDO $pdo) + { + // double quotes within the query + $query = 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"'; + $stmt = $pdo->query($query, PDO::FETCH_ASSOC); + assertType('PDOStatement}>', $stmt); + } } diff --git a/tests/default/data/query-alias.php b/tests/default/data/query-alias.php index 2d7fed1a0..2ddfa5482 100644 --- a/tests/default/data/query-alias.php +++ b/tests/default/data/query-alias.php @@ -7,6 +7,7 @@ class Foo { + // TODO pgsql: doesn't resolve null? public function leftJoinQuery(PDO $pdo) { $query = 'SELECT a.email, b.adaid FROM ada a LEFT JOIN ada b ON a.adaid=b.adaid'; From 7abbaf2389496ab913095e49793302aa4b040076 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Wed, 18 May 2022 17:29:53 +0200 Subject: [PATCH 3/4] Update pdo-mysql.php --- tests/default/data/pdo-mysql.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/default/data/pdo-mysql.php b/tests/default/data/pdo-mysql.php index b376dd3b9..f273a9e2f 100644 --- a/tests/default/data/pdo-mysql.php +++ b/tests/default/data/pdo-mysql.php @@ -28,7 +28,7 @@ public function aggregateFunctions(PDO $pdo) assertType('PDOStatement|null, MIN(adaid): int<-32768, 32767>|null, COUNT(adaid): int, AVG(adaid): float|null}>', $stmt); } - public function placeholderInDataExecute(PDO $pdo) + public function placeholderInDataPreparedPDO $pdo) { // double quotes within the query $query = 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"'; @@ -45,7 +45,7 @@ public function placeholderInDataExecute(PDO $pdo) assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); } - public function placeholderInDataPrepared(PDO $pdo) + public function placeholderInDataExecute(PDO $pdo) { // double quotes within the query $query = 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"'; From 696f3e12893d0103e872c08f0c66563d58991dde Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Wed, 18 May 2022 17:30:21 +0200 Subject: [PATCH 4/4] Update pdo-mysql.php --- tests/default/data/pdo-mysql.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/default/data/pdo-mysql.php b/tests/default/data/pdo-mysql.php index f273a9e2f..67fb73bc1 100644 --- a/tests/default/data/pdo-mysql.php +++ b/tests/default/data/pdo-mysql.php @@ -28,7 +28,7 @@ public function aggregateFunctions(PDO $pdo) assertType('PDOStatement|null, MIN(adaid): int<-32768, 32767>|null, COUNT(adaid): int, AVG(adaid): float|null}>', $stmt); } - public function placeholderInDataPreparedPDO $pdo) + public function placeholderInDataPrepared(PDO $pdo) { // double quotes within the query $query = 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"'; @@ -45,7 +45,7 @@ public function placeholderInDataPreparedPDO $pdo) assertType('PDOStatement, 0: int<-32768, 32767>}>', $stmt); } - public function placeholderInDataExecute(PDO $pdo) + public function placeholderInDataQuery(PDO $pdo) { // double quotes within the query $query = 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"';