diff --git a/CHANGELOG.md b/CHANGELOG.md index fde7f249..0e6c5ecd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Foreign key: Display new field in case of an error - PostgreSQL: Order NULL last - PostgreSQL: Display all SQL command warnings and only once +- PostgreSQL: Export schema in nextval() - Editor: Display tinyint(1) as checkbox (bug #1246, regression from 5.4.2) - Croatian translation diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index 5d2c76ca..827e0c70 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -946,7 +946,7 @@ AND typelem = 0" // fields' definitions foreach ($fields as $field) { $part = idf_escape($field['field']) . ' ' . $field['full_type'] - . default_value($field) + . preg_replace('~(nextval\(\')([^.\']+\')~', '\1' . str_replace("'", "''", $status['nspname']) . '.\2', default_value($field)) . ($field['null'] ? "" : " NOT NULL"); $return_parts[] = $part;