Changeset: 33f66b0fe4ba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=33f66b0fe4ba
Modified Files:
sql/backends/monet5/Tests/optimizers.stable.err
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/jdbc/tests/Tests/Test_Csavepoints.stable.out
sql/jdbc/tests/Tests/Test_Ctransaction.stable.out
sql/test/BugConstraints/Tests/add_constraint_1643522.stable.err
sql/test/BugConstraints/Tests/delete_primarykey_1643845.stable.err
sql/test/BugConstraints/Tests/drop_column_1643542.stable.err
sql/test/BugConstraints/Tests/update_primarykey_1643375.stable.err
sql/test/BugDay_2005-10-06_2.8/Tests/double_commit.SF-916584.stable.err
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
sql/test/BugDay_2005-10-06_2.8/Tests/string_truncate.SF-919542.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/div_by_zero.SF-987304.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/having.SF-922614.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/inserts_with_defaults.SF-921977.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/limit_in_create_view.SF-924448.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/parser_crashes_server.SF-921996.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/rollback_and_autocommit.SF-926453.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/timestamp_parsing.SF-927300.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/view_on_deleted_table.SF-938583.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.8/Tests/overflow_checking.SF-1089334.stable.err
sql/test/BugDay_2005-11-09_2.8/Tests/updating_views.SF-1023645.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/grant_public.SF-1114580.stable.err
sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
sql/test/BugDay_2005-11-09_2.9.3/Tests/having_clause_quirks.SF-947601.stable.err
sql/test/BugDay_2005-11-09_2.9.3/Tests/history_table_escape.SF-1072089.stable.err
sql/test/BugDay_2005-11-09_2.9.3/Tests/integer_overflow.SF-1048671.stable.err
sql/test/BugDay_2005-11-09_2.9.3/Tests/interval_on_time_stamp.SF-1080488.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/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
sql/test/BugTracker-2008/Tests/alter_add_constraint_should_check_existing_data.SF-2075241.stable.err
sql/test/BugTracker-2008/Tests/alter_view_not_allowed.SF-2075195.stable.err
sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err
sql/test/BugTracker-2008/Tests/count_with_order_by_and_limit_crashes.SF-2229936.stable.err
sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.err
sql/test/BugTracker-2008/Tests/insert_into_unique_column.SF-2075180.stable.err
sql/test/BugTracker-2008/Tests/invalid_qualified_column_name.SF-2183288.stable.err
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/test/BugTracker-2008/Tests/string_length_not_checked.SF-2075078.stable.err
sql/test/BugTracker-2008/Tests/too_may_nested_operators.SF-2102167.stable.err
sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err
sql/test/BugTracker-2009/Tests/ambiguous_view.stable.err
sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stable.err
sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.stable.err
sql/test/BugTracker-2009/Tests/drop-sequence-crash.SF-2854195.stable.err
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.SunOS
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
sql/test/BugTracker-2009/Tests/primekeyconstraint.SF-2783425.stable.err
sql/test/BugTracker-2009/Tests/rollback_bug.stable.err
sql/test/BugTracker-2009/Tests/rollback_mistake.SF-2814622.stable.err
sql/test/BugTracker-2009/Tests/temporary_table_leftover.SF-2734713.stable.err
sql/test/BugTracker-2009/Tests/unique_constraint_on_char.SF-2873564.stable.err
sql/test/BugTracker-2010/Tests/TypeException_with_missing_function.Bug-2674.stable.err
sql/test/BugTracker-2010/Tests/call_function_without_warning.Bug-2752.stable.err
sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err
sql/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.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/crashonschema.Bug-2547.stable.err
sql/test/BugTracker-2010/Tests/duplicate-key.Bug-2667.stable.err
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err
sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err
sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
sql/test/BugTracker-2010/Tests/second_function_existing_signature.Bug-2611.stable.err
sql/test/BugTracker-2010/Tests/select_from_seq.Bug-2730.stable.err
sql/test/BugTracker-2010/Tests/select_star.Bug-2563.stable.err
sql/test/BugTracker-2010/Tests/sequence-restart-with-null.Bug-2648.stable.err
sql/test/BugTracker-2010/Tests/subselect.Bug-2537.stable.err
sql/test/BugTracker-2010/Tests/sum_on_date_crash.Bug-2643.stable.err
sql/test/BugTracker-2010/Tests/times-crash.Bug-2586.stable.err
sql/test/BugTracker-2010/Tests/wrong_error_message_dropping_view.Bug-2713.stable.err
sql/test/BugTracker-2011/Tests/UNIQUE_Constraint_reference.Bug-2835.stable.err
sql/test/BugTracker-2011/Tests/multicolumn_constraints.Bug-2849.stable.err
sql/test/BugTracker/Tests/alter_table_add_fkey.SF-1737668.stable.err
sql/test/BugTracker/Tests/alter_table_set_not_null.SF-1997030.stable.err
sql/test/BugTracker/Tests/auto_increment.SF-1834820.stable.err
sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/copy_decimal.SF-1582957.stable.err
sql/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.stable.err
sql/test/BugTracker/Tests/crash_on_fkey_update.SF-1703497.stable.err
sql/test/BugTracker/Tests/crash_on_fkey_update2.SF-1703497.stable.err
sql/test/BugTracker/Tests/create_same_temp_tab_after_its_drop.SF-1850809.stable.err
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.err
sql/test/BugTracker/Tests/drop_system_tables.SF-1550768.stable.err
sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
sql/test/BugTracker/Tests/inserting_invalid_timestamp.SF-1363557.stable.err
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.err
sql/test/BugTracker/Tests/multivalue_insert.SF-1509864.stable.err
sql/test/BugTracker/Tests/number_null_first_row.SF-1833286.stable.err
sql/test/BugTracker/Tests/reset_session_vars.SF-1505987.stable.err
sql/test/BugTracker/Tests/revoke_role.SF-1691646.stable.err
sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.stable.err
sql/test/BugTracker/Tests/string2int_conversion.SF-1356068.stable.err
sql/test/BugTracker/Tests/table_dependency_inside_union.SF-1884382.stable.err
sql/test/BugTracker/Tests/temporary_tables.SF-1715669.stable.err
sql/test/BugTracker/Tests/update_fkey_with_value_not_in_the_pkey.SF-1734143.stable.err
sql/test/BugTracker/Tests/update_pkey_bug.SF-1733712.stable.err
sql/test/BugTracker/Tests/view_creation_using_func.SF-1714814.stable.err
sql/test/Dependencies/Tests/Dependencies.stable.err
sql/test/Tests/50ways.stable.err
sql/test/Tests/coalesce.stable.err
sql/test/Tests/coalesce.stable.err.single
sql/test/Tests/create_in_schema.stable.err
sql/test/Tests/decimal.stable.err
sql/test/Tests/default.stable.err
sql/test/Tests/null.stable.err
sql/test/Tests/procedure_syntax.stable.err
sql/test/Tests/session_vars.stable.err
sql/test/Tests/setoptimizer.stable.err
sql/test/Triggers/Tests/recursive_triggers.stable.err
sql/test/Triggers/Tests/trigger_owner.stable.err
sql/test/Triggers/Tests/triggers_schema_operations.stable.err
sql/test/Update_Delete_action/Tests/delete_restrict.stable.err
sql/test/Update_Delete_action/Tests/delete_set_default.stable.err
sql/test/Update_Delete_action/Tests/delete_set_null.stable.err
sql/test/Update_Delete_action/Tests/update_delete_set_null.stable.err
sql/test/Update_Delete_action/Tests/update_delete_set_null_crash.stable.err
sql/test/Update_Delete_action/Tests/update_restrict.stable.err
sql/test/Update_Delete_action/Tests/update_set_default.stable.err
sql/test/Update_Delete_action/Tests/update_set_default_crash.stable.err
sql/test/Update_Delete_action/Tests/update_set_null.stable.err
sql/test/Users/Tests/role2.stable.err
sql/test/Users/Tests/schema.stable.err
sql/test/Via-m/Tests/event_s07.stable.err
sql/test/Via-m/Tests/event_s11.stable.err
sql/test/Via-m/Tests/file_s10.stable.err
sql/test/Via-m/Tests/file_s12.stable.err
sql/test/Via-m/Tests/media_s12.stable.err
sql/test/Via-m/Tests/media_s14.stable.err
sql/test/Via-m/Tests/media_s16.stable.err
sql/test/Via-m/Tests/media_s18.stable.err
sql/test/Via-m/Tests/media_s19.stable.err
sql/test/Views/Tests/Views.stable.err
sql/test/bugs/Tests/alter_table_add_column.stable.err
sql/test/bugs/Tests/autocommit_illegal_statements-bug-sf-953545.stable.err
sql/test/bugs/Tests/drop_foreignkey_selfreferencing.stable.err
sql/test/bugs/Tests/foreignkey_leftjoin-bug-sf-854312.stable.err
sql/test/bugs/Tests/primary_key-bug-sf-975308.stable.err
sql/test/bugs/Tests/savepoint_rollback-bug-sf-953553.stable.err
sql/test/bugs/Tests/unique-bug-sf-1043512.stable.err
sql/test/copy/Tests/int_parse.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/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.stable.err
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.stable.err
sql/test/osm/Tests/drop_constraint_bug.stable.err
sql/test/pg_regress/Tests/char.stable.err
sql/test/pg_regress/Tests/strings_cast.stable.err
sql/test/pg_regress/Tests/strings_concat.stable.err
sql/test/pg_regress/Tests/text.stable.err
sql/test/pg_regress/Tests/varchar.stable.err
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: Dec2011
Log Message:
sql: omit MAL exception decorations in SQL error messages
As preparatory step for sending SQLSTATE with SQL errors, this commit
removes all MAL exception decorations (exception type and place) from
the messages returned by SQL. Besides being necessary, they look ugly
as well, so this is a huge improvement, as well as increased consistency
of error messages.
diffs (truncated from 4019 to 300 lines):
diff --git a/sql/backends/monet5/Tests/optimizers.stable.err
b/sql/backends/monet5/Tests/optimizers.stable.err
--- a/sql/backends/monet5/Tests/optimizers.stable.err
+++ b/sql/backends/monet5/Tests/optimizers.stable.err
@@ -12,48 +12,48 @@ stderr of test 'optimizers` in directory
# 08:05:50 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=gio --port=35043
# 08:05:50 >
-MAPI = monetdb@alf:32144
+MAPI = monetdb@sofia:38256
QUERY = set optimizer='';
ERROR = !SQLException:optimizer:Optimizer '' pipeline does not exist, use
default pipe instead
-MAPI = monetdb@alf:32144
+MAPI = monetdb@sofia:38256
QUERY = set
optimizer='costModel,coercions,emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector';
-ERROR = !SQLException:optimizer: 'inline' should be the first
-MAPI = monetdb@alf:32144
+ERROR = !SET OPTIMIZER: 'inline' should be the first
+MAPI = monetdb@sofia:38256
QUERY = set
optimizer='coercions,emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector';
-ERROR = !SQLException:optimizer: 'inline' should be the first
-MAPI = monetdb@alf:32144
+ERROR = !SET OPTIMIZER: 'inline' should be the first
+MAPI = monetdb@sofia:38256
QUERY = set
optimizer='emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector';
-ERROR = !SQLException:optimizer: 'inline' should be the first
-MAPI = monetdb@alf:32144
+ERROR = !SET OPTIMIZER: 'inline' should be the first
+MAPI = monetdb@sofia:38256
QUERY = set
optimizer='accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector';
-ERROR = !SQLException:optimizer: 'inline' should be the first
-MAPI = monetdb@alf:32144
+ERROR = !SET OPTIMIZER: 'inline' should be the first
+MAPI = monetdb@sofia:38256
QUERY = set
optimizer='aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector';
-ERROR = !SQLException:optimizer: 'inline' should be the first
-MAPI = monetdb@alf:32144
+ERROR = !SET OPTIMIZER: 'inline' should be the first
+MAPI = monetdb@sofia:38256
QUERY = set
optimizer='commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector';
-ERROR = !SQLException:optimizer: 'inline' should be the first
-MAPI = monetdb@alf:32144
+ERROR = !SET OPTIMIZER: 'inline' should be the first
+MAPI = monetdb@sofia:38256
QUERY = set optimizer='accumulators,joinPath,deadcode,reduce,garbageCollector';
-ERROR = !SQLException:optimizer: 'inline' should be the first
-MAPI = monetdb@alf:32144
+ERROR = !SET OPTIMIZER: 'inline' should be the first
+MAPI = monetdb@sofia:38256
QUERY = set optimizer='joinPath,deadcode,reduce,garbageCollector';
-ERROR = !SQLException:optimizer: 'inline' should be the first
-MAPI = monetdb@alf:32144
+ERROR = !SET OPTIMIZER: 'inline' should be the first
+MAPI = monetdb@sofia:38256
QUERY = set optimizer='deadcode,reduce,garbageCollector';
-ERROR = !SQLException:optimizer: 'inline' should be the first
-MAPI = monetdb@alf:32144
+ERROR = !SET OPTIMIZER: 'inline' should be the first
+MAPI = monetdb@sofia:38256
QUERY = set optimizer='reduce,garbageCollector';
-ERROR = !SQLException:optimizer: 'inline' should be the first
-MAPI = monetdb@alf:32144
+ERROR = !SET OPTIMIZER: 'inline' should be the first
+MAPI = monetdb@sofia:38256
QUERY = set optimizer='garbageCollector';
ERROR = !SQLException:optimizer:Optimizer 'garbageCollector' pipeline does not
exist, use default pipe instead
-MAPI = monetdb@alf:32144
+MAPI = monetdb@sofia:38256
QUERY = set
optimizer='costModel,coercions,emptySet,accessmode,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector';
-ERROR = !SQLException:optimizer: 'inline' should be the first
-MAPI = monetdb@alf:32144
+ERROR = !SET OPTIMIZER: 'inline' should be the first
+MAPI = monetdb@sofia:38256
QUERY = set
optimizer='costModel,coercions,emptySet,accessmode,commonTerms,accumulators,joinPath,deadcode,garbageCollector';
-ERROR = !SQLException:optimizer: 'inline' should be the first
+ERROR = !SET OPTIMIZER: 'inline' should be the first
# 08:05:51 >
# 08:05:51 > Done.
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -2441,7 +2441,7 @@ SQLcatalog(Client cntxt, MalBlkPtr mb, M
throw(SQL, "sql.catalog", "catalog unknown type");
}
if (msg)
- throw(SQL, "sql.catalog", "%s", msg);
+ return msg;
return MAL_SUCCEED;
}
diff --git a/sql/backends/monet5/sql_optimizer.c
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -446,7 +446,7 @@ SQLvalidatePipeline(void){
mal_set_lock(sql_contextLock,"SQL optimizer");
if (optimizers[0] && strcmp(optimizers[0],"inline") ) {
mal_unset_lock(sql_contextLock,"SQL optimizer");
- throw(SQL,"optimizer"," 'inline' should be the first\n");
+ throw(SQL,"optimizer","SET OPTIMIZER: 'inline' should be the
first\n");
}
/* deadcode should be used */
@@ -470,25 +470,25 @@ SQLvalidatePipeline(void){
else
if (strcmp(optimizers[i],"octopus") == 0){
mal_unset_lock(sql_contextLock,"SQL optimizer");
- throw(SQL,"optimizer"," 'octopus' needs Linux\n");
+ throw(SQL,"optimizer","SET OPTIMIZER: 'octopus' needs
monetdbd\n");
}
#endif
if (optimizers[0] && mitosis == TRUE && mergetable == FALSE) {
mal_unset_lock(sql_contextLock,"SQL optimizer");
- throw(SQL,"optimizer"," 'mitosis' needs 'mergetable'\n");
+ throw(SQL,"optimizer","SET OPTIMIZER: 'mitosis' needs
'mergetable'\n");
}
if (optimizers[0] && multiplex == 0){
mal_unset_lock(sql_contextLock,"SQL optimizer");
- throw(SQL,"optimizer"," 'multiplex' should be used\n");
+ throw(SQL,"optimizer","SET OPTIMIZER: 'multiplex' should be
used\n");
}
if (optimizers[0] && deadcode == FALSE ){
mal_unset_lock(sql_contextLock,"SQL optimizer");
- throw(SQL,"optimizer"," 'deadcode' should be used at least
once\n");
+ throw(SQL,"optimizer"," SET OPTIMIZER: 'deadcode' should be
used at least once\n");
}
if (optimizers[0] && garbage == FALSE ){
mal_unset_lock(sql_contextLock,"SQL optimizer");
- throw(SQL,"optimizer"," 'garbageCollector' should be used as
the last one\n");
+ throw(SQL,"optimizer","SET OPTIMIZER: 'garbageCollector' should
be used as the last one\n");
}
mal_unset_lock(sql_contextLock,"SQL optimizer");
return MAL_SUCCEED;
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1659,17 +1659,27 @@ SQLengineIntern(Client c, backend *be)
cleanup_engine:
if (msg) {
- if (getExceptionType(msg) == OPTIMIZER) {
+ enum malexception type = getExceptionType(msg);
+ if (type == OPTIMIZER) {
resetMalBlk( c->curprg->def, 1);
/* resetInstructions(c->curprg->def, 1);*/
freeVariables(c,c->curprg->def, c->glb, be->vtop);
be->language = oldlang;
c->glb = oldglb;
return SQLrecompile(c, be);
+ } else if (type == SQL) {
+ /* don't print exception decoration, just the message */
+ char *n = NULL;
+ char *o = msg;
+ while ((n = strchr(o, '\n')) != NULL) {
+ *n++ = '\0';
+ mnstr_printf(c->fdout, "!%s\n",
getExceptionMessage(o));
+ o = n;
+ }
+ if (strlen(o) != 0)
+ mnstr_printf(c->fdout, "!%s\n",
getExceptionMessage(o));
} else {
- str p = getExceptionPlace(msg);
- showException(getExceptionType(msg), p, "%s",
getExceptionMessage(msg));
- GDKfree(p);
+ dumpExceptionsToStream(c->fdout, msg);
}
showErrors(c);
m->session->status = -10;
diff --git a/sql/jdbc/tests/Tests/Test_Csavepoints.stable.out
b/sql/jdbc/tests/Tests/Test_Csavepoints.stable.out
--- a/sql/jdbc/tests/Tests/Test_Csavepoints.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Csavepoints.stable.out
@@ -24,7 +24,7 @@ Ready.
# 21:41:21 >
0. true true
-1. savepoint...failed :) SQLException:sql.trans:SAVEPOINT: not allowed in auto
commit mode
+1. savepoint...failed :) SAVEPOINT: not allowed in auto commit mode
0. false false
2. savepoint...passed :)
3. savepoint...passed :)
diff --git a/sql/jdbc/tests/Tests/Test_Ctransaction.stable.out
b/sql/jdbc/tests/Tests/Test_Ctransaction.stable.out
--- a/sql/jdbc/tests/Tests/Test_Ctransaction.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Ctransaction.stable.out
@@ -24,7 +24,7 @@ Ready.
# 22:06:14 >
0. true true
-1. commit...failed :) SQLException:sql.trans:COMMIT: not allowed in auto
commit mode
+1. commit...failed :) COMMIT: not allowed in auto commit mode
2. false false
3. commit...passed :)
4. commit...passed :)
@@ -36,7 +36,7 @@ 9. true true
10. start transaction...passed :)
11. rollback...passed :)
12. true true
-13. commit...failed :) SQLException:sql.trans:COMMIT: not allowed in auto
commit mode
+13. commit...failed :) COMMIT: not allowed in auto commit mode
# 22:16:06 >
# 22:16:06 > Done.
diff --git a/sql/test/BugConstraints/Tests/add_constraint_1643522.stable.err
b/sql/test/BugConstraints/Tests/add_constraint_1643522.stable.err
--- a/sql/test/BugConstraints/Tests/add_constraint_1643522.stable.err
+++ b/sql/test/BugConstraints/Tests/add_constraint_1643522.stable.err
@@ -12,7 +12,7 @@ stderr of test 'add_constraint_1643522`
# 12:55:03 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=33669 < add_constraint_1643522.sql
# 12:55:03 >
-MAPI = monetdb@localhost:36507
+MAPI = monetdb@sofia:39182
QUERY = alter table t1 add constraint id_p primary key(id);
ERROR = !CONSTRAINT PRIMARY KEY: key id_p already exists
diff --git a/sql/test/BugConstraints/Tests/delete_primarykey_1643845.stable.err
b/sql/test/BugConstraints/Tests/delete_primarykey_1643845.stable.err
--- a/sql/test/BugConstraints/Tests/delete_primarykey_1643845.stable.err
+++ b/sql/test/BugConstraints/Tests/delete_primarykey_1643845.stable.err
@@ -12,12 +12,12 @@ stderr of test 'delete_primarykey_164384
# 12:55:04 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=33669 < delete_primarykey_1643845.sql
# 12:55:04 >
-MAPI = monetdb@alf:32621
+MAPI = monetdb@sofia:39182
QUERY = insert into t2 values(2,33);
-ERROR = !SQLException:assert:INSERT INTO: FOREIGN KEY constraint
't2.t2_id_f_fkey' violated
-MAPI = monetdb@alf:32621
+ERROR = !INSERT INTO: FOREIGN KEY constraint 't2.t2_id_f_fkey' violated
+MAPI = monetdb@sofia:39182
QUERY = delete from t1 where id = 1;
-ERROR = !SQLException:assert:DELETE: FOREIGN KEY constraint 't2.t2_id_f_fkey'
violated
+ERROR = !DELETE: FOREIGN KEY constraint 't2.t2_id_f_fkey' violated
# 12:55:04 >
# 12:55:04 > Done.
diff --git a/sql/test/BugConstraints/Tests/drop_column_1643542.stable.err
b/sql/test/BugConstraints/Tests/drop_column_1643542.stable.err
--- a/sql/test/BugConstraints/Tests/drop_column_1643542.stable.err
+++ b/sql/test/BugConstraints/Tests/drop_column_1643542.stable.err
@@ -12,10 +12,10 @@ stderr of test 'drop_column_1643542` in
# 12:57:28 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=31322 < drop_column_1643542.sql
# 12:57:28 >
-MAPI = monetdb@pegasus:34876
+MAPI = monetdb@sofia:39182
QUERY = alter table t2 add constraint id_p primary key(id_f);
ERROR = !CONSTRAINT PRIMARY KEY: key id_p already exists
-MAPI = monetdb@pegasus:34876
+MAPI = monetdb@sofia:39182
QUERY = alter table t1 drop id;
ERROR = !ALTER TABLE: cannot drop column 'id': there are database objects
which depend on it
diff --git a/sql/test/BugConstraints/Tests/update_primarykey_1643375.stable.err
b/sql/test/BugConstraints/Tests/update_primarykey_1643375.stable.err
--- a/sql/test/BugConstraints/Tests/update_primarykey_1643375.stable.err
+++ b/sql/test/BugConstraints/Tests/update_primarykey_1643375.stable.err
@@ -12,9 +12,9 @@ stderr of test 'update_primarykey_164337
# 12:55:04 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=33669 < update_primarykey_1643375.sql
# 12:55:04 >
-MAPI = monetdb@localhost:33669
+MAPI = monetdb@sofia:39182
QUERY = update t1 set id = 0 where id =1;
-ERROR = !SQLException:assert:UPDATE: FOREIGN KEY constraint 't2.t2_id_f_fkey'
violated
+ERROR = !UPDATE: FOREIGN KEY constraint 't2.t2_id_f_fkey' violated
# 12:55:05 >
# 12:55:05 > Done.
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/double_commit.SF-916584.stable.err
b/sql/test/BugDay_2005-10-06_2.8/Tests/double_commit.SF-916584.stable.err
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/double_commit.SF-916584.stable.err
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/double_commit.SF-916584.stable.err
@@ -10,9 +10,9 @@ stderr of test 'double_commit.SF-916584`
# 14:14:57 > Mtimeout -timeout 60 MapiClient -lsql -u monetdb -P monetdb
--host=localhost --port=42862 < double_commit.SF-916584.sql
# 14:14:57 >
-MAPI = monetdb@localhost:30890
+MAPI = monetdb@sofia:39182
QUERY = COMMIT;
-ERROR = !SQLException:sql.trans:COMMIT: not allowed in auto commit mode
+ERROR = !COMMIT: not allowed in auto commit mode
# 14:14:57 >
# 14:14:57 > Done.
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
@@ -79,12 +79,12 @@ stderr of test 'mixed_type.SF-917372` in
# 19:21:06 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=33392
# 19:21:06 >
-MAPI = monetdb@alf:33392
+MAPI = monetdb@sofia:39182
QUERY = select 'a'+1;
-ERROR = !SQLException:bte:conversion of string 'a' failed
-MAPI = monetdb@alf:33392
+ERROR = !conversion of string 'a' failed
+MAPI = monetdb@sofia:39182
QUERY = select 1-'a';
-ERROR = !SQLException:bte:conversion of string 'a' failed
+ERROR = !conversion of string 'a' failed
# 19:21:06 >
# 19:21:06 > Done.
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/string_truncate.SF-919542.stable.err
b/sql/test/BugDay_2005-10-06_2.8/Tests/string_truncate.SF-919542.stable.err
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
