Changeset: cdf9cf3e6444 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cdf9cf3e6444
Modified Files:
        sql/test/BugConstraints/Tests/delete_primarykey_1643845.stable.err
        sql/test/BugConstraints/Tests/update_primarykey_1643375.stable.err
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/inserts_with_defaults.SF-921977.stable.err
        sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.stable.out
        
sql/test/BugTracker-2008/Tests/alter_add_constraint_should_check_existing_data.SF-2075241.stable.err
        sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out
        sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out
        sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
        
sql/test/BugTracker-2008/Tests/insert_into_unique_column.SF-2075180.stable.err
        sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
        
sql/test/BugTracker-2009/Tests/unique_constraint_on_char.SF-2873564.stable.err
        
sql/test/BugTracker-2011/Tests/UNIQUE_Constraint_reference.Bug-2835.stable.err
        
sql/test/BugTracker-2011/Tests/crash_in_push_exp_down.Bug-2811.stable.out
        
sql/test/BugTracker-2011/Tests/multicolumn_constraints.Bug-2849.stable.err
        sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.stable.err
        sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.err
        
sql/test/BugTracker-2014/Tests/duplicate_primary_keys.Bug-3474.stable.err
        
sql/test/BugTracker-2014/Tests/unsafe_project_push_down.Bug-3523.stable.out
        sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out
        
sql/test/BugTracker-2015/Tests/mserver-crashes-under-specific-combination-of-JOIN-and-WHERE-conditions.Bug-3872.stable.out
        sql/test/BugTracker-2015/Tests/null_is_null.Bug-3739.stable.out
        sql/test/BugTracker-2015/Tests/ukey_check_unaligned.Bug-3669.stable.err
        sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.stable.out
        sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
        
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
        sql/test/BugTracker-2016/Tests/foreign_key.Bug-3938.stable.err
        
sql/test/BugTracker-2016/Tests/name_conflict_in_union.Bug-6065.stable.out
        sql/test/BugTracker-2016/Tests/null_in_null.Bug-3900.stable.out
        sql/test/BugTracker-2016/Tests/select-in-from.Bug-6119.stable.out
        sql/test/BugTracker-2016/Tests/select-in-from.Bug-6121.stable.out
        sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.stable.err
        
sql/test/BugTracker-2017/Tests/python_loader_clobbers_default_with_null.Bug-6464.stable.err
        
sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.err
        
sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.err
        
sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.out
        
sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err
        
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-coalesce.Bug-6550.stable.out
        
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.out
        
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-extra-columns.Bug-6555.stable.out
        
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.stable.out
        
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6552.stable.out
        
sql/test/BugTracker-2018/Tests/sqlitelogictest-count-not-in.Bug-6518.stable.out
        
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in-cast.Bug-6561.stable.out
        
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in.Bug-6560.stable.out
        
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-not-null-not-in.Bug-6562.stable.out
        
sql/test/BugTracker-2018/Tests/sqlitelogictest-nested-case.Bug-6554.stable.out
        
sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out
        
sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.out
        sql/test/BugTracker/Tests/alter_table_add_fkey.SF-1737668.stable.err
        sql/test/BugTracker/Tests/auto_increment.SF-1834820.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/explain.SF-1739353.stable.out
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
        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/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/Tests/default.stable.err
        sql/test/Tests/null.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/Via-m/Tests/event_s07.stable.err
        sql/test/Via-m/Tests/event_s11.stable.err
        sql/test/Via-m/Tests/file_s02.stable.out
        sql/test/Via-m/Tests/file_s10.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/bugs/Tests/alter_table_add_column.stable.err
        sql/test/bugs/Tests/cur_date_crash-JIRA-42.stable.out
        sql/test/bugs/Tests/foreignkey_leftjoin-bug-sf-854312.stable.err
        sql/test/bugs/Tests/groupby_having-bug-sf-947600.stable.out
        sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
        sql/test/bugs/Tests/in_or_bug.stable.out
        sql/test/bugs/Tests/primary_key-bug-sf-975308.stable.err
        sql/test/bugs/Tests/unique-bug-sf-1043512.stable.err
        sql/test/copy/Tests/key_copy.stable.err
        sql/test/merge-statements/Tests/mergestmt02.stable.err
        sql/test/pg_regress/Tests/alter_table.stable.err
        sql/test/pg_regress/Tests/create_misc.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: default
Log Message:

Approve after changeset 9da7ad49ac99.


