Merge pull request #6493 from rxu/ticket/17148

[ticket/17148] Fix sql_table_exists() error for PostgreSQL 9.3 and earlier - 3.3.x
phpbb · Jun 26, 2023 · 5ee2efd · 5ee2efd
2 parents 0fdc765 + 8c33a21
commit 5ee2efd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -233,6 +233,8 @@ jobs:
         strategy:
             matrix:
                 include:
+                    - php: '7.1'
+                      db: "postgres:9.3"
                     - php: '7.1'
                       db: "postgres:9.5"
                     - php: '7.1'
@@ -264,7 +266,7 @@ jobs:
 
         services:
             postgres:
-                image: ${{ matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && 'postgres:10' || matrix.db }}
+                image: ${{ matrix.db != 'postgres:9.3' && matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && 'postgres:10' || matrix.db }}
                 env:
                     POSTGRES_HOST: localhost
                     POSTGRES_USER: postgres

diff --git a/phpBB/phpbb/db/tools/postgres.php b/phpBB/phpbb/db/tools/postgres.php
@@ -102,7 +102,7 @@ function sql_list_tables()
 	function sql_table_exists($table_name)
 	{
 		$sql = "SELECT CAST(EXISTS(
-			SELECT FROM information_schema.tables
+			SELECT * FROM information_schema.tables
 				WHERE table_schema = 'public'
 					AND table_name   = '" . $this->db->sql_escape($table_name) . "'
 			) AS INTEGER)";