From c97e9811eb1ef64540afbb771f0ec8c366280b18 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Wed, 18 May 2022 16:52:20 +0200 Subject: [PATCH 1/4] github actions: remove pgsql replay job I don't have pgsql at hand to record pgsql data. record-and-replay itself is tested on mysql already. --- .github/workflows/tests-postgres.yml | 42 ---------------------------- 1 file changed, 42 deletions(-) diff --git a/.github/workflows/tests-postgres.yml b/.github/workflows/tests-postgres.yml index 60d100509..812206340 100644 --- a/.github/workflows/tests-postgres.yml +++ b/.github/workflows/tests-postgres.yml @@ -67,45 +67,3 @@ jobs: PGPASSWORD: postgres - run: composer phpunit - - replay: - name: PHPUnit (reflection replay) - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - include: - - php-version: "8.1" - reflector: "pdo-pgsql" - mode: "replay" - dsn: "pgsql" - - env: - DBA_REFLECTOR: ${{ matrix.reflector }} - DBA_MODE: ${{ matrix.mode }} - DBA_DSN: ${{ matrix.dsn }} - DBA_USER: postgres - DBA_DATABASE: postgres - DBA_PASSWORD: postgres - - steps: - - uses: actions/checkout@v2 - with: - repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }} - ref: ${{ github.event.client_payload.pull_request.head.ref }} - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: "${{ matrix.php-version }}" - coverage: none - - - uses: "ramsey/composer-install@v2" - with: - composer-options: "--prefer-dist --no-progress" - - - name: Setup Problem Matchers for PHPUnit - run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - - run: composer phpunit From 110b751ad7dab45108beb7c149c023139ca31bde Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Wed, 18 May 2022 16:54:05 +0200 Subject: [PATCH 2/4] Delete .phpunit-phpstan-dba-pdo-pgsql.cache --- .../.phpunit-phpstan-dba-pdo-pgsql.cache | 373 ------------------ 1 file changed, 373 deletions(-) delete mode 100644 tests/default/config/.phpunit-phpstan-dba-pdo-pgsql.cache diff --git a/tests/default/config/.phpunit-phpstan-dba-pdo-pgsql.cache b/tests/default/config/.phpunit-phpstan-dba-pdo-pgsql.cache deleted file mode 100644 index 1b3d2da9b..000000000 --- a/tests/default/config/.phpunit-phpstan-dba-pdo-pgsql.cache +++ /dev/null @@ -1,373 +0,0 @@ - 'v6-schema-hash', - 'schemaHash' => NULL, - 'records' => - array ( - 'SELECT * FROM typemix' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT MAX(adaid), MIN(adaid), COUNT(adaid), AVG(adaid) FROM ada WHERE adaid = 1' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT a.email, b.adaid, b.gesperrt FROM ada a LEFT JOIN ada b ON a.adaid=b.adaid' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada' => - array ( - 'result' => - array ( - 5 => NULL, - 3 => NULL, - ), - ), - 'SELECT adaid FROM ada LIMIT 1 FOR SHARE' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada LIMIT 1 OFFSET 1' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada LIMIT 1 OFFSET 1 FOR UPDATE' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada WHERE adaid IN (\'1\')' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada WHERE adaid IN (\'1\') AND email LIKE \'1970-01-01\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada WHERE adaid IN (\'1.0\')' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada WHERE adaid IN (:adaids)' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada WHERE adaid IN (:ids)' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada WHERE adaid IN (:ids) AND email LIKE :time' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada WHERE adaid IN (NULL) AND email LIKE \'1970-01-01\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada WHERE email LIKE "hello?%"' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada WHERE email LIKE \'%questions ?%\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT adaid FROM ada WHERE email LIKE \':gesperrt%\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT akid FROM ak WHERE eadavk>1.0' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT akid FROM ak WHERE eadavk>1.1' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT count(*) FROM typemix WHERE c_date = \'1970-01-01\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT count(*) FROM typemix WHERE c_datetime = \'1970-01-01\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT eladaid FROM ak' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email FROM ada' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email adaid WHERE gesperrt freigabe1u1 FROM ada' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE adaid = \'1\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE adaid = \'1\' and email = \'email@example.org\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE adaid = :adaid' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE adaid = ?' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE adaid = ? and email = ?' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE adaid=1' => - array ( - 'result' => - array ( - 5 => NULL, - 3 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE email <=> \'\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE email <=> :email' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE email = \'email@example.org\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE email = \'test@example.org\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE email = :email' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE email = :test1 AND email = :test2' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE email = ?' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid FROM ada WHERE email=\'test@example.org\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada' => - array ( - 'result' => - array ( - 5 => NULL, - 3 => NULL, - ), - ), - 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada LIMIT 1' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada LIMIT 1, 10' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = \'1\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = 1' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = ?' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid=1' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email = \'1970-01-01\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email = \'test@example.org\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email=\'foo\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE gesperrt = \'1\'' => - array ( - 'result' => - array ( - 5 => NULL, - ), - ), - ), - 'runtimeConfig' => - array ( - 'errorMode' => 'exception', - 'debugMode' => false, - 'stringifyTypes' => false, - ), -); \ No newline at end of file From 4e03ed0aca444eb910b0fc6bb54fea9115d9cb71 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Wed, 18 May 2022 16:55:33 +0200 Subject: [PATCH 3/4] ignore pgsql record files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c03211656..20fac1605 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ composer.lock mysqli.php pdo.php +*cache.pgsql .env From e90aadf8d344172818e4a41313110aa63ad69d36 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Wed, 18 May 2022 16:56:13 +0200 Subject: [PATCH 4/4] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 20fac1605..1c5044c0f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ composer.lock mysqli.php pdo.php -*cache.pgsql +*pgsql.cache .env