Build with DBAL 4@dev on PostgreSQL

.github/workflows/continuous-integration.yml

@@ -81,6 +81,10 @@ jobs:
         postgres-version:
           - "9.6"
           - "14"
+        include:
+        - php-version: "8.1"
+          dbal-version: "4@dev"
+          postgres-version: "14"
 
     services:
       postgres:

tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php

@@ -53,9 +53,19 @@ public function testGetCreateSchemaSql(): void
 
         self::assertCount(22, $sql, 'Total of 22 queries should be executed');
 
-        self::assertEquals('CREATE TABLE cms_addresses (id INT NOT NULL, user_id INT DEFAULT NULL, country VARCHAR(50) NOT NULL, zip VARCHAR(50) NOT NULL, city VARCHAR(50) NOT NULL, PRIMARY KEY(id))', array_shift($sql));
+        self::assertThat(array_shift($sql), self::logicalOr(
+        // DBAL 3
+            self::equalTo('CREATE TABLE cms_addresses (id INT NOT NULL, user_id INT DEFAULT NULL, country VARCHAR(50) NOT NULL, zip VARCHAR(50) NOT NULL, city VARCHAR(50) NOT NULL, PRIMARY KEY(id))'),
+            // DBAL 4 (see https://github.com/doctrine/dbal/pull/4777)
+            self::equalTo('CREATE TABLE cms_addresses (id INT NOT NULL, country VARCHAR(50) NOT NULL, zip VARCHAR(50) NOT NULL, city VARCHAR(50) NOT NULL, user_id INT DEFAULT NULL, PRIMARY KEY(id))')
+        ));
         self::assertEquals('CREATE UNIQUE INDEX UNIQ_ACAC157BA76ED395 ON cms_addresses (user_id)', array_shift($sql));
-        self::assertEquals('CREATE TABLE cms_users (id INT NOT NULL, email_id INT DEFAULT NULL, status VARCHAR(50) DEFAULT NULL, username VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))', array_shift($sql));
+        self::assertThat(array_shift($sql), self::logicalOr(
+            // DBAL 3
+            self::equalTo('CREATE TABLE cms_users (id INT NOT NULL, email_id INT DEFAULT NULL, status VARCHAR(50) DEFAULT NULL, username VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))'),
+            // DBAL 4 (see https://github.com/doctrine/dbal/pull/4777)
+            self::equalTo('CREATE TABLE cms_users (id INT NOT NULL, status VARCHAR(50) DEFAULT NULL, username VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, email_id INT DEFAULT NULL, PRIMARY KEY(id))')
+        ));
         self::assertEquals('CREATE UNIQUE INDEX UNIQ_3AF03EC5F85E0677 ON cms_users (username)', array_shift($sql));
         self::assertEquals('CREATE UNIQUE INDEX UNIQ_3AF03EC5A832C1C9 ON cms_users (email_id)', array_shift($sql));
         self::assertEquals('CREATE TABLE cms_users_groups (user_id INT NOT NULL, group_id INT NOT NULL, PRIMARY KEY(user_id, group_id))', array_shift($sql));