feat: drop all connections before dropping db for postgres

Author: nikophil

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   tests:
-    name: PHP ${{ matrix.php }}, SF ${{ matrix.symfony }} - ${{ matrix.deps }} ${{ matrix.use-orm == '1' && '- ORM' || '' }} ${{ matrix.use-odm == '1' && '- ODM' || '' }} ${{ matrix.use-dama == '1' && '- DAMA' || '' }}
+    name: PHP ${{ matrix.php }}, SF ${{ matrix.symfony }} - ${{ matrix.deps }} ${{ matrix.use-orm == '1' && (matrix.orm-db == 'postgres' && '- ORM (postgres)' || '- ORM (mysql)') || '' }} ${{ matrix.use-odm == '1' && '- ODM' || '' }} ${{ matrix.use-dama == '1' && '- DAMA' || '' }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -19,20 +19,23 @@ jobs:
         use-orm: [1]
         use-odm: [1]
         use-dama: [1]
+        orm-db: [ mysql ]
         exclude:
           - {use-orm: 0, use-odm: 0} # tested directly in a test case
           - {use-orm: 0, use-dama: 1} # cannot happen
           # conflicts
           - {php: 8.0, symfony: 6.2.*}
           - {php: 8.0, symfony: 6.3.*}
         include:
-          - {php: 8.0, symfony: 5.4.*, use-orm: 1, use-odm: 0, use-dama: 0, deps: lowest}
-          - {php: 8.0, symfony: 5.4.*, use-orm: 1, use-odm: 1, use-dama: 0, deps: lowest}
-          - {php: 8.0, symfony: 5.4.*, use-orm: 0, use-odm: 1, use-dama: 0, deps: lowest}
-          - {php: 8.2, symfony: 6.2.*, use-orm: 1, use-odm: 0, use-dama: 0, deps: highest}
-          - {php: 8.2, symfony: 6.2.*, use-orm: 1, use-odm: 1, use-dama: 0, deps: highest}
-          - {php: 8.2, symfony: 6.2.*, use-orm: 1, use-odm: 0, use-dama: 1, deps: highest}
-          - {php: 8.2, symfony: 6.2.*, use-orm: 0, use-odm: 1, use-dama: 0, deps: highest}
+          - {php: 8.0, symfony: 5.4.*, use-orm: 1, use-odm: 0, use-dama: 0, deps: lowest, orm-db: mysql}
+          - {php: 8.0, symfony: 5.4.*, use-orm: 1, use-odm: 1, use-dama: 0, deps: lowest, orm-db: mysql}
+          - {php: 8.0, symfony: 5.4.*, use-orm: 0, use-odm: 1, use-dama: 0, deps: lowest, orm-db: mysql}
+          - {php: 8.2, symfony: 6.2.*, use-orm: 1, use-odm: 0, use-dama: 0, deps: highest, orm-db: mysql}
+          - {php: 8.2, symfony: 6.2.*, use-orm: 1, use-odm: 1, use-dama: 0, deps: highest, orm-db: mysql}
+          - {php: 8.2, symfony: 6.2.*, use-orm: 1, use-odm: 0, use-dama: 1, deps: highest, orm-db: mysql}
+          - {php: 8.2, symfony: 6.2.*, use-orm: 0, use-odm: 1, use-dama: 0, deps: highest, orm-db: mysql}
+          - {php: 8.2, symfony: 6.2.*, use-orm: 1, use-odm: 0, use-dama: 1, deps: highest, orm-db: postgres}
+          - {php: 8.2, symfony: 6.2.*, use-orm: 1, use-odm: 0, use-dama: 0, deps: highest, orm-db: postgres}
 
     services:
       mysql:
@@ -42,13 +45,25 @@ jobs:
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+      postgres:
+        image: postgres:15
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: zenstruck_foundry_${{ matrix.use-dama }}_${{ matrix.orm-db }}
+          POSTGRES_PASSWORD: 1234
+        options: --health-cmd pg_isready --health-interval=10s --health-timeout=5s --health-retries=5
+        ports:
+          - 5432:5432
+
       mongo:
         image: mongo:4
         ports:
           - 27017:27017
 
     env:
-      DATABASE_URL: mysql://root:1234@127.0.0.1:3306/zenstruck_foundry?serverVersion=5.7
+      MYSQL_URL: mysql://root:1234@127.0.0.1:3306/zenstruck_foundry?serverVersion=5.7
+      PGSQL_URL: postgresql://postgres:1234@127.0.0.1:5432/zenstruck_foundry_${{ matrix.use-dama }}_${{ matrix.orm-db }}?charset=utf8&serverVersion=15
       MONGO_URL: mongodb://127.0.0.1:27017/dbName?compressors=disabled&gssapiServiceName=mongodb
 
     steps:
@@ -85,6 +100,7 @@ jobs:
           USE_ORM: ${{ matrix.use-orm }}
           USE_ODM: ${{ matrix.use-odm }}
           USE_FOUNDRY_BUNDLE: 1
+          DATABASE_URL: ${{ matrix.orm-db == 'postgres' && env.PGSQL_URL || env.MYSQL_URL }}
 
   code-coverage:
     name: Code Coverage

Makefile

@@ -3,7 +3,7 @@
 SHELL=/bin/bash
 
 # DB variables
-MYSQL_URL="mysql://root:root@mysql:3306/zenstruck_foundry?charset=utf8"
+PGSQL_URL="postgresql://zenstruck:zenstruck@postgres:5432/zenstruck_foundry?serverVersion=15"
 MONGO_URL="mongodb://mongo:mongo@mongo:27017/mongo?compressors=disabled&gssapiServiceName=mongodb&authSource=mongo"
 
 # Default test context variables
@@ -47,10 +47,10 @@ endif
 # Create special context for CI
 INTERACTIVE:=$(shell [ -t 0 ] && echo 1)
 ifdef INTERACTIVE
-	DC_EXEC=$(DOCKER_COMPOSE) exec -e USE_FOUNDRY_BUNDLE=${USE_FOUNDRY_BUNDLE} -e DATABASE_URL=${MYSQL_URL} -e MONGO_URL=${MONGO_URL}
+	DC_EXEC=$(DOCKER_COMPOSE) exec -e USE_FOUNDRY_BUNDLE=${USE_FOUNDRY_BUNDLE} -e DATABASE_URL=${PGSQL_URL} -e MONGO_URL=${MONGO_URL}
 else
 	# CI needs to be ran in no-tty mode
-	DC_EXEC=$(DOCKER_COMPOSE) exec -e USE_FOUNDRY_BUNDLE=${USE_FOUNDRY_BUNDLE} -e DATABASE_URL=${MYSQL_URL} -e MONGO_URL=${MONGO_URL} -T
+	DC_EXEC=$(DOCKER_COMPOSE) exec -e USE_FOUNDRY_BUNDLE=${USE_FOUNDRY_BUNDLE} -e DATABASE_URL=${PGSQL_URL} -e MONGO_URL=${MONGO_URL} -T
 endif
 
 PHP=php${PHP_VERSION}
@@ -141,7 +141,7 @@ docker-build: ### Build and start containers
 .PHONY: docker-start
 docker-start: ### Start containers
 	@echo -e "\nStarting containers. This could take up to one minute.\n"
-	@$(DOCKER_COMPOSE) up --detach --no-build --remove-orphans mysql mongo "${PHP}";
+	@$(DOCKER_COMPOSE) up --detach --no-build --remove-orphans postgres mongo "${PHP}";
 
 .PHONY: docker-stop
 docker-stop: ### Stop containers

README.md

@@ -87,8 +87,7 @@ PREFER_LOWEST=1 # force composer to request lowest dependencies
 
 You can also add these variables to the `.env` file to change the ports used by docker:
 ```dotenv
-MYSQL_PORT=3307
-POSTGRES_PORT=5434
+PGSQL_PORT=5434
 MONGO_PORT=27018
 ```
 

docker-compose.yaml

@@ -5,7 +5,7 @@ services:
         container_name: foundry_php8.0
         image: ghcr.io/zenstruck/foundry/php:8.0
         depends_on:
-            mysql:
+            postgres:
                 condition: service_healthy
             mongo:
                 condition: service_healthy
@@ -25,17 +25,19 @@ services:
         container_name: foundry_php8.2
         image: ghcr.io/zenstruck/foundry/php:8.2
 
-    mysql:
-        container_name: foundry_mysql
-        image: mysql
-        command: --default-authentication-plugin=mysql_native_password
+    postgres:
+        container_name: foundry_postgres
+        image: postgres:15
         environment:
-            MYSQL_ROOT_PASSWORD: root
-            MYSQL_DATABASE: zenstruck_foundry
+            POSTGRES_DB: zenstruck_foundry
+            POSTGRES_PASSWORD: zenstruck
+            POSTGRES_USER: zenstruck
+        volumes:
+            - db-data:/var/lib/postgresql/data:rw
         ports:
-            - ${MYSQL_PORT:-3306}:3306
+            - ${PGSQL_PORT:-5432}:5432
         healthcheck:
-            test: 'mysql -u root -proot -D zenstruck_foundry -e "SELECT 1"'
+            test: 'pg_isready -d zenstruck_foundry'
             timeout: 120s
             retries: 60
             interval: 2s
@@ -59,3 +61,6 @@ services:
             test: echo 'db.runCommand("ping").ok' | mongo mongo:27017/test --quiet
             timeout: 10s
             retries: 10
+
+volumes:
+    db-data:

src/Test/AbstractSchemaResetter.php

@@ -22,14 +22,14 @@ abstract class AbstractSchemaResetter
 {
     abstract public function resetSchema(): void;
 
-    protected function runCommand(Application $application, string $command, array $parameters = []): void
+    protected function runCommand(Application $application, string $command, array $parameters = [], bool $canFail = false): void
     {
         $exit = $application->run(
             new ArrayInput(\array_merge(['command' => $command], $parameters)),
             $output = new BufferedOutput()
         );
 
-        if (0 !== $exit) {
+        if (0 !== $exit && !$canFail) {
             throw new \RuntimeException(\sprintf('Error running "%s": %s', $command, $output->fetch()));
         }
     }

src/Test/ORMDatabaseResetter.php

@@ -11,6 +11,8 @@
 
 namespace Zenstruck\Foundry\Test;
 
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
@@ -101,9 +103,24 @@ private function dropSchema(): void
     private function dropAndResetDatabase(): void
     {
         foreach ($this->connectionsToReset() as $connection) {
+            $databasePlatform = $this->registry->getConnection($connection)->getDatabasePlatform();
+
+            if ($databasePlatform instanceof PostgreSQLPlatform) {
+                // let's drop all connections to the database to be able to drop it
+                $this->runCommand(
+                    $this->application,
+                    'doctrine:query:sql',
+                    [
+                        '--connection' => $connection,
+                        'sql' => 'SELECT pid, pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = current_database() AND pid <> pg_backend_pid()',
+                    ],
+                    canFail: true,
+                );
+            }
+
             $dropParams = ['--connection' => $connection, '--force' => true];
 
-            if ('sqlite' !== $this->registry->getConnection($connection)->getDatabasePlatform()->getName()) {
+            if (!$databasePlatform instanceof SqlitePlatform) {
                 // sqlite does not support "--if-exists" (ref: https://github.com/doctrine/dbal/pull/2402)
                 $dropParams['--if-exists'] = true;
             }