From 43522bf69afb0074804e68847a4635f93b904d48 Mon Sep 17 00:00:00 2001 From: Daniel Rotter Date: Wed, 29 Jan 2025 12:17:30 +0100 Subject: [PATCH 1/2] Change schema to enforce error --- tests/schema.sql | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/schema.sql b/tests/schema.sql index 086ca7a07..a7fd43b8e 100644 --- a/tests/schema.sql +++ b/tests/schema.sql @@ -30,7 +30,7 @@ ALTER TABLE `ak` CREATE TABLE `typemix` ( - `pid` int NOT NULL, + `pid` int(11) unsigned NOT NULL AUTO_INCREMENT, `c_char5` char(5) NOT NULL, `c_varchar255` varchar(255) NOT NULL, `c_varchar25` varchar(25) DEFAULT NULL, @@ -70,15 +70,10 @@ CREATE TABLE `typemix` ( `c_json` json, `c_json_not_null` json NOT NULL, `c_decimal` decimal(12, 2), - `c_decimal_not_null` decimal(12, 2) NOT NULL + `c_decimal_not_null` decimal(12, 2) NOT NULL, + PRIMARY KEY(`pid`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -ALTER TABLE `typemix` - ADD PRIMARY KEY (`pid`); - -ALTER TABLE `typemix` - MODIFY `pid` int NOT NULL AUTO_INCREMENT; - CREATE TABLE `cmsdomain` ( `id` int(11) NOT NULL, `cmsdomainid` int(11) NOT NULL, From f8b7b8e37a757315b6d25fb6ac2e9d78abdc9e9d Mon Sep 17 00:00:00 2001 From: Daniel Rotter Date: Wed, 29 Jan 2025 12:29:07 +0100 Subject: [PATCH 2/2] Add test for primary key type --- tests/default/data/doctrine-dbal.php | 3 +++ tests/schema.sql | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/default/data/doctrine-dbal.php b/tests/default/data/doctrine-dbal.php index 4fc0f9574..bc4096ee6 100644 --- a/tests/default/data/doctrine-dbal.php +++ b/tests/default/data/doctrine-dbal.php @@ -61,6 +61,9 @@ public function executeQuery(Connection $conn, array $types, QueryCacheProfile $ $result = $conn->executeQuery('SELECT email, adaid FROM ada'); assertType('array{email: string, adaid: int<-32768, 32767>}|false', $result->fetchAssociative()); + + $result = $conn->executeQuery('SELECT pid FROM typemix'); + assertType('array{pid: int<0, 4294967295>}|false', $result->fetchAssociative()); } public function executeStatement(Connection $conn, int $adaid) diff --git a/tests/schema.sql b/tests/schema.sql index a7fd43b8e..614063c2d 100644 --- a/tests/schema.sql +++ b/tests/schema.sql @@ -30,7 +30,7 @@ ALTER TABLE `ak` CREATE TABLE `typemix` ( - `pid` int(11) unsigned NOT NULL AUTO_INCREMENT, + `pid` int unsigned NOT NULL AUTO_INCREMENT, `c_char5` char(5) NOT NULL, `c_varchar255` varchar(255) NOT NULL, `c_varchar25` varchar(25) DEFAULT NULL,