Changeset: b044a3092d96 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b044a3092d96
Modified Files:
monetdb5/mal/mal_client.h
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_privileges.c
sql/test/BugConstraints/Tests/add_constraint_1643522.stable.err
sql/test/BugConstraints/Tests/drop_column_1643542.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/index_management.SF-927326.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/rollback_and_autocommit.SF-926453.stable.err
sql/test/BugDay_2005-11-09_2.8/Tests/crash_with_wrong_nesting.SF-1097883.stable.err
sql/test/BugDay_2005-11-09_2.8/Tests/insert_from_no-existing_tables.SF-1037020.stable.err
sql/test/BugDay_2005-11-09_2.9.3/Tests/drop_column_alter_table.SF-1114557.stable.err
sql/test/BugDay_2005-11-09_2.9.3/Tests/schema_change_grant_crash.SF-963620.stable.err
sql/test/BugDay_2005-12-19_2.9.3/Tests/default_next_value_for_non_ex_seq.SF.1246631.stable.err
sql/test/BugTracker-2008/Tests/alter_view_not_allowed.SF-2075195.stable.err
sql/test/BugTracker-2008/Tests/invalid_qualified_column_name.SF-2183288.stable.err
sql/test/BugTracker-2009/Tests/ambiguous_view.stable.err
sql/test/BugTracker-2009/Tests/incomplete.SF.2536893.stable.err
sql/test/BugTracker-2009/Tests/not_invalidtable_crash.SF-2927174.stable.err
sql/test/BugTracker-2009/Tests/rollback_mistake.SF-2814622.stable.err
sql/test/BugTracker-2009/Tests/select_from_history.SF-2556566.stable.err
sql/test/BugTracker-2010/Tests/crash_default_unlocked.Bug-2744.stable.err
sql/test/BugTracker-2010/Tests/crash_on_in_2.Bug-2604.stable.err
sql/test/BugTracker-2010/Tests/select_from_seq.Bug-2730.stable.err
sql/test/BugTracker-2010/Tests/unicode-bom.Bug-2641.stable.err
sql/test/BugTracker-2011/Tests/alter_incorrect_syntax_crash.Bug-2795.stable.err
sql/test/BugTracker-2011/Tests/user_create_temp_table.Bug-2916.stable.err
sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err
sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out
sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.stable.err
sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.stable.out
sql/test/BugTracker-2013/Tests/unique_constraint_on_declared_table.Bug-3319.stable.err
sql/test/BugTracker-2013/Tests/update_on_declared_table.Bug-3318.stable.err
sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.stable.err
sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.err
sql/test/BugTracker-2016/Tests/column_name_conflict.Bug-3912.stable.err
sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.err
sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.err
sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.err
sql/test/BugTracker-2017/Tests/lateral02.Bug-6314.stable.err
sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err
sql/test/BugTracker-2017/Tests/with-alias-bug.6246.stable.err
sql/test/BugTracker/Tests/alter_col_to_set_same_constraint.SF-1850781.stable.err
sql/test/BugTracker/Tests/ambiguous_join.SF-1580565.stable.err
sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
sql/test/BugTracker/Tests/create_column.SF-1643542.stable.err
sql/test/BugTracker/Tests/inserting_invalid_timestamp.SF-1363557.stable.err
sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.err.int128
sql/test/BugTracker/Tests/revoke_role.SF-1691646.stable.err
sql/test/LSST/Tests/dbQuery036.stable.err
sql/test/Tests/50ways.stable.err
sql/test/Tests/bincopycollist.stable.err
sql/test/Tests/create_in_schema.stable.err
sql/test/Tests/session_vars.stable.err
sql/test/Triggers/Tests/trigger_owner.stable.err
sql/test/Update_Delete_action/Tests/update_delete_set_null_crash.stable.err
sql/test/Users/Tests/changeSchemaUser.stable.err
sql/test/Users/Tests/columnRights.stable.err
sql/test/Users/Tests/copyinto.stable.err
sql/test/Users/Tests/copyinto.stable.out
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.stable.err
sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.stable.err
sql/test/Users/Tests/grantRole.Bug-3772.stable.err
sql/test/Users/Tests/renameUser.stable.err
sql/test/Users/Tests/role.stable.err
sql/test/Users/Tests/role2.stable.err
sql/test/Users/Tests/test_privs2_p2.stable.err
sql/test/Users/Tests/test_privs_p2.stable.err
sql/test/Via-m/Tests/event_s07.stable.err
sql/test/Via-m/Tests/event_s07.stable.out
sql/test/Via-m/Tests/event_s11.stable.err
sql/test/Via-m/Tests/event_s11.stable.out
sql/test/Via-m/Tests/file_s10.stable.err
sql/test/Via-m/Tests/file_s10.stable.out
sql/test/Via-m/Tests/file_s12.stable.err
sql/test/Via-m/Tests/file_s12.stable.out
sql/test/Via-m/Tests/media_s12.stable.err
sql/test/Via-m/Tests/media_s12.stable.out
sql/test/Via-m/Tests/media_s14.stable.err
sql/test/Via-m/Tests/media_s14.stable.out
sql/test/Via-m/Tests/media_s16.stable.err
sql/test/Via-m/Tests/media_s16.stable.out
sql/test/Via-m/Tests/media_s18.stable.err
sql/test/Via-m/Tests/media_s18.stable.out
sql/test/Via-m/Tests/media_s19.stable.err
sql/test/Via-m/Tests/media_s19.stable.out
sql/test/Views/Tests/Views.stable.err
sql/test/bugs/Tests/alter_add_column-bug.stable.err
sql/test/bugs/Tests/alter_table_add_column.stable.err
sql/test/bugs/Tests/alter_view.stable.err
sql/test/bugs/Tests/autocommit_illegal_statements-bug-sf-953545.stable.err
sql/test/bugs/Tests/crash_order_by.stable.err
sql/test/bugs/Tests/create_insert_select_aggr-bug-00001.stable.err
sql/test/bugs/Tests/filter_error.stable.err
sql/test/bugs/Tests/foreignkey_leftjoin-bug-sf-854312.stable.err
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
sql/test/bugs/Tests/interval_convert_bugs-sf-1274077-1274085.stable.err
sql/test/bugs/Tests/primary_key-bug-sf-975308.stable.err
sql/test/bugs/Tests/procedure_resolution_bug.stable.err
sql/test/bugs/Tests/savepoint_rollback-bug-sf-953553.stable.err
sql/test/bugs/Tests/select_constant_from_where_1=1-bug-sf-1019529.stable.err
sql/test/bugs/Tests/select_from_values.stable.err
sql/test/bugs/Tests/unique-bug-sf-1043512.stable.err
sql/test/copy/Tests/columns.stable.err
sql/test/copy/Tests/int_parse.stable.err
sql/test/copy/Tests/key_copy.stable.err
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
sql/test/copy/Tests/null_as_string_errors.stable.err
sql/test/mapi/Tests/python2_dbapi.stable.out
sql/test/mapi/Tests/python3_dbapi.stable.out
sql/test/mergetables/Tests/addtable.stable.err
sql/test/mergetables/Tests/alter.stable.err
sql/test/mergetables/Tests/crash0.stable.err
sql/test/mergetables/Tests/doubletable.stable.err
sql/test/mergetables/Tests/emptymergequery.stable.err
sql/test/mergetables/Tests/mergedrop.stable.err
sql/test/mergetables/Tests/mergedropcrash.stable.err
sql/test/mergetables/Tests/types.stable.err
sql/test/orderidx/Tests/oidx_all_types.stable.err
sql/test/osm/Tests/drop_constraint_bug.stable.err
sql/test/osm/Tests/drop_constraint_bug.stable.out
sql/test/pg_regress/Tests/char.stable.err
sql/test/pg_regress/Tests/create_misc.stable.err
sql/test/pg_regress/Tests/int2.stable.err
sql/test/pg_regress/Tests/int4.stable.err
sql/test/pg_regress/Tests/int8.stable.err.int128
sql/test/pg_regress/Tests/interval.stable.err.int128
sql/test/pg_regress/Tests/numerology.stable.err
sql/test/pg_regress/Tests/oid.stable.err.int128
sql/test/pg_regress/Tests/path.stable.err
sql/test/pg_regress/Tests/polygon.stable.err
sql/test/pg_regress/Tests/reltime.stable.err
sql/test/pg_regress/Tests/strings_concat.stable.err
sql/test/pg_regress/Tests/varchar.stable.err
sql/test/snodgrass/Tests/cast_select.stable.err
sql/test/snodgrass/Tests/cast_select.stable.out
sql/test/snodgrass/Tests/interval_select.stable.err
sql/test/snodgrass/Tests/interval_select.stable.out
sql/test/ssqq/Tests/insert_query.stable.err
sql/test/ssqq/Tests/insert_queue.stable.err
sql/test/ssqq/Tests/insert_quser.stable.err
Branch: malerrors
Log Message:
Approval of another batch
diffs (truncated from 4256 to 300 lines):
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -15,7 +15,7 @@
#include "mal_resolve.h"
#include "mal_profiler.h"
-#define SCENARIO_PROPERTIES 7
+#define SCENARIO_PROPERTIES 8
#define CONSOLE 0
#define isAdministrator(X) (X==mal_clients)
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -781,7 +781,7 @@ rel_create_func(mvc *sql, dlist *qname,
return sql_error(sql, 06, "schema statements cannot be executed
on a readonly database.");
if (sname && !(s = mvc_bind_schema(sql, sname)))
- return sql_error(sql, 02, "3F000!CREATE %s%s: no such schema
'%s'", KF, F, sname);
+ return sql_error(sql, 02, "SQLSTATE 3F000!CREATE %s%s: no such
schema '%s'", KF, F, sname);
if (s == NULL)
s = cur_schema(sql);
@@ -1052,7 +1052,7 @@ rel_drop_func(mvc *sql, dlist *qname, dl
char *KF = type==F_FILT?"FILTER ": type==F_UNION?"UNION ": "";
if (sname && !(s = mvc_bind_schema(sql, sname)))
- return sql_error(sql, 02, "3F000!DROP %s%s: no such schema
'%s'", KF, F, sname);
+ return sql_error(sql, 02, "SQLSTATE 3F000!DROP %s%s: no such
schema '%s'", KF, F, sname);
if (s == NULL)
s = cur_schema(sql);
@@ -1083,7 +1083,7 @@ rel_drop_all_func(mvc *sql, dlist *qname
char *kf = type==F_FILT?"filter ": type==F_UNION?"union ": "";
if (sname && !(s = mvc_bind_schema(sql, sname)))
- return sql_error(sql, 02, "3F000!DROP %s%s: no such schema
'%s'", KF, F, sname);
+ return sql_error(sql, 02, "SQLSTATE 3F000!DROP %s%s: no such
schema '%s'", KF, F, sname);
if (s == NULL)
s = cur_schema(sql);
@@ -1152,7 +1152,7 @@ create_trigger(mvc *sql, dlist *qname, i
sname = ss->base.name;
if (sname && !(ss = mvc_bind_schema(sql, sname)))
- return sql_error(sql, 02, "3F000!CREATE TRIGGER: no such schema
'%s'", sname);
+ return sql_error(sql, 02, "SQLSTATE 3F000!CREATE TRIGGER: no
such schema '%s'", sname);
if (opt_ref) {
dnode *dl = opt_ref->h;
@@ -1255,7 +1255,7 @@ drop_trigger(mvc *sql, dlist *qname)
sname = ss->base.name;
if (sname && !(ss = mvc_bind_schema(sql, sname)))
- return sql_error(sql, 02, "3F000!DROP TRIGGER: no such schema
'%s'", sname);
+ return sql_error(sql, 02, "SQLSTATE 3F000!DROP TRIGGER: no such
schema '%s'", sname);
if (!mvc_schema_privs(sql, ss))
return sql_error(sql, 02, "DROP TRIGGER: access denied for %s
to schema ;'%s'", stack_get_string(sql, "current_user"), ss->base.name);
@@ -1349,12 +1349,12 @@ create_table_from_loader(mvc *sql, dlist
sql_rel *res = NULL;
if (sname && !(s = mvc_bind_schema(sql, sname)))
- return sql_error(sql, 02, "3F000!CREATE TABLE: no such schema
'%s'", sname);
+ return sql_error(sql, 02, "SQLSTATE 3F000!CREATE TABLE: no such
schema '%s'", sname);
if (mvc_bind_table(sql, s, tname)) {
- return sql_error(sql, 02, "42S01!CREATE TABLE: name '%s'
already in use", tname);
+ return sql_error(sql, 02, "SQLSTATE 42S01!CREATE TABLE: name
'%s' already in use", tname);
} else if (!mvc_schema_privs(sql, s)){
- return sql_error(sql, 02, "42000!CREATE TABLE: insufficient
privileges for user '%s' in schema '%s'", stack_get_string(sql,
"current_user"), s->base.name);
+ return sql_error(sql, 02, "SQLSTATE 42000!CREATE TABLE:
insufficient privileges for user '%s' in schema '%s'", stack_get_string(sql,
"current_user"), s->base.name);
}
import = rel_value_exp(sql, &res, fcall, sql_sel, ek);
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -148,7 +148,7 @@ as_subquery( mvc *sql, sql_table *t, sql
sql_subtype *tp = exp_subtype(e);
if (mvc_bind_column(sql, t, cname)) {
- sql_error(sql, 01, "42S21!%s: duplicate column
name %s", msg, cname);
+ sql_error(sql, 01, "SQLSTATE 42S21!%s:
duplicate column name %s", msg, cname);
return -1;
}
mvc_create_column(sql, t, cname, tp);
@@ -168,7 +168,7 @@ as_subquery( mvc *sql, sql_table *t, sql
if (!cname)
cname = "v";
if (mvc_bind_column(sql, t, cname)) {
- sql_error(sql, 01, "42S21!%s: duplicate column
name %s", msg, cname);
+ sql_error(sql, 01, "SQLSTATE 42S21!%s:
duplicate column name %s", msg, cname);
return -1;
}
mvc_create_column(sql, t, cname, tp);
@@ -284,7 +284,7 @@ column_constraint_type(mvc *sql, char *n
int res = SQL_ERR;
if (!ss && (s->token != SQL_NULL && s->token != SQL_NOT_NULL)) {
- (void) sql_error(sql, 02, "42000!CONSTRAINT: constraints on
declared tables are not supported\n");
+ (void) sql_error(sql, 02, "SQLSTATE 42000!CONSTRAINT:
constraints on declared tables are not supported\n");
return res;
}
switch (s->token) {
@@ -294,11 +294,11 @@ column_constraint_type(mvc *sql, char *n
sql_key *k;
if (kt == pkey && t->pkey) {
- (void) sql_error(sql, 02, "42000!CONSTRAINT PRIMARY
KEY: a table can have only one PRIMARY KEY\n");
+ (void) sql_error(sql, 02, "SQLSTATE 42000!CONSTRAINT
PRIMARY KEY: a table can have only one PRIMARY KEY\n");
return res;
}
if (name && mvc_bind_key(sql, ss, name)) {
- (void) sql_error(sql, 02, "42000!CONSTRAINT PRIMARY
KEY: key %s already exists", name);
+ (void) sql_error(sql, 02, "SQLSTATE 42000!CONSTRAINT
PRIMARY KEY: key %s already exists", name);
return res;
}
k = (sql_key*)mvc_create_ukey(sql, t, name, kt);
@@ -321,7 +321,7 @@ column_constraint_type(mvc *sql, char *n
assert(n->next->next->next->type == type_int);
/*
if (isTempTable(t)) {
- (void) sql_error(sql, 02, "42000!CONSTRAINT:
constraints on temporary tables are not supported\n");
+ (void) sql_error(sql, 02, "SQLSTATE 42000!CONSTRAINT:
constraints on temporary tables are not supported\n");
return res;
}
*/
@@ -332,11 +332,11 @@ column_constraint_type(mvc *sql, char *n
rs = cur_schema(sql);
rt = _bind_table(t, ss, rs, rtname);
if (!rt) {
- (void) sql_error(sql, 02, "42S02!CONSTRAINT FOREIGN
KEY: no such table '%s'\n", rtname);
+ (void) sql_error(sql, 02, "SQLSTATE 42S02!CONSTRAINT
FOREIGN KEY: no such table '%s'\n", rtname);
return res;
}
if (name && mvc_bind_key(sql, ss, name)) {
- (void) sql_error(sql, 02, "42000!CONSTRAINT FOREIGN
KEY: key '%s' already exists", name);
+ (void) sql_error(sql, 02, "SQLSTATE 42000!CONSTRAINT
FOREIGN KEY: key '%s' already exists", name);
return res;
}
@@ -351,11 +351,11 @@ column_constraint_type(mvc *sql, char *n
rk = &rt->pkey->k;
}
if (!rk) {
- (void) sql_error(sql, 02, "42000!CONSTRAINT FOREIGN
KEY: could not find referenced PRIMARY KEY in table %s.%s\n", rsname, rtname);
+ (void) sql_error(sql, 02, "SQLSTATE 42000!CONSTRAINT
FOREIGN KEY: could not find referenced PRIMARY KEY in table %s.%s\n", rsname,
rtname);
return res;
}
if (list_length(rk->columns) != 1) {
- (void) sql_error(sql, 02, "42000!CONSTRAINT FOREIGN
KEY: not all columns are handled\n");
+ (void) sql_error(sql, 02, "SQLSTATE 42000!CONSTRAINT
FOREIGN KEY: not all columns are handled\n");
return res;
}
fk = mvc_create_fkey(sql, t, name, fkey, rk, ref_actions & 255,
(ref_actions>>8) & 255);
@@ -421,7 +421,7 @@ column_option(
}
r = symbol2string(sql, s->data.sym, &err);
if (!r) {
- (void) sql_error(sql, 02, "42000!incorrect default
value '%s'\n", err?err:"");
+ (void) sql_error(sql, 02, "SQLSTATE 42000!incorrect
default value '%s'\n", err?err:"");
if (err) _DELETE(err);
return SQL_ERR;
} else {
@@ -499,10 +499,10 @@ table_foreign_key(mvc *sql, char *name,
if (!ft && t->s == fs && strcmp(t->base.name, rtname) == 0)
ft = t;
if (!ft) {
- sql_error(sql, 02, "42S02!CONSTRAINT FOREIGN KEY: no such table
'%s'\n", rtname);
+ sql_error(sql, 02, "SQLSTATE 42S02!CONSTRAINT FOREIGN KEY: no
such table '%s'\n", rtname);
return SQL_ERR;
} else if (list_find_name(t->keys.set, name)) {
- sql_error(sql, 02, "42000!CONSTRAINT FOREIGN KEY: key '%s'
already exists", name);
+ sql_error(sql, 02, "SQLSTATE 42000!CONSTRAINT FOREIGN KEY: key
'%s' already exists", name);
return SQL_ERR;
} else {
sql_key *rk = NULL;
@@ -513,7 +513,7 @@ table_foreign_key(mvc *sql, char *name,
assert(n->next->next->next->next->type == type_int);
if (name && mvc_bind_key(sql, ss, name)) {
- sql_error(sql, 02, "42000!Create Key failed, key '%s'
already exists", name);
+ sql_error(sql, 02, "SQLSTATE 42000!Create Key failed,
key '%s' already exists", name);
return SQL_ERR;
}
if (n->next->next->data.lval) { /* find unique referenced key */
@@ -530,7 +530,7 @@ table_foreign_key(mvc *sql, char *name,
rk = &ft->pkey->k;
}
if (!rk) {
- sql_error(sql, 02, "42000!CONSTRAINT FOREIGN KEY: could
not find referenced PRIMARY KEY in table '%s'\n", ft->base.name);
+ sql_error(sql, 02, "SQLSTATE 42000!CONSTRAINT FOREIGN
KEY: could not find referenced PRIMARY KEY in table '%s'\n", ft->base.name);
return SQL_ERR;
}
fk = mvc_create_fkey(sql, t, name, fkey, rk, ref_actions & 255,
(ref_actions>>8) & 255);
@@ -540,13 +540,13 @@ table_foreign_key(mvc *sql, char *name,
sql_column *c = mvc_bind_column(sql, t, nm);
if (!c) {
- sql_error(sql, 02, "42S22!CONSTRAINT FOREIGN
KEY: no such column '%s' in table '%s'\n", nm, t->base.name);
+ sql_error(sql, 02, "SQLSTATE 42S22!CONSTRAINT
FOREIGN KEY: no such column '%s' in table '%s'\n", nm, t->base.name);
return SQL_ERR;
}
mvc_create_fkc(sql, fk, c);
}
if (nms || fnms) {
- sql_error(sql, 02, "42000!CONSTRAINT FOREIGN KEY: not
all columns are handled\n");
+ sql_error(sql, 02, "SQLSTATE 42000!CONSTRAINT FOREIGN
KEY: not all columns are handled\n");
return SQL_ERR;
}
}
@@ -566,11 +566,11 @@ table_constraint_type(mvc *sql, char *na
sql_key *k;
if (kt == pkey && t->pkey) {
- sql_error(sql, 02, "42000!CONSTRAINT PRIMARY KEY: a
table can have only one PRIMARY KEY\n");
+ sql_error(sql, 02, "SQLSTATE 42000!CONSTRAINT PRIMARY
KEY: a table can have only one PRIMARY KEY\n");
return SQL_ERR;
}
if (name && mvc_bind_key(sql, ss, name)) {
- sql_error(sql, 02, "42000!CONSTRAINT %s: key '%s'
already exists",
+ sql_error(sql, 02, "SQLSTATE 42000!CONSTRAINT %s: key
'%s' already exists",
kt == pkey ? "PRIMARY KEY" : "UNIQUE",
name);
return SQL_ERR;
}
@@ -581,7 +581,7 @@ table_constraint_type(mvc *sql, char *na
sql_column *c = mvc_bind_column(sql, t, nm);
if (!c) {
- sql_error(sql, 02, "42S22!CONSTRAINT %s: no
such column '%s' for table '%s'",
+ sql_error(sql, 02, "SQLSTATE 42S22!CONSTRAINT
%s: no such column '%s' for table '%s'",
kt == pkey ? "PRIMARY KEY" :
"UNIQUE",
nm, t->base.name);
return SQL_ERR;
@@ -636,7 +636,7 @@ create_column(mvc *sql, symbol *s, sql_s
(void)ss;
if (alter && !isTable(t)) {
- sql_error(sql, 02, "42000!ALTER TABLE: cannot add column to
VIEW '%s'\n", t->base.name);
+ sql_error(sql, 02, "SQLSTATE 42000!ALTER TABLE: cannot add
column to VIEW '%s'\n", t->base.name);
return SQL_ERR;
}
if (l->h->next->next)
@@ -647,7 +647,7 @@ create_column(mvc *sql, symbol *s, sql_s
cs = find_sql_column(t, cname);
if (cs) {
- sql_error(sql, 02, "42S21!%s TABLE: a column named '%s'
already exists\n", (alter)?"ALTER":"CREATE", cname);
+ sql_error(sql, 02, "SQLSTATE 42S21!%s TABLE: a column
named '%s' already exists\n", (alter)?"ALTER":"CREATE", cname);
return SQL_ERR;
}
cs = mvc_create_column(sql, t, cname, ctype);
@@ -701,7 +701,7 @@ table_element(mvc *sql, symbol *s, sql_s
msg = "drop constraint from";
break;
}
- sql_error(sql, 02, "42000!ALTER TABLE: cannot %s %s '%s'\n",
+ sql_error(sql, 02, "SQLSTATE 42000!ALTER TABLE: cannot %s %s
'%s'\n",
msg,
isPartition(t)?"a PARTITION of a MERGE or
REPLICA TABLE":
isMergeTable(t)?"MERGE TABLE":
@@ -725,7 +725,7 @@ table_element(mvc *sql, symbol *s, sql_s
dlist *olist = n->next->data.lval;
if (!c) {
- sql_error(sql, 02, "42S22!ALTER TABLE: no such column
'%s'\n", cname);
+ sql_error(sql, 02, "SQLSTATE 42S22!ALTER TABLE: no such
column '%s'\n", cname);
return SQL_ERR;
} else {
return column_options(sql, olist, ss, t, c);
@@ -740,12 +740,12 @@ table_element(mvc *sql, symbol *s, sql_s
sql_column *c = mvc_bind_column(sql, t, cname);
if (!c) {
- sql_error(sql, 02, "42S22!ALTER TABLE: no such column
'%s'\n", cname);
+ sql_error(sql, 02, "SQLSTATE 42S22!ALTER TABLE: no such
column '%s'\n", cname);
return SQL_ERR;
}
r = symbol2string(sql, sym, &err);
if (!r) {
- (void) sql_error(sql, 02, "42000!incorrect default
value '%s'\n", err?err:"");
+ (void) sql_error(sql, 02, "SQLSTATE 42000!incorrect
default value '%s'\n", err?err:"");
if (err) _DELETE(err);
return SQL_ERR;
}
@@ -761,7 +761,7 @@ table_element(mvc *sql, symbol *s, sql_s
sql_column *c = mvc_bind_column(sql, t, cname);
if (!c) {
- sql_error(sql, 02, "42S22!ALTER TABLE: no such column
'%s'\n", cname);
+ sql_error(sql, 02, "SQLSTATE 42S22!ALTER TABLE: no such
column '%s'\n", cname);
return SQL_ERR;
}
mvc_storage(sql, c, storage_type);
@@ -776,7 +776,7 @@ table_element(mvc *sql, symbol *s, sql_s
int null = (s->token != SQL_NOT_NULL);
if (!c) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
