]> git.joonet.de Git - adminer.git/commitdiff
Fix exporting sequences in PostgreSQL 10
authorJakub Vrana <jakub@vrana.cz>
Fri, 9 Feb 2018 13:43:19 +0000 (14:43 +0100)
committerJakub Vrana <jakub@vrana.cz>
Fri, 9 Feb 2018 13:43:25 +0000 (14:43 +0100)
adminer/drivers/pgsql.inc.php
changes.txt

index 8b32fbf3d763b001af0e7edcafe8ca795415c557..1af095f6870965b15997b01515bfeacf0c54bdb4 100644 (file)
@@ -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];";
                        }
index 0b104a649002479243ba0c84ec2c869feaa82258..cfe49f8101a587861deacf8a0a65f5cd1706b536 100644 (file)
@@ -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