v29-0004-Sequence-access-methods-dump-restore-support.patch
text/plain
Filename: v29-0004-Sequence-access-methods-dump-restore-support.patch
Type: text/plain
Part: 3
From bd90c8fb8dffc912d8bd33f95686de214d231045 Mon Sep 17 00:00:00 2001
From: Michael Paquier <michael@paquier.xyz>
Date: Fri, 26 Dec 2025 11:56:30 +0900
Subject: [PATCH v29 4/7] Sequence access methods - dump/restore support
---
doc/src/sgml/ref/pg_dump.sgml | 17 +++++++
doc/src/sgml/ref/pg_dumpall.sgml | 11 +++++
doc/src/sgml/ref/pg_restore.sgml | 11 +++++
src/bin/pg_dump/pg_backup.h | 2 +
src/bin/pg_dump/pg_backup_archiver.c | 66 ++++++++++++++++++++++++++++
src/bin/pg_dump/pg_backup_archiver.h | 6 ++-
src/bin/pg_dump/pg_dump.c | 47 +++++++++++++++-----
src/bin/pg_dump/pg_dumpall.c | 5 +++
src/bin/pg_dump/pg_restore.c | 4 ++
src/bin/pg_dump/t/002_pg_dump.pl | 51 +++++++++++++++++++++
10 files changed, 209 insertions(+), 11 deletions(-)
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index ae1bc14d2f2..0de2c14bc7b 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1152,6 +1152,23 @@ PostgreSQL documentation
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--no-sequence-access-method</option></term>
+ <listitem>
+ <para>
+ Do not output commands to select sequence access methods.
+ With this option, all objects will be created with whichever
+ sequence access method is the default during restore.
+ </para>
+
+ <para>
+ This option is ignored when emitting an archive (non-text) output
+ file. For the archive formats, you can specify the option when you
+ call <command>pg_restore</command>.
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><option>--no-table-access-method</option></term>
<listitem>
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 51c70198091..ae2741e982f 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -618,6 +618,17 @@ exclude database <replaceable class="parameter">PATTERN</replaceable>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--no-sequence-access-method</option></term>
+ <listitem>
+ <para>
+ Do not output commands to select sequence access methods.
+ With this option, all objects will be created with whichever
+ sequence access method is the default during restore.
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><option>--no-table-access-method</option></term>
<listitem>
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index 5e77ddd556f..d83006d1a5c 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -875,6 +875,17 @@ PostgreSQL documentation
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--no-sequence-access-method</option></term>
+ <listitem>
+ <para>
+ Do not output commands to select sequence access methods.
+ With this option, all objects will be created with whichever
+ sequence access method is the default during restore.
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><option>--no-table-access-method</option></term>
<listitem>
diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
index 28e7ff6fa16..764b0e7a6db 100644
--- a/src/bin/pg_dump/pg_backup.h
+++ b/src/bin/pg_dump/pg_backup.h
@@ -98,6 +98,7 @@ typedef struct _restoreOptions
{
int createDB; /* Issue commands to create the database */
int noOwner; /* Don't try to match original object owner */
+ int noSequenceAm; /* Don't issue sequence-AM-related commands */
int noTableAm; /* Don't issue table-AM-related commands */
int noTablespace; /* Don't issue tablespace-related commands */
int disable_triggers; /* disable triggers during data-only
@@ -193,6 +194,7 @@ typedef struct _dumpOptions
int no_unlogged_table_data;
int serializable_deferrable;
int disable_triggers;
+ int outputNoSequenceAm;
int outputNoTableAm;
int outputNoTablespaces;
int use_setsessauth;
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 2fd773ad84f..0e9eaf1ca3d 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -183,6 +183,7 @@ dumpOptionsFromRestoreOptions(RestoreOptions *ropt)
dopt->outputSuperuser = ropt->superuser;
dopt->outputCreateDB = ropt->createDB;
dopt->outputNoOwner = ropt->noOwner;
+ dopt->outputNoSequenceAm = ropt->noSequenceAm;
dopt->outputNoTableAm = ropt->noTableAm;
dopt->outputNoTablespaces = ropt->noTablespace;
dopt->disable_triggers = ropt->disable_triggers;
@@ -1281,6 +1282,7 @@ ArchiveEntry(Archive *AHX, CatalogId catalogId, DumpId dumpId,
newToc->tag = pg_strdup(opts->tag);
newToc->namespace = opts->namespace ? pg_strdup(opts->namespace) : NULL;
newToc->tablespace = opts->tablespace ? pg_strdup(opts->tablespace) : NULL;
+ newToc->sequenceam = opts->sequenceam ? pg_strdup(opts->sequenceam) : NULL;
newToc->tableam = opts->tableam ? pg_strdup(opts->tableam) : NULL;
newToc->relkind = opts->relkind;
newToc->owner = opts->owner ? pg_strdup(opts->owner) : NULL;
@@ -2442,6 +2444,7 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt,
AH->currUser = NULL; /* unknown */
AH->currSchema = NULL; /* ditto */
+ AH->currSequenceAm = NULL; /* ditto */
AH->currTablespace = NULL; /* ditto */
AH->currTableAm = NULL; /* ditto */
@@ -2709,6 +2712,7 @@ WriteToc(ArchiveHandle *AH)
WriteStr(AH, te->copyStmt);
WriteStr(AH, te->namespace);
WriteStr(AH, te->tablespace);
+ WriteStr(AH, te->sequenceam);
WriteStr(AH, te->tableam);
WriteInt(AH, te->relkind);
WriteStr(AH, te->owner);
@@ -2813,6 +2817,9 @@ ReadToc(ArchiveHandle *AH)
if (AH->version >= K_VERS_1_10)
te->tablespace = ReadStr(AH);
+ if (AH->version >= K_VERS_1_17)
+ te->sequenceam = ReadStr(AH);
+
if (AH->version >= K_VERS_1_14)
te->tableam = ReadStr(AH);
@@ -3580,6 +3587,9 @@ _reconnectToDB(ArchiveHandle *AH, const char *dbname)
free(AH->currSchema);
AH->currSchema = NULL;
+ free(AH->currSequenceAm);
+ AH->currSequenceAm = NULL;
+
free(AH->currTableAm);
AH->currTableAm = NULL;
@@ -3742,6 +3752,57 @@ _selectTablespace(ArchiveHandle *AH, const char *tablespace)
destroyPQExpBuffer(qry);
}
+/*
+ * Set the proper default_sequence_access_method value for the sequence.
+ */
+static void
+_selectSequenceAccessMethod(ArchiveHandle *AH, const char *sequenceam)
+{
+ RestoreOptions *ropt = AH->public.ropt;
+ PQExpBuffer cmd;
+ const char *want,
+ *have;
+
+ /* do nothing in --no-sequence-access-method mode */
+ if (ropt->noSequenceAm)
+ return;
+
+ have = AH->currSequenceAm;
+ want = sequenceam;
+
+ if (!want)
+ return;
+
+ if (have && strcmp(want, have) == 0)
+ return;
+
+ cmd = createPQExpBuffer();
+ appendPQExpBuffer(cmd,
+ "SET default_sequence_access_method = %s;",
+ fmtId(want));
+
+ if (RestoringToDB(AH))
+ {
+ PGresult *res;
+
+ res = PQexec(AH->connection, cmd->data);
+
+ if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
+ warn_or_exit_horribly(AH,
+ "could not set default_sequence_access_method: %s",
+ PQerrorMessage(AH->connection));
+
+ PQclear(res);
+ }
+ else
+ ahprintf(AH, "%s\n\n", cmd->data);
+
+ destroyPQExpBuffer(cmd);
+
+ free(AH->currSequenceAm);
+ AH->currSequenceAm = pg_strdup(want);
+}
+
/*
* Set the proper default_table_access_method value for the table.
*/
@@ -3955,6 +4016,7 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, const char *pfx)
_becomeOwner(AH, te);
_selectOutputSchema(AH, te->namespace);
_selectTablespace(AH, te->tablespace);
+ _selectSequenceAccessMethod(AH, te->sequenceam);
if (te->relkind != RELKIND_PARTITIONED_TABLE)
_selectTableAccessMethod(AH, te->tableam);
@@ -4474,6 +4536,8 @@ restore_toc_entries_prefork(ArchiveHandle *AH, TocEntry *pending_list)
AH->currUser = NULL;
free(AH->currSchema);
AH->currSchema = NULL;
+ free(AH->currSequenceAm);
+ AH->currSequenceAm = NULL;
free(AH->currTablespace);
AH->currTablespace = NULL;
free(AH->currTableAm);
@@ -5213,6 +5277,7 @@ CloneArchive(ArchiveHandle *AH)
clone->connCancel = NULL;
clone->currUser = NULL;
clone->currSchema = NULL;
+ clone->currSequenceAm = NULL;
clone->currTableAm = NULL;
clone->currTablespace = NULL;
@@ -5272,6 +5337,7 @@ DeCloneArchive(ArchiveHandle *AH)
/* Clear any connection-local state */
free(AH->currUser);
free(AH->currSchema);
+ free(AH->currSequenceAm);
free(AH->currTablespace);
free(AH->currTableAm);
free(AH->savedPassword);
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index 1218bf6a6a1..b3bdeba614d 100644
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -71,10 +71,11 @@
#define K_VERS_1_16 MAKE_ARCHIVE_VERSION(1, 16, 0) /* BLOB METADATA entries
* and multiple BLOBS,
* relkind */
+#define K_VERS_1_17 MAKE_ARCHIVE_VERSION(1, 17, 0) /* add sequenceam */
/* Current archive version number (the format we can output) */
#define K_VERS_MAJOR 1
-#define K_VERS_MINOR 16
+#define K_VERS_MINOR 17
#define K_VERS_REV 0
#define K_VERS_SELF MAKE_ARCHIVE_VERSION(K_VERS_MAJOR, K_VERS_MINOR, K_VERS_REV)
@@ -323,6 +324,7 @@ struct _archiveHandle
/* these vars track state to avoid sending redundant SET commands */
char *currUser; /* current username, or NULL if unknown */
char *currSchema; /* current schema, or NULL */
+ char *currSequenceAm; /* current sequence access method, or NULL */
char *currTablespace; /* current tablespace, or NULL */
char *currTableAm; /* current table access method, or NULL */
@@ -358,6 +360,7 @@ struct _tocEntry
char *namespace; /* null or empty string if not in a schema */
char *tablespace; /* null if not in a tablespace; empty string
* means use database default */
+ char *sequenceam; /* table access method, only for SEQUENCE tags */
char *tableam; /* table access method, only for TABLE tags */
char relkind; /* relation kind, only for TABLE tags */
char *owner;
@@ -404,6 +407,7 @@ typedef struct _archiveOpts
const char *tag;
const char *namespace;
const char *tablespace;
+ const char *sequenceam;
const char *tableam;
char relkind;
const char *owner;
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index d56dcc701ce..9c811b14308 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -139,6 +139,7 @@ typedef struct
int64 last_value; /* last value of sequence */
bool is_called; /* whether nextval advances before returning */
bool null_seqtuple; /* did pg_get_sequence_data return nulls? */
+ char *seqam; /* access method of sequence */
} SequenceItem;
typedef enum OidOptions
@@ -501,6 +502,7 @@ main(int argc, char **argv)
{"if-exists", no_argument, &dopt.if_exists, 1},
{"inserts", no_argument, NULL, 9},
{"lock-wait-timeout", required_argument, NULL, 2},
+ {"no-sequence-access-method", no_argument, &dopt.outputNoSequenceAm, 1},
{"no-table-access-method", no_argument, &dopt.outputNoTableAm, 1},
{"no-tablespaces", no_argument, &dopt.outputNoTablespaces, 1},
{"quote-all-identifiers", no_argument, "e_all_identifiers, 1},
@@ -1236,6 +1238,7 @@ main(int argc, char **argv)
ropt->superuser = dopt.outputSuperuser;
ropt->createDB = dopt.outputCreateDB;
ropt->noOwner = dopt.outputNoOwner;
+ ropt->noSequenceAm = dopt.outputNoSequenceAm;
ropt->noTableAm = dopt.outputNoTableAm;
ropt->noTablespace = dopt.outputNoTablespaces;
ropt->disable_triggers = dopt.disable_triggers;
@@ -1358,6 +1361,7 @@ help(const char *progname)
printf(_(" --no-security-labels do not dump security label assignments\n"));
printf(_(" --no-statistics do not dump statistics\n"));
printf(_(" --no-subscriptions do not dump subscriptions\n"));
+ printf(_(" --no-sequence-access-method do not dump sequence table access methods\n"));
printf(_(" --no-table-access-method do not dump table access methods\n"));
printf(_(" --no-tablespaces do not dump tablespace assignments\n"));
printf(_(" --no-toast-compression do not dump TOAST compression methods\n"));
@@ -14596,6 +14600,9 @@ dumpAccessMethod(Archive *fout, const AccessMethodInfo *aminfo)
case AMTYPE_INDEX:
appendPQExpBufferStr(q, "TYPE INDEX ");
break;
+ case AMTYPE_SEQUENCE:
+ appendPQExpBufferStr(q, "TYPE SEQUENCE ");
+ break;
case AMTYPE_TABLE:
appendPQExpBufferStr(q, "TYPE TABLE ");
break;
@@ -19416,26 +19423,40 @@ collectSequences(Archive *fout)
*
* Since version 18, we can gather the sequence data in this query with
* pg_get_sequence_data(), but we only do so for non-schema-only dumps.
+ *
+ * Access methods for sequences are supported since version 18.
*/
if (fout->remoteVersion < 100000)
return;
- else if (fout->remoteVersion < 180000 ||
- (!fout->dopt->dumpData && !fout->dopt->sequence_data))
+ else if (fout->remoteVersion < 180000)
query = "SELECT seqrelid, format_type(seqtypid, NULL), "
"seqstart, seqincrement, "
"seqmax, seqmin, "
"seqcache, seqcycle, "
- "NULL, 'f' "
+ "NULL, 'f', NULL "
"FROM pg_catalog.pg_sequence "
"ORDER BY seqrelid";
+ else if (!fout->dopt->dumpData && !fout->dopt->sequence_data)
+ query = "SELECT s.seqrelid, format_type(s.seqtypid, NULL), "
+ "s.seqstart, s.seqincrement, "
+ "s.seqmax, s.seqmin, "
+ "s.seqcache, s.seqcycle, "
+ "NULL, 'f', a.amname AS seqam "
+ "FROM pg_catalog.pg_sequence s "
+ "JOIN pg_class c ON (c.oid = s.seqrelid) "
+ "JOIN pg_am a ON (a.oid = c.relam) "
+ "ORDER BY seqrelid";
else
- query = "SELECT seqrelid, format_type(seqtypid, NULL), "
- "seqstart, seqincrement, "
- "seqmax, seqmin, "
- "seqcache, seqcycle, "
- "last_value, is_called "
- "FROM pg_catalog.pg_sequence, "
- "pg_get_sequence_data(seqrelid) "
+ query = "SELECT s.seqrelid, format_type(s.seqtypid, NULL), "
+ "s.seqstart, s.seqincrement, "
+ "s.seqmax, s.seqmin, "
+ "s.seqcache, s.seqcycle, "
+ "r.last_value, r.is_called, "
+ "a.amname AS seqam "
+ "FROM pg_catalog.pg_sequence s "
+ "JOIN pg_class c ON (c.oid = s.seqrelid) "
+ "JOIN pg_am a ON (a.oid = c.relam), "
+ "pg_get_sequence_data(s.seqrelid) r "
"ORDER BY seqrelid;";
res = ExecuteSqlQuery(fout, query, PGRES_TUPLES_OK);
@@ -19456,6 +19477,10 @@ collectSequences(Archive *fout)
sequences[i].last_value = strtoi64(PQgetvalue(res, i, 8), NULL, 10);
sequences[i].is_called = (strcmp(PQgetvalue(res, i, 9), "t") == 0);
sequences[i].null_seqtuple = (PQgetisnull(res, i, 8) || PQgetisnull(res, i, 9));
+ if (!PQgetisnull(res, i, 10))
+ sequences[i].seqam = pg_strdup(PQgetvalue(res, i, 10));
+ else
+ sequences[i].seqam = NULL;
}
PQclear(res);
@@ -19527,6 +19552,7 @@ dumpSequence(Archive *fout, const TableInfo *tbinfo)
seq->minv = strtoi64(PQgetvalue(res, 0, 4), NULL, 10);
seq->cache = strtoi64(PQgetvalue(res, 0, 5), NULL, 10);
seq->cycled = (strcmp(PQgetvalue(res, 0, 6), "t") == 0);
+ seq->seqam = NULL;
PQclear(res);
}
@@ -19649,6 +19675,7 @@ dumpSequence(Archive *fout, const TableInfo *tbinfo)
ARCHIVE_OPTS(.tag = tbinfo->dobj.name,
.namespace = tbinfo->dobj.namespace->dobj.name,
.owner = tbinfo->rolname,
+ .sequenceam = seq->seqam,
.description = "SEQUENCE",
.section = SECTION_PRE_DATA,
.createStmt = query->data,
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index c1f43113c53..a3ea0d8d8d4 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -104,6 +104,7 @@ static int disable_dollar_quoting = 0;
static int disable_triggers = 0;
static int if_exists = 0;
static int inserts = 0;
+static int no_sequence_access_method = 0;
static int no_table_access_method = 0;
static int no_tablespaces = 0;
static int use_setsessauth = 0;
@@ -180,6 +181,7 @@ main(int argc, char *argv[])
{"if-exists", no_argument, &if_exists, 1},
{"inserts", no_argument, &inserts, 1},
{"lock-wait-timeout", required_argument, NULL, 2},
+ {"no-sequence-access-method", no_argument, &no_sequence_access_method, 1},
{"no-table-access-method", no_argument, &no_table_access_method, 1},
{"no-tablespaces", no_argument, &no_tablespaces, 1},
{"quote-all-identifiers", no_argument, "e_all_identifiers, 1},
@@ -510,6 +512,8 @@ main(int argc, char *argv[])
appendPQExpBufferStr(pgdumpopts, " --disable-triggers");
if (inserts)
appendPQExpBufferStr(pgdumpopts, " --inserts");
+ if (no_sequence_access_method)
+ appendPQExpBufferStr(pgdumpopts, " --no-sequence-access-method");
if (no_table_access_method)
appendPQExpBufferStr(pgdumpopts, " --no-table-access-method");
if (no_tablespaces)
@@ -911,6 +915,7 @@ help(void)
printf(_(" --no-statistics do not dump statistics\n"));
printf(_(" --no-subscriptions do not dump subscriptions\n"));
printf(_(" --no-sync do not wait for changes to be written safely to disk\n"));
+ printf(_(" --no-sequence-access-method do not dump sequence access methods\n"));
printf(_(" --no-table-access-method do not dump table access methods\n"));
printf(_(" --no-tablespaces do not dump tablespace assignments\n"));
printf(_(" --no-toast-compression do not dump TOAST compression methods\n"));
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 48fdcb0fae1..8c03d643446 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -97,6 +97,7 @@ main(int argc, char **argv)
static int enable_row_security = 0;
static int if_exists = 0;
static int no_data_for_failed_tables = 0;
+ static int outputNoSequenceAm = 0;
static int outputNoTableAm = 0;
static int outputNoTablespaces = 0;
static int use_setsessauth = 0;
@@ -152,6 +153,7 @@ main(int argc, char **argv)
{"enable-row-security", no_argument, &enable_row_security, 1},
{"if-exists", no_argument, &if_exists, 1},
{"no-data-for-failed-tables", no_argument, &no_data_for_failed_tables, 1},
+ {"no-sequence-access-method", no_argument, &outputNoSequenceAm, 1},
{"no-table-access-method", no_argument, &outputNoTableAm, 1},
{"no-tablespaces", no_argument, &outputNoTablespaces, 1},
{"role", required_argument, NULL, 2},
@@ -477,6 +479,7 @@ main(int argc, char **argv)
opts->disable_triggers = disable_triggers;
opts->enable_row_security = enable_row_security;
opts->noDataForFailedTables = no_data_for_failed_tables;
+ opts->noSequenceAm = outputNoSequenceAm;
opts->noTableAm = outputNoTableAm;
opts->noTablespace = outputNoTablespaces;
opts->use_setsessauth = use_setsessauth;
@@ -795,6 +798,7 @@ usage(const char *progname)
printf(_(" --no-security-labels do not restore security labels\n"));
printf(_(" --no-statistics do not restore statistics\n"));
printf(_(" --no-subscriptions do not restore subscriptions\n"));
+ printf(_(" --no-sequence-access-method do not restore sequence access methods\n"));
printf(_(" --no-table-access-method do not restore table access methods\n"));
printf(_(" --no-tablespaces do not restore tablespace assignments\n"));
printf(_(" --restrict-key=RESTRICT_KEY use provided string as psql \\restrict key\n"));
diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
index 3ee9fda50e4..b7ab584604c 100644
--- a/src/bin/pg_dump/t/002_pg_dump.pl
+++ b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -412,6 +412,15 @@ my %pgdump_runs = (
'postgres',
],
},
+ no_sequence_access_method => {
+ dump_cmd => [
+ 'pg_dump', '--no-sync',
+ "--file=$tempdir/no_sequence_access_method.sql",
+ '--no-sequence-access-method',
+ '--statistics',
+ 'postgres',
+ ],
+ },
no_subscriptions => {
dump_cmd => [
'pg_dump', '--no-sync',
@@ -657,6 +666,7 @@ my %full_runs = (
no_policies_restore => 1,
no_privs => 1,
no_statistics => 1,
+ no_sequence_access_method => 1,
no_subscriptions => 1,
no_subscriptions_restore => 1,
no_table_access_method => 1,
@@ -4758,6 +4768,18 @@ my %tests = (
},
},
+ 'CREATE ACCESS METHOD regress_test_sequence_am' => {
+ create_order => 11,
+ create_sql =>
+ 'CREATE ACCESS METHOD regress_sequence_am TYPE SEQUENCE HANDLER seq_local_sequenceam_handler;',
+ regexp => qr/^
+ \QCREATE ACCESS METHOD regress_sequence_am TYPE SEQUENCE HANDLER seq_local_sequenceam_handler;\E
+ \n/xm,
+ like => {
+ %full_runs, section_pre_data => 1,
+ },
+ },
+
# It's a bit tricky to ensure that the proper SET of default table
# AM occurs. To achieve that we create a table with the standard
# AM, test AM, standard AM. That guarantees that there needs to be
@@ -4786,6 +4808,35 @@ my %tests = (
},
},
+
+ # This uses the same trick as for materialized views and tables,
+ # but this time with a sequence access method, checking that a
+ # correct set of SET queries are created.
+ 'CREATE SEQUENCE regress_pg_dump_seq_am' => {
+ create_order => 12,
+ create_sql => '
+ CREATE SEQUENCE dump_test.regress_pg_dump_seq_am_0 USING seqlocal;
+ CREATE SEQUENCE dump_test.regress_pg_dump_seq_am_1 USING regress_sequence_am;
+ CREATE SEQUENCE dump_test.regress_pg_dump_seq_am_2 USING seqlocal;',
+ regexp => qr/^
+ \QSET default_sequence_access_method = regress_sequence_am;\E
+ (\n(?!SET[^;]+;)[^\n]*)*
+ \n\QCREATE SEQUENCE dump_test.regress_pg_dump_seq_am_1\E
+ \n\s+\QSTART WITH 1\E
+ \n\s+\QINCREMENT BY 1\E
+ \n\s+\QNO MINVALUE\E
+ \n\s+\QNO MAXVALUE\E
+ \n\s+\QCACHE 1;\E\n/xm,
+ like => {
+ %full_runs, %dump_test_schema_runs, section_pre_data => 1,
+ },
+ unlike => {
+ exclude_dump_test_schema => 1,
+ no_sequence_access_method => 1,
+ only_dump_measurement => 1,
+ },
+ },
+
'CREATE MATERIALIZED VIEW regress_pg_dump_matview_am' => {
create_order => 13,
create_sql => '
--
2.54.0