diffs (truncated from 2111 to 300 lines):

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
@@ -15,12 +15,11 @@ stderr of test 'delete_primarykey_164384
 MAPI  = monetdb@sofia:39182
 QUERY = insert into t2 values(2,33);
 ERROR = !INSERT INTO: FOREIGN KEY constraint 't2.t2_id_f_fkey' violated
-CODE  = M0M29
-MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+CODE  = 40002
+MAPI  = (monetdb) /var/tmp/mtest-225531/.s.monetdb.33874
 QUERY = delete from t1 where id = 1;
 ERROR = !DELETE: FOREIGN KEY constraint 't2.t2_id_f_fkey' violated
-CODE  = M0M29
-
+CODE  = 40002
 
 # 12:55:04 >  
 # 12:55:04 >  Done.
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
@@ -15,8 +15,7 @@ stderr of test 'update_primarykey_164337
 MAPI  = monetdb@sofia:39182
 QUERY = update t1 set id = 0 where id =1;
 ERROR = !UPDATE: FOREIGN KEY constraint 't2.t2_id_f_fkey' violated
-CODE  = M0M29
-
+CODE  = 40002
 
 # 12:55:05 >  
 # 12:55:05 >  Done.
diff --git 
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/inserts_with_defaults.SF-921977.stable.err
 
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/inserts_with_defaults.SF-921977.stable.err
--- 
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/inserts_with_defaults.SF-921977.stable.err
+++ 
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/inserts_with_defaults.SF-921977.stable.err
@@ -13,11 +13,11 @@ stderr of test 'inserts_with_defaults.SF
 MAPI  = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
 QUERY = INSERT INTO null_1 (id) VALUES(1);
 ERROR = !INSERT INTO: NOT NULL constraint violated for column null_1.text1
-CODE  = M0M29
-MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+CODE  = 40002
+MAPI  = (monetdb) /var/tmp/mtest-225531/.s.monetdb.33874
 QUERY = INSERT INTO null_1 (text1) VALUES('test');
 ERROR = !INSERT INTO: NOT NULL constraint violated for column null_1.id
-CODE  = M0M29
+CODE  = 40002
 
 # 14:29:04 >  
 # 14:29:04 >  Done.
diff --git a/sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.stable.out 
b/sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.stable.out
--- a/sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.stable.out
+++ b/sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.stable.out
@@ -34,7 +34,7 @@ stdout of test 'OOM_query.SF-2457195` in
 #(lower(lhs) like 'a%'),
 #(lower(lhs) like 'in%'),
 #(lower(lhs) like 'un%'),
-% sys.test,    sys.%2, sys.%3, sys.%4, sys.%5, sys.%6, sys.%7, sys.%10,        
sys.%11,        sys.%12,        sys.%13,        sys.%14,        sys.%15,        
sys.%16,        sys.%17 # table_name
+% sys.test,    sys.,   sys.,   sys.,   sys.,   sys.,   sys.,   sys.,   sys.,   
sys.,   sys.,   sys.,   sys.,   sys.,   sys. # table_name
 % rhs, %2,     %3,     %4,     %5,     %6,     %7,     %10,    %11,    %12,    
%13,    %14,    %15,    %16,    %17 # name
 % varchar,     boolean,        boolean,        boolean,        boolean,        
boolean,        boolean,        boolean,        boolean,        boolean,        
boolean,        boolean,        boolean,        boolean,        boolean # type
 % 5,   5,      5,      5,      5,      5,      5,      5,      5,      5,      
5,      5,      5,      5,      5 # length
@@ -103,7 +103,7 @@ stdout of test 'OOM_query.SF-2457195` in
 #(lower(lhs) like 'a%'),
 #(lower(lhs) like 'in%'),
 #(lower(lhs) like 'un%'),
-% sys.test,    sys.%2, sys.%3, sys.%4, sys.%5, sys.%6, sys.%7, sys.%10,        
sys.%11,        sys.%12,        sys.%13,        sys.%14,        sys.%15,        
sys.%16,        sys.%17 # table_name
+% sys.test,    sys.,   sys.,   sys.,   sys.,   sys.,   sys.,   sys.,   sys.,   
sys.,   sys.,   sys.,   sys.,   sys.,   sys. # table_name
 % rhs, %2,     %3,     %4,     %5,     %6,     %7,     %10,    %11,    %12,    
%13,    %14,    %15,    %16,    %17 # name
 % varchar,     boolean,        boolean,        boolean,        boolean,        
boolean,        boolean,        boolean,        boolean,        boolean,        
boolean,        boolean,        boolean,        boolean,        boolean # type
 % 5,   5,      5,      5,      5,      5,      5,      5,      5,      5,      
5,      5,      5,      5,      5 # length
diff --git 
a/sql/test/BugTracker-2008/Tests/alter_add_constraint_should_check_existing_data.SF-2075241.stable.err
 
b/sql/test/BugTracker-2008/Tests/alter_add_constraint_should_check_existing_data.SF-2075241.stable.err
--- 
a/sql/test/BugTracker-2008/Tests/alter_add_constraint_should_check_existing_data.SF-2075241.stable.err
+++ 
b/sql/test/BugTracker-2008/Tests/alter_add_constraint_should_check_existing_data.SF-2075241.stable.err
@@ -87,12 +87,12 @@ CODE  = 40002
 MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
 QUERY = alter table A add constraint test1 primary key (test);
 ERROR = !UPDATE: PRIMARY KEY constraint 'a.test1' violated
-CODE  = M0M29
-MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+CODE  = 40002
+MAPI  = (monetdb) /var/tmp/mtest-225531/.s.monetdb.33874
 QUERY = insert into A (test) values (1);
 ERROR = !INSERT INTO: PRIMARY KEY constraint 'a.test1' violated
-CODE  = M0M29
-MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+CODE  = 40002
+MAPI  = (monetdb) /var/tmp/mtest-225531/.s.monetdb.33874
 QUERY = alter table A add constraint test1 primary key (test, id);
 ERROR = !ALTER TABLE: NOT NULL constraint violated for column a.test
 CODE  = 40002
@@ -107,7 +107,7 @@ CODE  = 40002
 MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
 QUERY = insert into t2 select * from t1;
 ERROR = !INSERT INTO: PRIMARY KEY constraint 't2.t2_id_pkey' violated
-CODE  = M0M29
+CODE  = 40002
 
 # 16:00:59 >  
 # 16:00:59 >  Done.
diff --git 
a/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out 
b/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out
--- a/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out
+++ b/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out
@@ -24,7 +24,7 @@ stdout of test 'auto_coersion_bug.SF-207
 
 [ 1    ]
 #SELECT CAST(2 * q1 AS BIGINT) AS q FROM A;
-% sys.%2 # table_name
+% sys. # table_name
 % q # name
 % bigint # type
 % 16 # length
@@ -32,8 +32,8 @@ stdout of test 'auto_coersion_bug.SF-207
 [ 1    ]
 #SELECT SUM(2 * COL1 * COL2)
 #FROM A2;
-% sys.%2 # table_name
-% %2 # name
+% sys.%1 # table_name
+% %1 # name
 % bigint # type
 % 6 # length
 [ 246864       ]
@@ -41,8 +41,8 @@ stdout of test 'auto_coersion_bug.SF-207
 #SELECT (-COL2+COL1)
 #FROM A
 #WHERE COL3 IS NULL;
-% sys.%1 # table_name
-% %1 # name
+% sys. # table_name
+% %2 # name
 % bigint # type
 % 4 # length
 [ 3000 ]
diff --git a/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out 
b/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out
--- a/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out
+++ b/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out
@@ -28,13 +28,13 @@ stdout of test 'extract_bug.SF-2075266` 
 [ 1    ]
 #SELECT CAST( EXTRACT (SECOND FROM FIPS2)
 #* 1000000 - 999990 as decimal(18,6)) FROM A;
-% sys.%1 # table_name
+% sys. # table_name
 % %1 # name
 % decimal # type
 % 20 # length
 [ 9.000000     ]
 #select EXTRACT (SECOND FROM FIPS2) FROM A;
-% sys.%1 # table_name
+% sys. # table_name
 % %1 # name
 % decimal # type
 % 11 # length
diff --git 
a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out 
b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
--- a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
+++ b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
@@ -25,8 +25,8 @@ stdout of test 'groupby_with_NULL.SF-215
 [ 1    ]
 [ 1    ]
 #select color, null as something, cast( sum(count) as bigint) from testola 
group by color;
-% sys.testola, .%4,    sys.%2 # table_name
-% color,       something,      %2 # name
+% sys.testola, .,      sys.%1 # table_name
+% color,       something,      %1 # name
 % varchar,     char,   bigint # type
 % 4,   0,      2 # length
 [ "blue",      NULL,   12      ]
diff --git 
a/sql/test/BugTracker-2008/Tests/insert_into_unique_column.SF-2075180.stable.err
 
b/sql/test/BugTracker-2008/Tests/insert_into_unique_column.SF-2075180.stable.err
--- 
a/sql/test/BugTracker-2008/Tests/insert_into_unique_column.SF-2075180.stable.err
+++ 
b/sql/test/BugTracker-2008/Tests/insert_into_unique_column.SF-2075180.stable.err
@@ -83,19 +83,19 @@ stderr of test 'insert_into_unique_colum
 MAPI  = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
 QUERY = INSERT INTO FEAT16 VALUES (2);
 ERROR = !INSERT INTO: UNIQUE constraint 'feat16.feat16_pnum_unique' violated
