Skip to content

P
Postgres FD Implementation
Commit 5f65225f authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Todo items: 

Add ALTER SEQUENCE to modify min/max/increment/cache/cycle values

Also updated create sequence docs to mention NO MINVALUE, & NO MAXVALUE.

New Files:
doc/src/sgml/ref/alter_sequence.sgml
src/test/regress/expected/sequence.out
src/test/regress/sql/sequence.sql


ALTER SEQUENCE is NOT transactional.  It behaves similarly to setval().
It matches the proposed SQL200N spec, as well as Oracle in most ways --
Oracle lacks RESTART WITH for some strange reason.

--
Rod Taylor <rbt@rbt.ca>
parent 46bce088
Hide whitespace changes
Inline Side-by-side
Showing with 631 additions and 125 deletions
doc/src/sgml/ref/allfiles.sgml
View file @ 5f65225f
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.52 2002/12/06 04:40:36 momjian Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.53 2003/03/20 07:02:07 momjian Exp $
PostgreSQL documentation PostgreSQL documentation
Complete list of usable sgml source files in this directory. Complete list of usable sgml source files in this directory.
--> -->
...@@ -40,6 +40,7 @@ Complete list of usable sgml source files in this directory. ...@@ -40,6 +40,7 @@ Complete list of usable sgml source files in this directory.
<!entity alterDatabase system "alter_database.sgml"> <!entity alterDatabase system "alter_database.sgml">
<!entity alterDomain system "alter_domain.sgml"> <!entity alterDomain system "alter_domain.sgml">
<!entity alterGroup system "alter_group.sgml"> <!entity alterGroup system "alter_group.sgml">
<!entity alterSequence system "alter_sequence.sgml">
<!entity alterTable system "alter_table.sgml"> <!entity alterTable system "alter_table.sgml">
<!entity alterTrigger system "alter_trigger.sgml"> <!entity alterTrigger system "alter_trigger.sgml">
<!entity alterUser system "alter_user.sgml"> <!entity alterUser system "alter_user.sgml">
......
doc/src/sgml/ref/alter_sequence.sgml 0 → 100644
View file @ 5f65225f
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.1 2003/03/20 07:02:07 momjian Exp $
PostgreSQL documentation
-->
<refentry id="SQL-ALTERSEQUENCE">
<refmeta>
<refentrytitle id="SQL-ALTERSEQUENCE-TITLE">ALTER SEQUENCE</refentrytitle>
<refmiscinfo>SQL - Language Statements</refmiscinfo>
</refmeta>
<refnamediv>
<refname>
ALTER SEQUENCE
</refname>
<refpurpose>
alter the definition of a sequence generator
</refpurpose>
</refnamediv>
<refsynopsisdiv>
<refsynopsisdivinfo>
<date>1999-07-20</date>
</refsynopsisdivinfo>
<synopsis>
ALTER SEQUENCE <replaceable class="parameter">seqname</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ]
[ MINVALUE <replaceable class="parameter">minvalue</replaceable> | NO MINVALUE ] [ MAXVALUE <replaceable class="parameter">maxvalue</replaceable> | NO MAXVALUE ]
[ RESTART [ WITH ] <replaceable class="parameter">start</replaceable> ] [ CACHE <replaceable class="parameter">cache</replaceable> ] [ [ NO ] CYCLE ]
</synopsis>
<refsect2 id="R2-SQL-ALTERSEQUENCE-1">
<refsect2info>
<date>1998-09-11</date>
</refsect2info>
<title>
Inputs
</title>
<para>
<variablelist>
<varlistentry>
<term><replaceable class="parameter">seqname</replaceable></term>
<listitem>
<para>
The name (optionally schema-qualified) of a sequence to be altered.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><replaceable class="parameter">increment</replaceable></term>
<listitem>
<para>
The
<option>INCREMENT BY <replaceable class="parameter">increment</replaceable></option>
clause is optional. A positive value will make an
ascending sequence, a negative one a descending sequence.
If unspecified, the old increment value will be maintained.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><replaceable class="parameter">minvalue</replaceable></term>
<term>NO MINVALUE</term>
<listitem>
<para>
The optional clause <option>MINVALUE
<replaceable class="parameter">minvalue</replaceable></option>
determines the minimum value
a sequence can generate. If <option>NO MINVALUE</option> is specified,
the defaults of 1 and -2^63-1 for ascending and descending sequences, respectively, will be used. If neither option is specified, the current minimum
value will be maintained.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><replaceable class="parameter">maxvalue</replaceable></term>
<term>NO MAXVALUE</term>
<listitem>
<para>
The optional clause <option>MAXVALUE
<replaceable class="parameter">maxvalue</replaceable></option>
determines the maximum value for the sequence. If
<option>NO MAXVALUE</option> is specified, the defaults are 2^63-1 and -1 for
ascending and descending sequences, respectively, will be used. If
neither option is specified, the current maximum value will be
maintained.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><replaceable class="parameter">start</replaceable></term>
<listitem>
<para>
The optional <option>RESTART WITH
<replaceable class="parameter">start</replaceable>
clause</option> enables the sequence to re-begin anywhere.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><replaceable class="parameter">cache</replaceable></term>
<listitem>
<para>
The <option>CACHE <replaceable class="parameter">cache</replaceable></option> option
enables sequence numbers to be preallocated
and stored in memory for faster access. The minimum
value is 1 (only one value can be generated at a time, i.e., no cache).
If unspecified, the old cache value will be maintained.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>CYCLE</term>
<listitem>
<para>
The optional <option>CYCLE</option> keyword may be used to enable
the sequence to wrap around when the
<replaceable class="parameter">maxvalue</replaceable> or
<replaceable class="parameter">minvalue</replaceable> has been
reached by
an ascending or descending sequence respectively. If the limit is
reached, the next number generated will be the
<replaceable class="parameter">minvalue</replaceable> or
<replaceable class="parameter">maxvalue</replaceable>,
respectively.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>NO CYCLE</term>
<listitem>
<para>
If the optional <option>NO CYCLE</option> keyword is specified, any
calls to <function>nextval</function> after the sequence has reached
its maximum value will return an error. If neither
<option>CYCLE</option> or <option>NO CYCLE</option> are specified,
the old cycle behaviour will be maintained.
</para>
</listitem>
</varlistentry>
</variablelist>
</para>
</refsect2>
<refsect2 id="R2-SQL-ALTERSEQUENCE-2">
<refsect2info>
<date>1998-09-11</date>
</refsect2info>
<title>
Outputs
</title>
<para>
<variablelist>
<varlistentry>
<term><computeroutput>
ALTER SEQUENCE
</computeroutput></term>
<listitem>
<para>
Message returned if the command is successful.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>
ERROR: AlterSequence: MINVALUE (<replaceable class="parameter">start</replaceable>) can't be >= MAXVALUE (<replaceable class="parameter">max</replaceable>)
</computeroutput></term>
<listitem>
<para>
If the specified starting value is out of range.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>
ERROR: AlterSequence: START value (<replaceable class="parameter">start</replaceable>) can't be < MINVALUE (<replaceable class="parameter">min</replaceable>)
</computeroutput></term>
<listitem>
<para>
If the specified starting value is out of range.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>
ERROR: AlterSequence: MINVALUE (<replaceable class="parameter">min</replaceable>) can't be >= MAXVALUE (<replaceable class="parameter">max</replaceable>)
</computeroutput></term>
<listitem>
<para>
If the minimum and maximum values are inconsistent.
</para>
</listitem>
</varlistentry>
</variablelist>
</para>
</refsect2>
</refsynopsisdiv>
<refsect1 id="R1-SQL-ALTERSEQUENCE-1">
<title>
Description
</title>
<para>
See <xref linkend="SQL-CREATESEQUENCE"> for limitations, and uses
of sequences.
</para>
</refsect1>
<refsect1 id="R1-SQL-ALTERSEQUENCE-2">
<title>
Usage
</title>
<para>
Restart a sequence called <literal>serial</literal>, at 105:
</para>
<programlisting>
ALTER SEQUENCE serial RESTART WITH 105;
</programlisting>
</refsect1>
<refsect1 id="R1-SQL-ALTERSEQUENCE-5">
<title>
Notes
</title>
<para>
To avoid blocking of concurrent transactions that obtain numbers from the same
sequence, a nextval operation is never rolled back; that is, once a value has
been fetched it is considered used, even if the transaction that did the nextval
later aborts. This means that aborted transactions may leave unused "holes" in
the sequence of assigned values. setval operations are never rolled back, either.
</para>
</refsect1>
<refsect1 id="R1-SQL-ALTERSEQUENCE-3">
<title>
Compatibility
</title>
<refsect2 id="R2-SQL-ALTERSEQUENCE-4">
<refsect2info>
<date>2003-03-02</date>
</refsect2info>
<title>
SQL99
</title>
<para>
<command>ALTER SEQUENCE</command> is a <productname>PostgreSQL</productname>
language extension.
There is no <command>ALTER SEQUENCE</command> statement
in <acronym>SQL99</acronym>.
</para>
</refsect2>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
sgml-omittag:nil
sgml-shorttag:t
sgml-minimize-attributes:nil
sgml-always-quote-attributes:t
sgml-indent-step:1
sgml-indent-data:t
sgml-parent-document:nil
sgml-default-dtd-file:"../reference.ced"
sgml-exposed-tags:nil
sgml-local-catalogs:"/usr/lib/sgml/catalog"
sgml-local-ecat-files:nil
End:
-->
doc/src/sgml/ref/create_sequence.sgml
View file @ 5f65225f
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.30 2003/01/19 00:13:29 momjian Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.31 2003/03/20 07:02:07 momjian Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
...@@ -22,7 +22,7 @@ PostgreSQL documentation ...@@ -22,7 +22,7 @@ PostgreSQL documentation
</refsynopsisdivinfo> </refsynopsisdivinfo>
<synopsis> <synopsis>
CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ] CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ]
[ MINVALUE <replaceable class="parameter">minvalue</replaceable> ] [ MAXVALUE <replaceable class="parameter">maxvalue</replaceable> ] [ MINVALUE <replaceable class="parameter">minvalue</replaceable> | NO MINVALUE ] [ MAXVALUE <replaceable class="parameter">maxvalue</replaceable> | NO MAXVALUE ]
[ START [ WITH ] <replaceable class="parameter">start</replaceable> ] [ CACHE <replaceable class="parameter">cache</replaceable> ] [ [ NO ] CYCLE ] [ START [ WITH ] <replaceable class="parameter">start</replaceable> ] [ CACHE <replaceable class="parameter">cache</replaceable> ] [ [ NO ] CYCLE ]
</synopsis> </synopsis>
...@@ -63,7 +63,7 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep ...@@ -63,7 +63,7 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep
<listitem> <listitem>
<para> <para>
The The
<option>INCREMENT <replaceable class="parameter">increment</replaceable></option> <option>INCREMENT BY <replaceable class="parameter">increment</replaceable></option>
clause is optional. A positive value will make an clause is optional. A positive value will make an
ascending sequence, a negative one a descending sequence. ascending sequence, a negative one a descending sequence.
The default value is one (1). The default value is one (1).
...@@ -73,12 +73,14 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep ...@@ -73,12 +73,14 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep
<varlistentry> <varlistentry>
<term><replaceable class="parameter">minvalue</replaceable></term> <term><replaceable class="parameter">minvalue</replaceable></term>
<term>NO MINVALUE</term>
<listitem> <listitem>
<para> <para>
The optional clause <option>MINVALUE The optional clause <option>MINVALUE
<replaceable class="parameter">minvalue</replaceable></option> <replaceable class="parameter">minvalue</replaceable></option>
determines the minimum value determines the minimum value
a sequence can generate. The defaults are 1 and -2^63-1 for a sequence can generate. If this clause is not supplied or <option>NO MINVALUE</option>
is specified, then defaults will be used. The defaults are 1 and -2^63-1 for
ascending and descending sequences, respectively. ascending and descending sequences, respectively.
</para> </para>
</listitem> </listitem>
...@@ -86,13 +88,15 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep ...@@ -86,13 +88,15 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep
<varlistentry> <varlistentry>
<term><replaceable class="parameter">maxvalue</replaceable></term> <term><replaceable class="parameter">maxvalue</replaceable></term>
<term>NO MAXVALUE</term>
<listitem> <listitem>
<para> <para>
The optional clause <option>MAXVALUE The optional clause <option>MAXVALUE
<replaceable class="parameter">maxvalue</replaceable></option> <replaceable class="parameter">maxvalue</replaceable></option>
determines the maximum determines the maximum
value for the sequence. The defaults are 2^63-1 and -1 for value for the sequence. If this clause is not supplied or
ascending and descending sequences, respectively. <option>NO MAXVALUE</option> is specified, then default values will be used.
The defaults are 2^63-1 and -1 for ascending and descending sequences, respectively.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
...@@ -101,7 +105,7 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep ...@@ -101,7 +105,7 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep
<term><replaceable class="parameter">start</replaceable></term> <term><replaceable class="parameter">start</replaceable></term>
<listitem> <listitem>
<para> <para>
The optional <option>START The optional <option>START WITH
<replaceable class="parameter">start</replaceable> <replaceable class="parameter">start</replaceable>
clause</option> enables the sequence to begin anywhere. clause</option> enables the sequence to begin anywhere.
The default starting value is The default starting value is
......
doc/src/sgml/reference.sgml
View file @ 5f65225f
<!-- reference.sgml <!-- reference.sgml
$Header: /cvsroot/pgsql/doc/src/sgml/reference.sgml,v 1.41 2002/12/06 05:00:10 momjian Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/reference.sgml,v 1.42 2003/03/20 07:02:07 momjian Exp $
PostgreSQL Reference Manual PostgreSQL Reference Manual
--> -->
...@@ -49,6 +49,7 @@ PostgreSQL Reference Manual ...@@ -49,6 +49,7 @@ PostgreSQL Reference Manual
&alterDatabase; &alterDatabase;
&alterDomain; &alterDomain;
&alterGroup; &alterGroup;
&alterSequence;
&alterTable; &alterTable;
&alterTrigger; &alterTrigger;
&alterUser; &alterUser;
......
src/backend/commands/sequence.c
View file @ 5f65225f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.93 2003/03/20 05:18:14 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.94 2003/03/20 07:02:07 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -71,7 +71,7 @@ static void init_sequence(const char *caller, RangeVar *relation, ...@@ -71,7 +71,7 @@ static void init_sequence(const char *caller, RangeVar *relation,
SeqTable *p_elm, Relation *p_rel); SeqTable *p_elm, Relation *p_rel);
static Form_pg_sequence read_info(const char *caller, SeqTable elm, static Form_pg_sequence read_info(const char *caller, SeqTable elm,
Relation rel, Buffer *buf); Relation rel, Buffer *buf);
static void init_params(CreateSeqStmt *seq, Form_pg_sequence new); static void init_params(char *caller, List *options, Form_pg_sequence new);
static void do_setval(RangeVar *sequence, int64 next, bool iscalled); static void do_setval(RangeVar *sequence, int64 next, bool iscalled);
/* /*
...@@ -95,8 +95,16 @@ DefineSequence(CreateSeqStmt *seq) ...@@ -95,8 +95,16 @@ DefineSequence(CreateSeqStmt *seq)
int i; int i;
NameData name; NameData name;
/* Values are NULL (or false) by default */
new.last_value = NULL;
new.increment_by = NULL;
new.max_value = NULL;
new.min_value = NULL;
new.cache_value = NULL;
new.is_cycled = false;
/* Check and set values */ /* Check and set values */
init_params(seq, &new); init_params("DefineSequence", seq->options, &new);
/* /*
* Create relation (and fill *null & *value) * Create relation (and fill *null & *value)
...@@ -289,6 +297,90 @@ DefineSequence(CreateSeqStmt *seq) ...@@ -289,6 +297,90 @@ DefineSequence(CreateSeqStmt *seq)
heap_close(rel, NoLock); heap_close(rel, NoLock);
} }
/*
* AlterSequence
*
* Modify the defition of a sequence relation
*/
void
AlterSequence(AlterSeqStmt *stmt)
{
SeqTable elm;
Relation seqrel;
Buffer buf;
Page page;
Form_pg_sequence seq;
FormData_pg_sequence new;
/* open and AccessShareLock sequence */
init_sequence("setval", stmt->sequence, &elm, &seqrel);
/* Allow DROP to sequence owner only*/
if (!pg_class_ownercheck(elm->relid, GetUserId()))
aclcheck_error(ACLCHECK_NOT_OWNER, stmt->sequence->relname);
/* lock page' buffer and read tuple into new sequence structure */
seq = read_info("nextval", elm, seqrel, &buf);
page = BufferGetPage(buf);
new.increment_by = seq->increment_by;
new.max_value = seq->max_value;
new.min_value = seq->min_value;
new.cache_value = seq->cache_value;
new.is_cycled = seq->is_cycled;
new.last_value = seq->last_value;
/* Check and set values */
init_params("AlterSequence", stmt->options, &new);
seq->increment_by = new.increment_by;
seq->max_value = new.max_value;
seq->min_value = new.min_value;
seq->cache_value = new.cache_value;
seq->is_cycled = new.is_cycled;
if (seq->last_value != new.last_value)
{
seq->last_value = new.last_value;
seq->is_called = false;
seq->log_cnt = 1;
}
START_CRIT_SECTION();
/* XLOG stuff */
if (!seqrel->rd_istemp)
{
xl_seq_rec xlrec;
XLogRecPtr recptr;
XLogRecData rdata[2];
xlrec.node = seqrel->rd_node;
rdata[0].buffer = InvalidBuffer;
rdata[0].data = (char *) &xlrec;
rdata[0].len = sizeof(xl_seq_rec);
rdata[0].next = &(rdata[1]);
rdata[1].buffer = InvalidBuffer;
rdata[1].data = (char *) page + ((PageHeader) page)->pd_upper;
rdata[1].len = ((PageHeader) page)->pd_special -
((PageHeader) page)->pd_upper;
rdata[1].next = NULL;
recptr = XLogInsert(RM_SEQ_ID, XLOG_SEQ_LOG | XLOG_NO_TRAN, rdata);
PageSetLSN(page, recptr);
PageSetSUI(page, ThisStartUpID);
}
END_CRIT_SECTION();
LockBuffer(buf, BUFFER_LOCK_UNLOCK);
WriteBuffer(buf);
relation_close(seqrel, NoLock);
}
Datum Datum
nextval(PG_FUNCTION_ARGS) nextval(PG_FUNCTION_ARGS)
...@@ -761,7 +853,7 @@ read_info(const char *caller, SeqTable elm, ...@@ -761,7 +853,7 @@ read_info(const char *caller, SeqTable elm,
static void static void
init_params(CreateSeqStmt *seq, Form_pg_sequence new) init_params(char *caller, List *options, Form_pg_sequence new)
{ {
DefElem *last_value = NULL; DefElem *last_value = NULL;
DefElem *increment_by = NULL; DefElem *increment_by = NULL;
...@@ -771,76 +863,92 @@ init_params(CreateSeqStmt *seq, Form_pg_sequence new) ...@@ -771,76 +863,92 @@ init_params(CreateSeqStmt *seq, Form_pg_sequence new)
bool is_cycled_set = false; bool is_cycled_set = false;
List *option; List *option;
new->is_cycled = false; foreach(option, options)
foreach(option, seq->options)
{ {
DefElem *defel = (DefElem *) lfirst(option); DefElem *defel = (DefElem *) lfirst(option);
if (strcmp(defel->defname, "increment") == 0) if (strcmp(defel->defname, "increment") == 0)
{ {
if (increment_by) if (increment_by)
elog(ERROR, "DefineSequence: INCREMENT BY defined twice"); elog(ERROR, "%s: INCREMENT BY defined twice", caller);
increment_by = defel; increment_by = defel;
} }
else if (strcmp(defel->defname, "start") == 0) /*
* start is for a new sequence
* restart is for alter
*/
else if ((new->last_value == NULL && strcmp(defel->defname, "start") == 0)
|| (new->last_value != NULL && strcmp(defel->defname, "restart") == 0))
{ {
if (last_value) if (last_value)
elog(ERROR, "DefineSequence: LAST VALUE defined twice"); elog(ERROR, "%s: LAST VALUE defined twice", caller);
last_value = defel; last_value = defel;
} }
else if (strcmp(defel->defname, "maxvalue") == 0) else if (strcmp(defel->defname, "maxvalue") == 0)
{ {
if (max_value) if (max_value)
elog(ERROR, "DefineSequence: MAX VALUE defined twice"); elog(ERROR, "%s: MAX VALUE defined twice", caller);
max_value = defel; max_value = defel;
} }
else if (strcmp(defel->defname, "minvalue") == 0) else if (strcmp(defel->defname, "minvalue") == 0)
{ {
if (min_value) if (min_value)
elog(ERROR, "DefineSequence: MIN VALUE defined twice"); elog(ERROR, "%s: MIN VALUE defined twice", caller);
min_value = defel; min_value = defel;
} }
else if (strcmp(defel->defname, "cache") == 0) else if (strcmp(defel->defname, "cache") == 0)
{ {
if (cache_value) if (cache_value)
elog(ERROR, "DefineSequence: CACHE defined twice"); elog(ERROR, "%s: CACHE defined twice", caller);
cache_value = defel; cache_value = defel;
} }
else if (strcmp(defel->defname, "cycle") == 0) else if (strcmp(defel->defname, "cycle") == 0)
{ {
if (is_cycled_set) if (is_cycled_set)
elog(ERROR, "DefineSequence: CYCLE defined twice"); elog(ERROR, "%s: CYCLE defined twice", caller);
is_cycled_set = true; is_cycled_set = true;
new->is_cycled = (defel->arg != NULL); new->is_cycled = (defel->arg != NULL);
} }
else else
elog(ERROR, "DefineSequence: option \"%s\" not recognized", elog(ERROR, "%s: option \"%s\" not recognized", caller,
defel->defname); defel->defname);
} }
if (increment_by == (DefElem *) NULL) /* INCREMENT BY */ /* INCREMENT BY */
if (new->increment_by == NULL && increment_by == (DefElem *) NULL)
new->increment_by = 1; new->increment_by = 1;
else if ((new->increment_by = defGetInt64(increment_by)) == 0) else if (increment_by != (DefElem *) NULL)
elog(ERROR, "DefineSequence: can't INCREMENT by 0"); {
if (defGetInt64(increment_by) == 0)
elog(ERROR, "%s: can't INCREMENT by 0", caller);
new->increment_by = defGetInt64(increment_by);
}
if (max_value == (DefElem *) NULL || !max_value->arg) /* MAXVALUE */ /* MAXVALUE */
if ((new->max_value == NULL && max_value == (DefElem *) NULL)
|| (max_value != (DefElem *) NULL && !max_value->arg))
{ {
if (new->increment_by > 0) if (new->increment_by > 0)
new->max_value = SEQ_MAXVALUE; /* ascending seq */ new->max_value = SEQ_MAXVALUE; /* ascending seq */
else else
new->max_value = -1; /* descending seq */ new->max_value = -1; /* descending seq */
} }
else else if (max_value != (DefElem *) NULL)
new->max_value = defGetInt64(max_value); new->max_value = defGetInt64(max_value);
if (min_value == (DefElem *) NULL || !min_value->arg) /* MINVALUE */ /* MINVALUE */
if ((new->min_value == NULL && min_value == (DefElem *) NULL)
|| (min_value != (DefElem *) NULL && !min_value->arg))
{ {
if (new->increment_by > 0) if (new->increment_by > 0)
new->min_value = 1; /* ascending seq */ new->min_value = 1; /* ascending seq */
else else
new->min_value = SEQ_MINVALUE; /* descending seq */ new->min_value = SEQ_MINVALUE; /* descending seq */
} }
else else if (min_value != (DefElem *) NULL)
new->min_value = defGetInt64(min_value); new->min_value = defGetInt64(min_value);
if (new->min_value >= new->max_value) if (new->min_value >= new->max_value)
...@@ -850,18 +958,19 @@ init_params(CreateSeqStmt *seq, Form_pg_sequence new) ...@@ -850,18 +958,19 @@ init_params(CreateSeqStmt *seq, Form_pg_sequence new)
snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->min_value); snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->min_value);
snprintf(bufx, sizeof(bufx), INT64_FORMAT, new->max_value); snprintf(bufx, sizeof(bufx), INT64_FORMAT, new->max_value);
elog(ERROR, "DefineSequence: MINVALUE (%s) must be less than MAXVALUE (%s)", elog(ERROR, "%s: MINVALUE (%s) must be less than MAXVALUE (%s)",
bufm, bufx); caller, bufm, bufx);
} }
if (last_value == (DefElem *) NULL) /* START WITH */ /* START WITH */
if (new->last_value == NULL && last_value == (DefElem *) NULL)
{ {
if (new->increment_by > 0) if (new->increment_by > 0)
new->last_value = new->min_value; /* ascending seq */ new->last_value = new->min_value; /* ascending seq */
else else
new->last_value = new->max_value; /* descending seq */ new->last_value = new->max_value; /* descending seq */
} }
else else if (last_value != (DefElem *) NULL)
new->last_value = defGetInt64(last_value); new->last_value = defGetInt64(last_value);
if (new->last_value < new->min_value) if (new->last_value < new->min_value)
...@@ -871,8 +980,8 @@ init_params(CreateSeqStmt *seq, Form_pg_sequence new) ...@@ -871,8 +980,8 @@ init_params(CreateSeqStmt *seq, Form_pg_sequence new)
snprintf(bufs, sizeof(bufs), INT64_FORMAT, new->last_value); snprintf(bufs, sizeof(bufs), INT64_FORMAT, new->last_value);
snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->min_value); snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->min_value);
elog(ERROR, "DefineSequence: START value (%s) can't be less than MINVALUE (%s)", elog(ERROR, "%s: START value (%s) can't be less than MINVALUE (%s)",
bufs, bufm); caller, bufs, bufm);
} }
if (new->last_value > new->max_value) if (new->last_value > new->max_value)
{ {
...@@ -881,21 +990,21 @@ init_params(CreateSeqStmt *seq, Form_pg_sequence new) ...@@ -881,21 +990,21 @@ init_params(CreateSeqStmt *seq, Form_pg_sequence new)
snprintf(bufs, sizeof(bufs), INT64_FORMAT, new->last_value); snprintf(bufs, sizeof(bufs), INT64_FORMAT, new->last_value);
snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->max_value); snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->max_value);
elog(ERROR, "DefineSequence: START value (%s) can't be greater than MAXVALUE (%s)", elog(ERROR, "%s: START value (%s) can't be greater than MAXVALUE (%s)",
bufs, bufm); caller, bufs, bufm);
} }
if (cache_value == (DefElem *) NULL) /* CACHE */ /* CACHE */
if (cache_value == (DefElem *) NULL)
new->cache_value = 1; new->cache_value = 1;
else if ((new->cache_value = defGetInt64(cache_value)) <= 0) else if ((new->cache_value = defGetInt64(cache_value)) <= 0)
{ {
char buf[100]; char buf[100];
snprintf(buf, sizeof(buf), INT64_FORMAT, new->cache_value); snprintf(buf, sizeof(buf), INT64_FORMAT, new->cache_value);
elog(ERROR, "DefineSequence: CACHE (%s) can't be <= 0", elog(ERROR, "%s: CACHE (%s) can't be <= 0",
buf); caller, buf);
} }
} }
......
src/backend/nodes/copyfuncs.c
View file @ 5f65225f
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.246 2003/03/10 03:53:49 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.247 2003/03/20 07:02:08 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -2064,6 +2064,17 @@ _copyCreateSeqStmt(CreateSeqStmt *from) ...@@ -2064,6 +2064,17 @@ _copyCreateSeqStmt(CreateSeqStmt *from)
return newnode; return newnode;
} }
static AlterSeqStmt *
_copyAlterSeqStmt(AlterSeqStmt *from)
{
AlterSeqStmt *newnode = makeNode(AlterSeqStmt);
COPY_NODE_FIELD(sequence);
COPY_NODE_FIELD(options);
return newnode;
}
static VariableSetStmt * static VariableSetStmt *
_copyVariableSetStmt(VariableSetStmt *from) _copyVariableSetStmt(VariableSetStmt *from)
{ {
...@@ -2741,6 +2752,9 @@ copyObject(void *from) ...@@ -2741,6 +2752,9 @@ copyObject(void *from)
case T_CreateSeqStmt: case T_CreateSeqStmt:
retval = _copyCreateSeqStmt(from); retval = _copyCreateSeqStmt(from);
break; break;
case T_AlterSeqStmt:
retval = _copyAlterSeqStmt(from);
break;
case T_VariableSetStmt: case T_VariableSetStmt:
retval = _copyVariableSetStmt(from); retval = _copyVariableSetStmt(from);
break; break;
......
src/backend/nodes/equalfuncs.c
View file @ 5f65225f
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.189 2003/03/10 03:53:49 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.190 2003/03/20 07:02:08 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1066,6 +1066,15 @@ _equalCreateSeqStmt(CreateSeqStmt *a, CreateSeqStmt *b) ...@@ -1066,6 +1066,15 @@ _equalCreateSeqStmt(CreateSeqStmt *a, CreateSeqStmt *b)
return true; return true;
} }
static bool
_equalAlterSeqStmt(AlterSeqStmt *a, AlterSeqStmt *b)
{
COMPARE_NODE_FIELD(sequence);
COMPARE_NODE_FIELD(options);
return true;
}
static bool static bool
_equalVariableSetStmt(VariableSetStmt *a, VariableSetStmt *b) _equalVariableSetStmt(VariableSetStmt *a, VariableSetStmt *b)
{ {
...@@ -1864,6 +1873,9 @@ equal(void *a, void *b) ...@@ -1864,6 +1873,9 @@ equal(void *a, void *b)
case T_CreateSeqStmt: case T_CreateSeqStmt:
retval = _equalCreateSeqStmt(a, b); retval = _equalCreateSeqStmt(a, b);
break; break;
case T_AlterSeqStmt:
retval = _equalAlterSeqStmt(a, b);
break;
case T_VariableSetStmt: case T_VariableSetStmt:
retval = _equalVariableSetStmt(a, b); retval = _equalVariableSetStmt(a, b);
break; break;
......
src/backend/parser/gram.y
View file @ 5f65225f
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.406 2003/03/11 19:40:23 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.407 2003/03/20 07:02:08 momjian Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
...@@ -129,7 +129,7 @@ static void doNegateFloat(Value *v); ...@@ -129,7 +129,7 @@ static void doNegateFloat(Value *v);
%type <node> stmt schema_stmt %type <node> stmt schema_stmt
AlterDatabaseSetStmt AlterDomainStmt AlterGroupStmt AlterDatabaseSetStmt AlterDomainStmt AlterGroupStmt
AlterTableStmt AlterUserStmt AlterUserSetStmt AlterSeqStmt AlterTableStmt AlterUserStmt AlterUserSetStmt
AnalyzeStmt ClosePortalStmt ClusterStmt CommentStmt AnalyzeStmt ClosePortalStmt ClusterStmt CommentStmt
ConstraintsSetStmt CopyStmt CreateAsStmt CreateCastStmt ConstraintsSetStmt CopyStmt CreateAsStmt CreateCastStmt
CreateDomainStmt CreateGroupStmt CreateOpClassStmt CreatePLangStmt CreateDomainStmt CreateGroupStmt CreateOpClassStmt CreatePLangStmt
...@@ -377,7 +377,7 @@ static void doNegateFloat(Value *v); ...@@ -377,7 +377,7 @@ static void doNegateFloat(Value *v);
PROCEDURE PROCEDURE
READ REAL RECHECK REFERENCES REINDEX RELATIVE RENAME REPLACE READ REAL RECHECK REFERENCES REINDEX RELATIVE RENAME REPLACE
RESET RESTRICT RETURNS REVOKE RIGHT ROLLBACK ROW ROWS RESET RESTART RESTRICT RETURNS REVOKE RIGHT ROLLBACK ROW ROWS
RULE RULE
SCHEMA SCROLL SECOND_P SECURITY SELECT SEQUENCE SCHEMA SCROLL SECOND_P SECURITY SELECT SEQUENCE
...@@ -478,6 +478,7 @@ stmt : ...@@ -478,6 +478,7 @@ stmt :
AlterDatabaseSetStmt AlterDatabaseSetStmt
| AlterDomainStmt | AlterDomainStmt
| AlterGroupStmt | AlterGroupStmt
| AlterSeqStmt
| AlterTableStmt | AlterTableStmt
| AlterUserSetStmt | AlterUserSetStmt
| AlterUserStmt | AlterUserStmt
...@@ -1864,6 +1865,7 @@ CreateAsElement: ...@@ -1864,6 +1865,7 @@ CreateAsElement:
* *
* QUERY : * QUERY :
* CREATE SEQUENCE seqname * CREATE SEQUENCE seqname
* ALTER SEQUENCE seqname
* *
*****************************************************************************/ *****************************************************************************/
...@@ -1878,6 +1880,16 @@ CreateSeqStmt: ...@@ -1878,6 +1880,16 @@ CreateSeqStmt:
} }
; ;
AlterSeqStmt:
ALTER SEQUENCE qualified_name OptSeqList
{
AlterSeqStmt *n = makeNode(AlterSeqStmt);
n->sequence = $3;
n->options = $4;
$$ = (Node *)n;
}
;
OptSeqList: OptSeqList OptSeqElem { $$ = lappend($1, $2); } OptSeqList: OptSeqList OptSeqElem { $$ = lappend($1, $2); }
| /*EMPTY*/ { $$ = NIL; } | /*EMPTY*/ { $$ = NIL; }
; ;
...@@ -1918,6 +1930,10 @@ OptSeqElem: CACHE NumericOnly ...@@ -1918,6 +1930,10 @@ OptSeqElem: CACHE NumericOnly
{ {
$$ = makeDefElem("start", (Node *)$3); $$ = makeDefElem("start", (Node *)$3);
} }
| RESTART opt_with NumericOnly
{
$$ = makeDefElem("restart", (Node *)$3);
}
; ;
opt_by: BY {} opt_by: BY {}
...@@ -7163,6 +7179,7 @@ unreserved_keyword: ...@@ -7163,6 +7179,7 @@ unreserved_keyword:
| RENAME | RENAME
| REPLACE | REPLACE
| RESET | RESET
| RESTART
| RESTRICT | RESTRICT
| RETURNS | RETURNS
| REVOKE | REVOKE
......
src/backend/parser/keywords.c
View file @ 5f65225f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.135 2003/03/11 19:40:23 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.136 2003/03/20 07:02:10 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -248,6 +248,7 @@ static const ScanKeyword ScanKeywords[] = { ...@@ -248,6 +248,7 @@ static const ScanKeyword ScanKeywords[] = {
{"rename", RENAME}, {"rename", RENAME},
{"replace", REPLACE}, {"replace", REPLACE},
{"reset", RESET}, {"reset", RESET},
{"restart", RESTART},
{"restrict", RESTRICT}, {"restrict", RESTRICT},
{"returns", RETURNS}, {"returns", RETURNS},
{"revoke", REVOKE}, {"revoke", REVOKE},
......
src/backend/tcop/postgres.c
View file @ 5f65225f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.317 2003/03/10 03:53:51 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.318 2003/03/20 07:02:10 momjian Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
...@@ -1789,7 +1789,7 @@ PostgresMain(int argc, char *argv[], const char *username) ...@@ -1789,7 +1789,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.317 $ $Date: 2003/03/10 03:53:51 $\n"); puts("$Revision: 1.318 $ $Date: 2003/03/20 07:02:10 $\n");
} }
/* /*
...@@ -2381,6 +2381,10 @@ CreateCommandTag(Node *parsetree) ...@@ -2381,6 +2381,10 @@ CreateCommandTag(Node *parsetree)
tag = "CREATE SEQUENCE"; tag = "CREATE SEQUENCE";
break; break;
case T_AlterSeqStmt:
tag = "ALTER SEQUENCE";
break;
case T_RemoveAggrStmt: case T_RemoveAggrStmt:
tag = "DROP AGGREGATE"; tag = "DROP AGGREGATE";
break; break;
......
src/backend/tcop/utility.c
View file @ 5f65225f
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.195 2003/03/11 19:40:23 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.196 2003/03/20 07:02:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -183,6 +183,7 @@ check_xact_readonly(Node *parsetree) ...@@ -183,6 +183,7 @@ check_xact_readonly(Node *parsetree)
case T_AlterDatabaseSetStmt: case T_AlterDatabaseSetStmt:
case T_AlterDomainStmt: case T_AlterDomainStmt:
case T_AlterGroupStmt: case T_AlterGroupStmt:
case T_AlterSeqStmt:
case T_AlterTableStmt: case T_AlterTableStmt:
case T_RenameStmt: case T_RenameStmt:
case T_AlterUserStmt: case T_AlterUserStmt:
...@@ -748,6 +749,10 @@ ProcessUtility(Node *parsetree, ...@@ -748,6 +749,10 @@ ProcessUtility(Node *parsetree,
DefineSequence((CreateSeqStmt *) parsetree); DefineSequence((CreateSeqStmt *) parsetree);
break; break;
case T_AlterSeqStmt:
AlterSequence((AlterSeqStmt *) parsetree);
break;
case T_RemoveAggrStmt: case T_RemoveAggrStmt:
RemoveAggregate((RemoveAggrStmt *) parsetree); RemoveAggregate((RemoveAggrStmt *) parsetree);
break; break;
......
src/include/commands/sequence.h
View file @ 5f65225f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: sequence.h,v 1.22 2003/03/20 05:18:15 momjian Exp $ * $Id: sequence.h,v 1.23 2003/03/20 07:02:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -84,6 +84,7 @@ extern Datum setval(PG_FUNCTION_ARGS); ...@@ -84,6 +84,7 @@ extern Datum setval(PG_FUNCTION_ARGS);
extern Datum setval_and_iscalled(PG_FUNCTION_ARGS); extern Datum setval_and_iscalled(PG_FUNCTION_ARGS);
extern void DefineSequence(CreateSeqStmt *stmt); extern void DefineSequence(CreateSeqStmt *stmt);
extern void AlterSequence(AlterSeqStmt *stmt);
extern void seq_redo(XLogRecPtr lsn, XLogRecord *rptr); extern void seq_redo(XLogRecPtr lsn, XLogRecord *rptr);
extern void seq_undo(XLogRecPtr lsn, XLogRecord *rptr); extern void seq_undo(XLogRecPtr lsn, XLogRecord *rptr);
......
src/include/nodes/nodes.h
View file @ 5f65225f
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: nodes.h,v 1.138 2003/03/10 03:53:51 tgl Exp $ * $Id: nodes.h,v 1.139 2003/03/20 07:02:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -220,6 +220,7 @@ typedef enum NodeTag ...@@ -220,6 +220,7 @@ typedef enum NodeTag
T_VacuumStmt, T_VacuumStmt,
T_ExplainStmt, T_ExplainStmt,
T_CreateSeqStmt, T_CreateSeqStmt,
T_AlterSeqStmt,
T_VariableSetStmt, T_VariableSetStmt,
T_VariableShowStmt, T_VariableShowStmt,
T_VariableResetStmt, T_VariableResetStmt,
......
src/include/nodes/parsenodes.h
View file @ 5f65225f
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: parsenodes.h,v 1.233 2003/03/11 19:40:23 tgl Exp $ * $Id: parsenodes.h,v 1.234 2003/03/20 07:02:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1043,7 +1043,7 @@ typedef struct DropGroupStmt ...@@ -1043,7 +1043,7 @@ typedef struct DropGroupStmt
} DropGroupStmt; } DropGroupStmt;
/* ---------------------- /* ----------------------
* Create SEQUENCE Statement * {Create|Alter} SEQUENCE Statement
* ---------------------- * ----------------------
*/ */
...@@ -1054,6 +1054,13 @@ typedef struct CreateSeqStmt ...@@ -1054,6 +1054,13 @@ typedef struct CreateSeqStmt
List *options; List *options;
} CreateSeqStmt; } CreateSeqStmt;
typedef struct AlterSeqStmt
{
NodeTag type;
RangeVar *sequence; /* the sequence to alter */
List *options;
} AlterSeqStmt;
/* ---------------------- /* ----------------------
* Create {Aggregate|Operator|Type} Statement * Create {Aggregate|Operator|Type} Statement
* ---------------------- * ----------------------
......
src/test/regress/expected/alter_table.out
View file @ 5f65225f
...@@ -286,16 +286,6 @@ SELECT unique1 FROM tenk1 WHERE unique1 < 5; ...@@ -286,16 +286,6 @@ SELECT unique1 FROM tenk1 WHERE unique1 < 5;
(5 rows) (5 rows)
DROP VIEW tmp_view_new; DROP VIEW tmp_view_new;
-- renaming sequences
CREATE SEQUENCE foo_seq;
ALTER TABLE foo_seq RENAME TO foo_seq_new;
SELECT * FROM foo_seq_new;
sequence_name | last_value | increment_by | max_value | min_value | cache_value | log_cnt | is_cycled | is_called
---------------+------------+--------------+---------------------+-----------+-------------+---------+-----------+-----------
foo_seq | 1 | 1 | 9223372036854775807 | 1 | 1 | 1 | f | f
(1 row)
DROP SEQUENCE foo_seq_new;
-- toast-like relation name -- toast-like relation name
alter table stud_emp rename to pg_toast_stud_emp; alter table stud_emp rename to pg_toast_stud_emp;
alter table pg_toast_stud_emp rename to stud_emp; alter table pg_toast_stud_emp rename to stud_emp;
......
src/test/regress/expected/create_misc.out
View file @ 5f65225f
...@@ -132,31 +132,3 @@ INSERT INTO iportaltest (i, d, p) ...@@ -132,31 +132,3 @@ INSERT INTO iportaltest (i, d, p)
VALUES (1, 3.567, '(3.0,1.0),(4.0,2.0)'::polygon); VALUES (1, 3.567, '(3.0,1.0),(4.0,2.0)'::polygon);
INSERT INTO iportaltest (i, d, p) INSERT INTO iportaltest (i, d, p)
VALUES (2, 89.05, '(4.0,2.0),(3.0,1.0)'::polygon); VALUES (2, 89.05, '(4.0,2.0),(3.0,1.0)'::polygon);
---
--- test creation of SERIAL column
---
CREATE TABLE serialTest (f1 text, f2 serial);
NOTICE: CREATE TABLE will create implicit sequence 'serialtest_f2_seq' for SERIAL column 'serialtest.f2'
INSERT INTO serialTest VALUES ('foo');
INSERT INTO serialTest VALUES ('bar');
INSERT INTO serialTest VALUES ('force', 100);
INSERT INTO serialTest VALUES ('wrong', NULL);
ERROR: ExecInsert: Fail to add null value in not null attribute f2
SELECT * FROM serialTest;
f1 | f2
-------+-----
foo | 1
bar | 2
force | 100
(3 rows)
CREATE SEQUENCE sequence_test;
BEGIN;
SELECT nextval('sequence_test');
nextval
---------
1
(1 row)
DROP SEQUENCE sequence_test;
END;
src/test/regress/expected/sequence.out 0 → 100644
View file @ 5f65225f
---
--- test creation of SERIAL column
---
CREATE TABLE serialTest (f1 text, f2 serial);
NOTICE: CREATE TABLE will create implicit sequence 'serialtest_f2_seq' for SERIAL column 'serialtest.f2'
INSERT INTO serialTest VALUES ('foo');
INSERT INTO serialTest VALUES ('bar');
INSERT INTO serialTest VALUES ('force', 100);
INSERT INTO serialTest VALUES ('wrong', NULL);
ERROR: ExecInsert: Fail to add null value in not null attribute f2
SELECT * FROM serialTest;
f1 | f2
-------+-----
foo | 1
bar | 2
force | 100
(3 rows)
CREATE SEQUENCE sequence_test;
BEGIN;
SELECT nextval('sequence_test');
nextval
---------
1
(1 row)
DROP SEQUENCE sequence_test;
END;
-- renaming sequences
CREATE SEQUENCE foo_seq;
ALTER TABLE foo_seq RENAME TO foo_seq_new;
SELECT * FROM foo_seq_new;
sequence_name | last_value | increment_by | max_value | min_value | cache_value | log_cnt | is_cycled | is_called
---------------+------------+--------------+---------------------+-----------+-------------+---------+-----------+-----------
foo_seq | 1 | 1 | 9223372036854775807 | 1 | 1 | 1 | f | f
(1 row)
DROP SEQUENCE foo_seq_new;
--
-- Alter sequence
--
CREATE SEQUENCE sequence_test2 START WITH 32;
SELECT nextval('sequence_test2');
nextval
---------
32
(1 row)
ALTER SEQUENCE sequence_test2 RESTART WITH 16
INCREMENT BY 4 MAXVALUE 22 MINVALUE 5 CYCLE;
SELECT nextval('sequence_test2');
nextval
---------
16
(1 row)
SELECT nextval('sequence_test2');
nextval
---------
20
(1 row)
SELECT nextval('sequence_test2');
nextval
---------
5
(1 row)
src/test/regress/parallel_schedule
View file @ 5f65225f
...@@ -74,4 +74,4 @@ test: select_views portals_p2 rules foreign_key cluster ...@@ -74,4 +74,4 @@ test: select_views portals_p2 rules foreign_key cluster
# The sixth group of parallel test # The sixth group of parallel test
# ---------- # ----------
# "plpgsql" cannot run concurrently with "rules" # "plpgsql" cannot run concurrently with "rules"
test: limit plpgsql copy2 temp domain rangefuncs prepare without_oid conversion truncate alter_table test: limit plpgsql copy2 temp domain rangefuncs prepare without_oid conversion truncate alter_table sequence
src/test/regress/serial_schedule
View file @ 5f65225f
# $Header: /cvsroot/pgsql/src/test/regress/serial_schedule,v 1.18 2002/09/02 05:55:43 momjian Exp $ # $Header: /cvsroot/pgsql/src/test/regress/serial_schedule,v 1.19 2003/03/20 07:02:11 momjian Exp $
# This should probably be in an order similar to parallel_schedule. # This should probably be in an order similar to parallel_schedule.
test: boolean test: boolean
test: char test: char
...@@ -90,3 +90,4 @@ test: without_oid ...@@ -90,3 +90,4 @@ test: without_oid
test: conversion test: conversion
test: truncate test: truncate
test: alter_table test: alter_table
test: sequence
src/test/regress/sql/alter_table.sql
View file @ 5f65225f
...@@ -173,11 +173,6 @@ ALTER TABLE tmp_view RENAME TO tmp_view_new; ...@@ -173,11 +173,6 @@ ALTER TABLE tmp_view RENAME TO tmp_view_new;
-- 5 values, sorted -- 5 values, sorted
SELECT unique1 FROM tenk1 WHERE unique1 < 5; SELECT unique1 FROM tenk1 WHERE unique1 < 5;
DROP VIEW tmp_view_new; DROP VIEW tmp_view_new;
-- renaming sequences
CREATE SEQUENCE foo_seq;
ALTER TABLE foo_seq RENAME TO foo_seq_new;
SELECT * FROM foo_seq_new;
DROP SEQUENCE foo_seq_new;
-- toast-like relation name -- toast-like relation name
alter table stud_emp rename to pg_toast_stud_emp; alter table stud_emp rename to pg_toast_stud_emp;
alter table pg_toast_stud_emp rename to stud_emp; alter table pg_toast_stud_emp rename to stud_emp;
......
src/test/regress/sql/create_misc.sql
View file @ 5f65225f
...@@ -203,24 +203,3 @@ INSERT INTO iportaltest (i, d, p) ...@@ -203,24 +203,3 @@ INSERT INTO iportaltest (i, d, p)
INSERT INTO iportaltest (i, d, p) INSERT INTO iportaltest (i, d, p)
VALUES (2, 89.05, '(4.0,2.0),(3.0,1.0)'::polygon); VALUES (2, 89.05, '(4.0,2.0),(3.0,1.0)'::polygon);
---
--- test creation of SERIAL column
---
CREATE TABLE serialTest (f1 text, f2 serial);
INSERT INTO serialTest VALUES ('foo');
INSERT INTO serialTest VALUES ('bar');
INSERT INTO serialTest VALUES ('force', 100);
INSERT INTO serialTest VALUES ('wrong', NULL);
SELECT * FROM serialTest;
CREATE SEQUENCE sequence_test;
BEGIN;
SELECT nextval('sequence_test');
DROP SEQUENCE sequence_test;
END;
src/test/regress/sql/sequence.sql 0 → 100644
View file @ 5f65225f
---
--- test creation of SERIAL column
---
CREATE TABLE serialTest (f1 text, f2 serial);
INSERT INTO serialTest VALUES ('foo');
INSERT INTO serialTest VALUES ('bar');
INSERT INTO serialTest VALUES ('force', 100);
INSERT INTO serialTest VALUES ('wrong', NULL);
SELECT * FROM serialTest;
CREATE SEQUENCE sequence_test;
BEGIN;
SELECT nextval('sequence_test');
DROP SEQUENCE sequence_test;
END;
-- renaming sequences
CREATE SEQUENCE foo_seq;
ALTER TABLE foo_seq RENAME TO foo_seq_new;
SELECT * FROM foo_seq_new;
DROP SEQUENCE foo_seq_new;
--
-- Alter sequence
--
CREATE SEQUENCE sequence_test2 START WITH 32;
SELECT nextval('sequence_test2');
ALTER SEQUENCE sequence_test2 RESTART WITH 16
INCREMENT BY 4 MAXVALUE 22 MINVALUE 5 CYCLE;
SELECT nextval('sequence_test2');
SELECT nextval('sequence_test2');
SELECT nextval('sequence_test2');
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment