Changeset: 859cf36b724e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=859cf36b724e
Modified Files:
sql/server/rel_sequence.c
Branch: Aug2018
Log Message:
Correct text for alter sequence error messages.
Also removed trailing whitespace characters.
diffs (190 lines):
diff --git a/sql/server/rel_sequence.c b/sql/server/rel_sequence.c
--- a/sql/server/rel_sequence.c
+++ b/sql/server/rel_sequence.c
@@ -109,7 +109,7 @@ rel_create_seq(
if (max < 0) max = 0;
if (cache <= 0) cache = 1;
- seq = create_sql_sequence(sql->sa, s, name, start, min, max, inc,
cache, cycle);
+ seq = create_sql_sequence(sql->sa, s, name, start, min, max, inc,
cache, cycle);
seq->bedropped = bedropped;
res = rel_seq(sql->sa, DDL_CREATE_SEQ, s->base.name, seq, NULL, NULL);
/* for multi statements we keep the sequence around */
@@ -148,43 +148,43 @@ list_create_seq(
switch(s->token) {
case SQL_TYPE:
- if ((used&(1<<SEQ_TYPE)))
+ if ((used&(1<<SEQ_TYPE)))
return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: AS type found should be used as most once");
used |= (1<<SEQ_TYPE);
t = &s->data.lval->h->data.typeval;
break;
case SQL_START:
- if ((used&(1<<SEQ_START)))
+ if ((used&(1<<SEQ_START)))
return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: START value should be passed as most once");
used |= (1<<SEQ_START);
start = s->data.l_val;
break;
case SQL_INC:
- if ((used&(1<<SEQ_INC)))
+ if ((used&(1<<SEQ_INC)))
return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: INCREMENT value should be passed as most once");
used |= (1<<SEQ_INC);
inc = s->data.l_val;
break;
case SQL_MINVALUE:
- if ((used&(1<<SEQ_MIN)))
+ if ((used&(1<<SEQ_MIN)))
return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: MINVALUE or NO MINVALUE should be passed as most once");
used |= (1<<SEQ_MIN);
min = s->data.l_val;
break;
case SQL_MAXVALUE:
- if ((used&(1<<SEQ_MAX)))
+ if ((used&(1<<SEQ_MAX)))
return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: MAXVALUE or NO MAXVALUE should be passed as most once");
used |= (1<<SEQ_MAX);
max = s->data.l_val;
break;
case SQL_CYCLE:
- if ((used&(1<<SEQ_CYCLE)))
+ if ((used&(1<<SEQ_CYCLE)))
return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: CYCLE or NO CYCLE should be passed as most once");
used |= (1<<SEQ_CYCLE);
cycle = s->data.i_val;
break;
case SQL_CACHE:
- if ((used&(1<<SEQ_CACHE)))
+ if ((used&(1<<SEQ_CACHE)))
return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: CACHE value should be passed as most once");
used |= (1<<SEQ_CACHE);
cache = s->data.l_val;
@@ -220,7 +220,7 @@ rel_alter_seq(
assert(start_list->h->type == type_int);
if (sname && !(s = mvc_bind_schema(sql, sname)))
- return sql_error(sql, 02, SQLSTATE(3F000) "CREATE SEQUENCE: no
such schema '%s'", sname);
+ return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SEQUENCE: no
such schema '%s'", sname);
if (!s)
s = ss;
(void) tpe;
@@ -233,10 +233,10 @@ rel_alter_seq(
}
/* first alter the known values */
- seq = create_sql_sequence(sql->sa, s, name, seq->start, min, max, inc,
cache, cycle);
+ seq = create_sql_sequence(sql->sa, s, name, seq->start, min, max, inc,
cache, cycle);
- /* restart may be a query, i.e. we create a statement
- restart(ssname,seqname,value) */
+ /* restart may be a query, i.e. we create a statement
+ restart(ssname,seqname,value) */
if (start_type == 0) {
val = exp_atom_lng(sql->sa, seq->start);
@@ -250,7 +250,7 @@ rel_alter_seq(
if (!val || !(val = rel_check_type(sql, lng_t, val,
type_equal)))
return NULL;
} else if (start_type == 2) {
- assert (start_list->h->next->type == type_lng);
+ assert (start_list->h->next->type == type_lng);
val = exp_atom_lng(sql->sa, start_list->h->next->data.l_val);
}
return rel_seq(sql->sa, DDL_ALTER_SEQ, s->base.name, seq, r, val);
@@ -275,44 +275,44 @@ list_alter_seq(
switch(s->token) {
case SQL_TYPE:
- if ((used&(1<<SEQ_TYPE)))
- return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: AS type found should be used as most once");
+ if ((used&(1<<SEQ_TYPE)))
+ return sql_error(sql, 02, SQLSTATE(3F000)
"ALTER SEQUENCE: AS type found should be used as most once");
used |= (1<<SEQ_TYPE);
t = &s->data.lval->h->data.typeval;
break;
case SQL_START:
- if ((used&(1<<SEQ_START)))
- return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: START value should be passed as most once");
+ if ((used&(1<<SEQ_START)))
+ return sql_error(sql, 02, SQLSTATE(3F000)
"ALTER SEQUENCE: START value should be passed as most once");
used |= (1<<SEQ_START);
start = s->data.lval;
break;
case SQL_INC:
- if ((used&(1<<SEQ_INC)))
- return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: INCREMENT value should be passed as most once");
+ if ((used&(1<<SEQ_INC)))
+ return sql_error(sql, 02, SQLSTATE(3F000)
"ALTER SEQUENCE: INCREMENT value should be passed as most once");
used |= (1<<SEQ_INC);
inc = s->data.l_val;
break;
case SQL_MINVALUE:
- if ((used&(1<<SEQ_MIN)))
- return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: MINVALUE or NO MINVALUE should be passed as most once");
+ if ((used&(1<<SEQ_MIN)))
+ return sql_error(sql, 02, SQLSTATE(3F000)
"ALTER SEQUENCE: MINVALUE or NO MINVALUE should be passed as most once");
used |= (1<<SEQ_MIN);
min = s->data.l_val;
break;
case SQL_MAXVALUE:
- if ((used&(1<<SEQ_MAX)))
- return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: MAXVALUE or NO MAXVALUE should be passed as most once");
+ if ((used&(1<<SEQ_MAX)))
+ return sql_error(sql, 02, SQLSTATE(3F000)
"ALTER SEQUENCE: MAXVALUE or NO MAXVALUE should be passed as most once");
used |= (1<<SEQ_MAX);
max = s->data.l_val;
break;
case SQL_CYCLE:
- if ((used&(1<<SEQ_CYCLE)))
- return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: CYCLE or NO CYCLE should be passed as most once");
+ if ((used&(1<<SEQ_CYCLE)))
+ return sql_error(sql, 02, SQLSTATE(3F000)
"ALTER SEQUENCE: CYCLE or NO CYCLE should be passed as most once");
used |= (1<<SEQ_CYCLE);
cycle = s->data.i_val;
break;
case SQL_CACHE:
- if ((used&(1<<SEQ_CACHE)))
- return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE SEQUENCE: CACHE value should be passed as most once");
+ if ((used&(1<<SEQ_CACHE)))
+ return sql_error(sql, 02, SQLSTATE(3F000)
"ALTER SEQUENCE: CACHE value should be passed as most once");
used |= (1<<SEQ_CACHE);
cache = s->data.l_val;
break;
@@ -335,20 +335,20 @@ rel_sequences(mvc *sql, symbol *s)
res = list_create_seq(
/* mvc* sql */ sql,
-/* sql_schema* s */ cur_schema(sql),
-/* dlist* qname */ l->h->data.lval,
-/* dlist* options */ l->h->next->data.lval,
-/* int bedropped */ l->h->next->next->data.i_val);
+/* sql_schema* s */ cur_schema(sql),
+/* dlist* qname */ l->h->data.lval,
+/* dlist* options */ l->h->next->data.lval,
+/* int bedropped */ l->h->next->next->data.i_val);
}
break;
case SQL_ALTER_SEQ:
{
dlist* l = s->data.lval;
-
+
res = list_alter_seq(
/* mvc* sql */ sql,
-/* sql_schema* s */ cur_schema(sql),
-/* dlist* qname */ l->h->data.lval,
+/* sql_schema* s */ cur_schema(sql),
+/* dlist* qname */ l->h->data.lval,
/* dlist* options */ l->h->next->data.lval);
}
break;
@@ -369,6 +369,6 @@ rel_sequences(mvc *sql, symbol *s)
default:
return sql_error(sql, 01, SQLSTATE(42000) "sql_stmt
Symbol(%p)->token = %s", s, token2string(s->token));
}
- sql->type = Q_SCHEMA;
+ sql->type = Q_SCHEMA;
return res;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
