makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2021-05-15 22:31:20 +02:00
commit fa7376303a
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/phpbb/db/extractor/postgres_extractor.php
View file

@ -208,7 +208,7 @@ class postgres_extractor extends base_extractor
} }
// Generate constraint clauses for CHECK constraints // Generate constraint clauses for CHECK constraints
$sql_checks = "SELECT pc.conname AS index_name, pg_get_constraintdef(pc.oid) $sql_checks = "SELECT pc.conname AS index_name, pg_get_expr(pc.conbin, pc.conrelid) AS constraint_expr
FROM pg_constraint pc, pg_class bc FROM pg_constraint pc, pg_class bc
WHERE pc.conrelid = bc.oid WHERE pc.conrelid = bc.oid
AND bc.relname = '" . $this->db->sql_escape($table_name) . "' AND bc.relname = '" . $this->db->sql_escape($table_name) . "'
@ -225,9 +225,9 @@ class postgres_extractor extends base_extractor
// Add the constraints to the sql file. // Add the constraints to the sql file.
while ($row = $this->db->sql_fetchrow($result)) while ($row = $this->db->sql_fetchrow($result))
{ {
if (!is_null($row['consrc'])) if (!empty($row['constraint_expr']))
{ {
$lines[] = ' CONSTRAINT ' . $row['index_name'] . ' CHECK ' . $row['consrc']; $lines[] = ' CONSTRAINT ' . $row['index_name'] . ' CHECK ' . $row['constraint_expr'];
} }
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);