From 3906231dc5421771c02a0498e61fcc7a4375ae16 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 9 Feb 2018 14:43:19 +0100 Subject: [PATCH] Fix exporting sequences in PostgreSQL 10 --- adminer/drivers/pgsql.inc.php | 5 ++++- changes.txt | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index 8b32fbf3..1af095f6 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -711,7 +711,10 @@ AND typelem = 0" // sequences for fields if (preg_match('~nextval\(\'([^\']+)\'\)~', $field['default'], $matches)) { $sequence_name = $matches[1]; - $sq = reset(get_rows("SELECT * FROM $sequence_name")); + $sq = reset(get_rows(min_version(10) + ? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q($sequence_name) + : "SELECT * FROM $sequence_name" + )); $sequences[] = ($style == "DROP+CREATE" ? "DROP SEQUENCE $sequence_name;\n" : "") . "CREATE SEQUENCE $sequence_name INCREMENT $sq[increment_by] MINVALUE $sq[min_value] MAXVALUE $sq[max_value] START " . ($auto_increment ? $sq['last_value'] : 1) . " CACHE $sq[cache_value];"; } diff --git a/changes.txt b/changes.txt index 0b104a64..cfe49f81 100644 --- a/changes.txt +++ b/changes.txt @@ -1,5 +1,6 @@ Adminer 4.6.2-dev: Shorten JSON values in select (bug #594) +PostgreSQL: Fix exporting sequences in PostgreSQL 10 Adminer 4.6.1 (released 2018-02-09): Sticky position of table actions