-CODE  = M0M29
-MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+CODE  = 40002
+MAPI  = (monetdb) /var/tmp/mtest-225531/.s.monetdb.33874
 QUERY = INSERT INTO FEAT16 VALUES (NULL, 2);
 ERROR = !INSERT INTO: UNIQUE constraint 'feat16.feat16_pnum_unique' violated
-CODE  = M0M29
-MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+CODE  = 40002
+MAPI  = (monetdb) /var/tmp/mtest-225531/.s.monetdb.33874
 QUERY = INSERT INTO FEAT16 VALUES (2, 2);
 ERROR = !INSERT INTO: UNIQUE constraint 'feat16.feat16_age_pnum_unique' 
violated
-CODE  = M0M29
-MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+CODE  = 40002
+MAPI  = (monetdb) /var/tmp/mtest-225531/.s.monetdb.33874
 QUERY = insert into t2 select * from t1;
 ERROR = !INSERT INTO: UNIQUE constraint 't2.t2_id_unique' violated
-CODE  = M0M29
+CODE  = 40002
 
 # 00:04:36 >  
 # 00:04:36 >  Done.
diff --git 
a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out 
b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
--- a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
+++ b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
@@ -38,7 +38,7 @@ stdout of test 'explain_gives_crash.SF-2
 % 130 # length
 function user.s8_0():void;
     X_1:void := querylog.define("explain alter table blabla add constraint 
dada unique (id);":str, "sequential_pipe":str, 40:int);
-    sqlcatalog.alter_table("sys":str, "blabla":str, nil:ptr, 0:int);
+    sqlcatalog.alter_table("sys":str, "blabla":str, 0x7f72801d2510:ptr, 0:int);
     X_46:bat[:int] := bat.new(nil:int);
     (X_47:bat[:oid], C_48:bat[:oid], X_49:bat[:lng]) := 
group.groupdone(X_46:bat[:int]);
     X_50:lng := aggr.sum(X_49:bat[:lng]);
@@ -46,7 +46,7 @@ function user.s8_0():void;
     X_52:bit := calc.isnil(X_50:lng);
     X_53:lng := calc.ifthenelse(X_52:bit, 0:lng, X_50:lng);
     X_55:bit := calc.!=(X_54:lng, X_53:lng);
-    sql.assert(X_55:bit, "UPDATE: UNIQUE constraint 'blabla.dada' 
violated":str);
+    sql.assert(X_55:bit, "40002!UPDATE: UNIQUE constraint 'blabla.dada' 
violated":str);
     sql.exportOperation();
 end user.s8_0;
 #inline               actions= 0 time=1 usec 
@@ -77,7 +77,7 @@ end user.s8_0;
 % 130 # length
 function user.s10_0():void;
     X_1:void := querylog.define("explain alter table blabla add constraint 
dada unique (id);":str, "sequential_pipe":str, 40:int);
-    sqlcatalog.alter_table("sys":str, "blabla":str, nil:ptr, 0:int);
+    sqlcatalog.alter_table("sys":str, "blabla":str, 0x7f72801a19f0:ptr, 0:int);
     X_46:bat[:int] := bat.new(nil:int);
     (X_47:bat[:oid], C_48:bat[:oid], X_49:bat[:lng]) := 
group.groupdone(X_46:bat[:int]);
     X_50:lng := aggr.sum(X_49:bat[:lng]);
@@ -85,7 +85,7 @@ function user.s10_0():void;
     X_52:bit := calc.isnil(X_50:lng);
     X_53:lng := calc.ifthenelse(X_52:bit, 0:lng, X_50:lng);
     X_55:bit := calc.!=(X_54:lng, X_53:lng);
-    sql.assert(X_55:bit, "UPDATE: UNIQUE constraint 'blabla.dada' 
violated":str);
+    sql.assert(X_55:bit, "40002!UPDATE: UNIQUE constraint 'blabla.dada' 
violated":str);
     sql.exportOperation();
 end user.s10_0;
 #inline               actions= 0 time=0 usec 
@@ -128,7 +128,7 @@ end user.s10_0;
 % 130 # length
 function user.s18_0():void;
     X_1:void := querylog.define("explain alter table blabla add constraint 
dada unique (id);":str, "sequential_pipe":str, 40:int);
-    sqlcatalog.alter_table("sys":str, "blabla":str, nil:ptr, 0:int);
+    sqlcatalog.alter_table("sys":str, "blabla":str, 0x7f72801d2510:ptr, 0:int);
     X_46:bat[:int] := bat.new(nil:int);
     (X_47:bat[:oid], C_48:bat[:oid], X_49:bat[:lng]) := 
group.groupdone(X_46:bat[:int]);
     X_50:lng := aggr.sum(X_49:bat[:lng]);
@@ -136,7 +136,7 @@ function user.s18_0():void;
     X_52:bit := calc.isnil(X_50:lng);
     X_53:lng := calc.ifthenelse(X_52:bit, 0:lng, X_50:lng);
     X_55:bit := calc.!=(X_54:lng, X_53:lng);
-    sql.assert(X_55:bit, "UPDATE: UNIQUE constraint 'blabla.dada' 
violated":str);
+    sql.assert(X_55:bit, "40002!UPDATE: UNIQUE constraint 'blabla.dada' 
violated":str);
     sql.exportOperation();
 end user.s18_0;
 #inline               actions= 0 time=0 usec 
diff --git 
a/sql/test/BugTracker-2009/Tests/unique_constraint_on_char.SF-2873564.stable.err
 
b/sql/test/BugTracker-2009/Tests/unique_constraint_on_char.SF-2873564.stable.err
--- 
a/sql/test/BugTracker-2009/Tests/unique_constraint_on_char.SF-2873564.stable.err
+++ 
b/sql/test/BugTracker-2009/Tests/unique_constraint_on_char.SF-2873564.stable.err
@@ -78,23 +78,23 @@ stderr of test 'unique_constraint_on_cha
 MAPI  = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
 QUERY = insert into keytest (date_added, hash_key, dimension1, dimension2, 
metric1, metric2) VALUES (1, 'a', 1, 1, 2, 2);
 ERROR = !INSERT INTO: UNIQUE constraint 'keytest.key_test' violated
-CODE  = M0M29
-MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+CODE  = 40002
+MAPI  = (monetdb) /var/tmp/mtest-225531/.s.monetdb.33874
 QUERY = CREATE UNIQUE INDEX unique_key_test ON test.keytest (date_added, 
hash_key);
 ERROR = !CREATE INDEX: no such schema 'test'
 CODE  = 3F000
 MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
 QUERY = insert into keytest (date_added, hash_key, dimension1, dimension2, 
metric1, metric2) VALUES (1, 'a', 1, 1, 2, 2);
 ERROR = !INSERT INTO: UNIQUE constraint 'keytest.key_test' violated
-CODE  = M0M29
-MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+CODE  = 40002
+MAPI  = (monetdb) /var/tmp/mtest-225531/.s.monetdb.33874
 QUERY = insert into keytest (date_added, hash_key, dimension1, dimension2, 
metric1, metric2) VALUES (1, 'a', 1, 1, 2, 2);
 ERROR = !INSERT INTO: UNIQUE constraint 'keytest.key_test' violated
-CODE  = M0M29
-MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+CODE  = 40002
+MAPI  = (monetdb) /var/tmp/mtest-225531/.s.monetdb.33874
 QUERY = insert into keytest2 (date_added, key, dimension1, dimension2, 
metric1, metric2) VALUES (1, 1, 1, 1, 2, 2);
 ERROR = !INSERT INTO: UNIQUE constraint 'keytest2.key_test2' violated
-CODE  = M0M29
+CODE  = 40002
 
 # 21:33:07 >  
 # 21:33:07 >  Done.
diff --git 
a/sql/test/BugTracker-2011/Tests/UNIQUE_Constraint_reference.Bug-2835.stable.err
 
b/sql/test/BugTracker-2011/Tests/UNIQUE_Constraint_reference.Bug-2835.stable.err
--- 
a/sql/test/BugTracker-2011/Tests/UNIQUE_Constraint_reference.Bug-2835.stable.err
+++ 
b/sql/test/BugTracker-2011/Tests/UNIQUE_Constraint_reference.Bug-2835.stable.err
@@ -35,15 +35,15 @@ stderr of test 'UNIQUE_Constraint_refere
 MAPI  = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
 QUERY = INSERT INTO "Bug_2835_1" VALUES (0);
 ERROR = !INSERT INTO: UNIQUE constraint 'Bug_2835_1.unique' violated
-CODE  = M0M29
-MAPI  = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+CODE  = 40002
+MAPI  = (monetdb) /var/tmp/mtest-225531/.s.monetdb.33874
 QUERY = insert into "Bug_2835_2" values (1);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to