Changeset: 493e9cc28c87 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=493e9cc28c87
Modified Files:
Branch: default
Log Message:
merged error message & normalization filter fixes from Jun2010
diffs (truncated from 389 to 300 lines):
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/BugDay_2005-10-06_2.9.3/Tests/inserts_with_defaults.SF-921977.stable.err
---
a/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/inserts_with_defaults.SF-921977.stable.err
Fri Jul 30 07:39:32 2010 +0200
+++
b/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/inserts_with_defaults.SF-921977.stable.err
Fri Jul 30 08:08:40 2010 +0200
@@ -12,10 +12,10 @@
MAPI = mone...@localhost:35781
QUERY = INSERT INTO null_1 (id) VALUES(1);
-ERROR = !ERROR: INSERT INTO: NOT NULL constraint violated for column
null_1.text1
+ERROR = !SQLException:assert:INSERT INTO: NOT NULL constraint violated for
column null_1.text1
MAPI = mone...@localhost:35781
QUERY = INSERT INTO null_1 (text1) VALUES('test');
-ERROR = !ERROR: INSERT INTO: NOT NULL constraint violated for column null_1.id
+ERROR = !SQLException:assert:INSERT INTO: NOT NULL constraint violated for
column null_1.id
# 14:29:04 >
# 14:29:04 > Done.
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/BugDay_2005-10-06_2.9.3/Tests/parser_crashes_server.SF-921996.stable.err
---
a/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/parser_crashes_server.SF-921996.stable.err
Fri Jul 30 07:39:32 2010 +0200
+++
b/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/parser_crashes_server.SF-921996.stable.err
Fri Jul 30 08:08:40 2010 +0200
@@ -12,7 +12,7 @@
MAPI = mone...@localhost:45579
QUERY = CREATE TABLE bounds_test (
-ERROR = !syntax error, unexpected $end, expecting CHECK or FOREIGN or PRIMARY
or UNIQUE in: "create table bounds_test (
+ERROR = !syntax error, unexpected $end, expecting FOREIGN or PRIMARY or UNIQUE
in: "create table bounds_test (
!id int not null auto_increment primary key,
!"
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err
--- a/sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err Fri Jul
30 07:39:32 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err Fri Jul
30 08:08:40 2010 +0200
@@ -76,7 +76,7 @@
ERROR = !CONNECT TO: DEFAULT is not supported!
MAPI = mone...@alf:30038
QUERY = connect to 'whatever' port 50001 database 'nonexisting' USER 'monetdb'
PASSWORD 'monetdb' LANGUAGE 'mal';
-ERROR = !IOException:mapi.connect:Could not connect: gethostbyname failed:
Unknown host
+ERROR = !IOException:mapi.connect:Could not connect: getaddrinfo failed: Name
or service not known
MAPI = mone...@alf:30038
QUERY = disconnect 'whatever';
ERROR = !DISCONNECT CATALOG: no such db_alias 'whatever'
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/BugTracker/Tests/alter_table_add_fkey.SF-1737668.stable.err
--- a/sql/src/test/BugTracker/Tests/alter_table_add_fkey.SF-1737668.stable.err
Fri Jul 30 07:39:32 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/alter_table_add_fkey.SF-1737668.stable.err
Fri Jul 30 08:08:40 2010 +0200
@@ -14,10 +14,10 @@
MAPI = mone...@koala:32311
QUERY = alter table t1 add constraint fk_t1_id_t2_id FOREIGN key(id)
references t2(id);
-ERROR = !SQLException:assert:INSERT INTO: FOREIGN KEY constraint
't1.fk_t1_id_t2_id' violated
+ERROR = !SQLException:assert:UPDATE: FOREIGN KEY constraint
't1.fk_t1_id_t2_id' violated
MAPI = mone...@koala:32311
QUERY = alter table t1 add constraint fk_t1_age_t3_age FOREIGN key(age)
references t3(age);
-ERROR = !SQLException:assert:INSERT INTO: FOREIGN KEY constraint
't1.fk_t1_age_t3_age' violated
+ERROR = !SQLException:assert:UPDATE: FOREIGN KEY constraint
't1.fk_t1_age_t3_age' violated
# 13:25:13 >
# 13:25:13 > Done.
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/BugTracker/Tests/authorization.SF-1430616.stable.err
--- a/sql/src/test/BugTracker/Tests/authorization.SF-1430616.stable.err Fri Jul
30 07:39:32 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/authorization.SF-1430616.stable.err Fri Jul
30 08:08:40 2010 +0200
@@ -90,7 +90,7 @@
Error on line 4: DROP USER: 'voc' owns a schema
Error on line 5: current transaction is aborted (please ROLLBACK)
-Error on line 7: COMMIT: failed
+Error on line 7: SQLException:sql.trans:COMMIT: failed
ERROR: COMMIT: transaction is aborted, will ROLLBACK instead
# 11:28:18 >
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/BugTracker/Tests/broken_join.SF-1373391.stable.err
--- a/sql/src/test/BugTracker/Tests/broken_join.SF-1373391.stable.err Fri Jul
30 07:39:32 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/broken_join.SF-1373391.stable.err Fri Jul
30 08:08:40 2010 +0200
@@ -12,7 +12,7 @@
MAPI = mone...@localhost:31379
QUERY = select urlid,clicktime from
-ERROR = !syntax error, unexpected ')', expecting INTERSECT or EXCEPT or UNION
in: "select urlid,clicktime from
+ERROR = !syntax error, unexpected ')', expecting SCOLON in: "select
urlid,clicktime from
!(clicks left outer join urls on
!urls.suburl0x0=clicks.suburl0x0 and
!urls.suburl0x1=clicks.suburl0x1 and
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/BugTracker/Tests/multivalue_insert.SF-1509864.stable.err
--- a/sql/src/test/BugTracker/Tests/multivalue_insert.SF-1509864.stable.err
Fri Jul 30 07:39:32 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/multivalue_insert.SF-1509864.stable.err
Fri Jul 30 08:08:40 2010 +0200
@@ -12,7 +12,7 @@
MAPI = mone...@localhost:35185
QUERY = insert into test2 values (1),(1),(1);
-ERROR = !ERROR: INSERT INTO: UNIQUE constraint 'test2.test2_t_unique' violated
+ERROR = !SQLException:assert:INSERT INTO: UNIQUE constraint
'test2.test2_t_unique' violated
# 21:26:30 >
# 21:26:30 > Done.
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/BugTracker/Tests/number_null_first_row.SF-1833286.stable.err
--- a/sql/src/test/BugTracker/Tests/number_null_first_row.SF-1833286.stable.err
Fri Jul 30 07:39:32 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/number_null_first_row.SF-1833286.stable.err
Fri Jul 30 08:08:40 2010 +0200
@@ -14,10 +14,10 @@
MAPI = mone...@koala:37532
QUERY = INSERT into "decimal_null" values (NULL);
-ERROR = !ERROR: INSERT INTO: NOT NULL constraint violated for column
decimal_null.promoid
+ERROR = !SQLException:assert:INSERT INTO: NOT NULL constraint violated for
column decimal_null.promoid
MAPI = mone...@koala:37532
QUERY = INSERT into "decimal_null" values (NULL);
-ERROR = !ERROR: INSERT INTO: NOT NULL constraint violated for column
decimal_null.promoid
+ERROR = !SQLException:assert:INSERT INTO: NOT NULL constraint violated for
column decimal_null.promoid
# 21:23:57 >
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/Update_Delete_action/Tests/delete_set_null.stable.err
--- a/sql/src/test/Update_Delete_action/Tests/delete_set_null.stable.err
Fri Jul 30 07:39:32 2010 +0200
+++ b/sql/src/test/Update_Delete_action/Tests/delete_set_null.stable.err
Fri Jul 30 08:08:40 2010 +0200
@@ -12,10 +12,10 @@
MAPI = mone...@koala:39231
QUERY = delete from t1 where id > 2 and id < 5;
-ERROR = !ERROR: UPDATE: NOT NULL constraint violated for column 't2.id'
+ERROR = !SQLException:assert:UPDATE: NOT NULL constraint violated for column
't2.id'
MAPI = mone...@koala:39231
QUERY = delete from t1 where id = 1;
-ERROR = !ERROR: UPDATE: NOT NULL constraint violated for column 't2.id'
+ERROR = !SQLException:assert:UPDATE: NOT NULL constraint violated for column
't2.id'
# 11:11:31 >
# 11:11:31 > Done.
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/Update_Delete_action/Tests/update_delete_set_null.stable.err
--- a/sql/src/test/Update_Delete_action/Tests/update_delete_set_null.stable.err
Fri Jul 30 07:39:32 2010 +0200
+++ b/sql/src/test/Update_Delete_action/Tests/update_delete_set_null.stable.err
Fri Jul 30 08:08:40 2010 +0200
@@ -12,10 +12,10 @@
MAPI = mone...@koala:39231
QUERY = update t1 set id = 10 where id =3;
-ERROR = !ERROR: UPDATE: NOT NULL constraint violated for column 't2.id'
+ERROR = !SQLException:assert:UPDATE: NOT NULL constraint violated for column
't2.id'
MAPI = mone...@koala:39231
QUERY = delete from t1 where id = 4;
-ERROR = !ERROR: UPDATE: NOT NULL constraint violated for column 't2.id'
+ERROR = !SQLException:assert:UPDATE: NOT NULL constraint violated for column
't2.id'
# 11:12:56 >
# 11:12:56 > Done.
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/Update_Delete_action/Tests/update_delete_set_null_crash.stable.err
---
a/sql/src/test/Update_Delete_action/Tests/update_delete_set_null_crash.stable.err
Fri Jul 30 07:39:32 2010 +0200
+++
b/sql/src/test/Update_Delete_action/Tests/update_delete_set_null_crash.stable.err
Fri Jul 30 08:08:40 2010 +0200
@@ -14,10 +14,10 @@
MAPI = mone...@koala:39231
QUERY = update t1 set id = 10 where id =3;
-ERROR = !ERROR: UPDATE: NOT NULL constraint violated for column 't3.id'
+ERROR = !SQLException:assert:UPDATE: NOT NULL constraint violated for column
't3.id'
MAPI = mone...@koala:39231
QUERY = delete from t2 where id = 4;
-ERROR = !ERROR: UPDATE: NOT NULL constraint violated for column 't3.id'
+ERROR = !SQLException:assert:UPDATE: NOT NULL constraint violated for column
't3.id'
# 18:10:02 >
# 18:10:02 > Done.
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/Update_Delete_action/Tests/update_set_default.stable.err
--- a/sql/src/test/Update_Delete_action/Tests/update_set_default.stable.err
Fri Jul 30 07:39:32 2010 +0200
+++ b/sql/src/test/Update_Delete_action/Tests/update_set_default.stable.err
Fri Jul 30 08:08:40 2010 +0200
@@ -12,13 +12,13 @@
MAPI = mone...@koala:33780
QUERY = update t1 set id = 10 where id =3;
-ERROR = !ERROR: UPDATE: FOREIGN KEY constraint 't2.t2_id_fkey' violated
+ERROR = !SQLException:assert:UPDATE: FOREIGN KEY constraint 't2.t2_id_fkey'
violated
MAPI = mone...@koala:33780
QUERY = update t1 set id = 11 where id =4;
-ERROR = !ERROR: UPDATE: FOREIGN KEY constraint 't2.t2_id_fkey' violated
+ERROR = !SQLException:assert:UPDATE: FOREIGN KEY constraint 't2.t2_id_fkey'
violated
MAPI = mone...@koala:33780
QUERY = update t2 set id = 7 where id =5;
-ERROR = !ERROR: UPDATE: FOREIGN KEY constraint 't3.t3_id_fkey' violated
+ERROR = !SQLException:assert:UPDATE: FOREIGN KEY constraint 't3.t3_id_fkey'
violated
# 11:13:36 >
# 11:13:36 > Done.
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/Update_Delete_action/Tests/update_set_default_crash.stable.err
---
a/sql/src/test/Update_Delete_action/Tests/update_set_default_crash.stable.err
Fri Jul 30 07:39:32 2010 +0200
+++
b/sql/src/test/Update_Delete_action/Tests/update_set_default_crash.stable.err
Fri Jul 30 08:08:40 2010 +0200
@@ -14,10 +14,10 @@
MAPI = mone...@koala:39231
QUERY = delete from t1 where id = 4;
-ERROR = !ERROR: UPDATE: PRIMARY KEY constraint 't2.t2_id_pkey' violated
+ERROR = !SQLException:assert:UPDATE: PRIMARY KEY constraint 't2.t2_id_pkey'
violated
MAPI = mone...@koala:39231
QUERY = update t1 set id = 12 where id =3;
-ERROR = !ERROR: UPDATE: NOT NULL constraint violated for column 't2.id'
+ERROR = !SQLException:assert:UPDATE: NOT NULL constraint violated for column
't2.id'
# 18:14:38 >
# 18:14:38 > Done.
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/Update_Delete_action/Tests/update_set_null.stable.err
--- a/sql/src/test/Update_Delete_action/Tests/update_set_null.stable.err
Fri Jul 30 07:39:32 2010 +0200
+++ b/sql/src/test/Update_Delete_action/Tests/update_set_null.stable.err
Fri Jul 30 08:08:40 2010 +0200
@@ -12,7 +12,7 @@
MAPI = mone...@koala:39231
QUERY = update t1 set id = 10 where id =1;
-ERROR = !ERROR: UPDATE: NOT NULL constraint violated for column 't2.id'
+ERROR = !SQLException:assert:UPDATE: NOT NULL constraint violated for column
't2.id'
# 11:14:02 >
# 11:14:02 > Done.
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/bugs/Tests/primary_key-bug-sf-975308.stable.err
--- a/sql/src/test/bugs/Tests/primary_key-bug-sf-975308.stable.err Fri Jul
30 07:39:32 2010 +0200
+++ b/sql/src/test/bugs/Tests/primary_key-bug-sf-975308.stable.err Fri Jul
30 08:08:40 2010 +0200
@@ -12,10 +12,10 @@
MAPI = mone...@localhost:35185
QUERY = INSERT INTO test_pk values( 2,4 );
-ERROR = !ERROR: INSERT INTO: PRIMARY KEY constraint 'test_pk.test_pk_x_y_pkey'
violated
+ERROR = !SQLException:assert:INSERT INTO: PRIMARY KEY constraint
'test_pk.test_pk_x_y_pkey' violated
MAPI = mone...@localhost:35185
QUERY = UPDATE test_pk SET x = 1;
-ERROR = !ERROR: UPDATE: PRIMARY KEY constraint 'test_pk.test_pk_x_y_pkey'
violated
+ERROR = !SQLException:assert:UPDATE: PRIMARY KEY constraint
'test_pk.test_pk_x_y_pkey' violated
# 16:06:04 >
# 16:06:04 > Done.
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/bugs/Tests/profile_bug-SF.1314649.stable.err
--- a/sql/src/test/bugs/Tests/profile_bug-SF.1314649.stable.err Fri Jul 30
07:39:32 2010 +0200
+++ b/sql/src/test/bugs/Tests/profile_bug-SF.1314649.stable.err Fri Jul 30
08:08:40 2010 +0200
@@ -12,7 +12,7 @@
MAPI = mone...@eir:34031
QUERY = record select 1;
-ERROR = !syntax error, unexpected SQL_RECORD in: "record"
+ERROR = !syntax error, unexpected IDENT in: "record"
MAPI = mone...@eir:34031
QUERY = select query, user from history;
ERROR = !current transaction is aborted (please ROLLBACK)
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/bugs/Tests/unique-bug-sf-1043512.stable.err
--- a/sql/src/test/bugs/Tests/unique-bug-sf-1043512.stable.err Fri Jul 30
07:39:32 2010 +0200
+++ b/sql/src/test/bugs/Tests/unique-bug-sf-1043512.stable.err Fri Jul 30
08:08:40 2010 +0200
@@ -12,10 +12,10 @@
MAPI = mone...@localhost:45579
QUERY = insert into unique_test values (1);
-ERROR = !ERROR: INSERT INTO: UNIQUE constraint
'unique_test.unique_test_id_unique' violated
+ERROR = !SQLException:assert:INSERT INTO: UNIQUE constraint
'unique_test.unique_test_id_unique' violated
MAPI = mone...@localhost:45579
QUERY = insert into unique_test values (1);
-ERROR = !ERROR: INSERT INTO: UNIQUE constraint
'unique_test.unique_test_id_unique' violated
+ERROR = !SQLException:assert:INSERT INTO: UNIQUE constraint
'unique_test.unique_test_id_unique' violated
# 17:24:53 >
# 17:24:53 > Done.
diff -r 7abf45a5749a -r 493e9cc28c87
sql/src/test/pg_regress/Tests/text.stable.err
--- a/sql/src/test/pg_regress/Tests/text.stable.err Fri Jul 30 07:39:32
2010 +0200
+++ b/sql/src/test/pg_regress/Tests/text.stable.err Fri Jul 30 08:08:40
2010 +0200
@@ -76,10 +76,10 @@
MAPI = mone...@pegasus:35864
QUERY = SELECT text 'this is a text string' = text 'this is a text string' AS
true;
-ERROR = !syntax error, unexpected CLOB in: "select text"
+ERROR = !syntax error, unexpected STRING, expecting SCOLON in: "select text
'this is a text string'"
MAPI = mone...@pegasus:35864
QUERY = SELECT text 'this is a text string' = text 'this is a text strin' AS
false;
-ERROR = !syntax error, unexpected CLOB in: "select text"
+ERROR = !syntax error, unexpected STRING, expecting SCOLON in: "select text
'this is a text string'"
# 22:26:27 >
# 22:26:27 > Done.
diff -r 7abf45a5749a -r 493e9cc28c87 testing/src/Mfilter.py.in
--- a/testing/src/Mfilter.py.in Fri Jul 30 07:39:32 2010 +0200
+++ b/testing/src/Mfilter.py.in Fri Jul 30 08:08:40 2010 +0200
@@ -117,69 +117,71 @@
# element of "norm_out", unless the latter is "None" (then, the
# respective match is kept as-is).
norm_in = re.compile('(?:'+')|(?:'.join([
-# r'^(ERROR = !| *!|)(syntax|parse|parse error: syntax)( error, )(unexpected
.* on line |unexpected .* in: )?(.*)\n', # 01: 5
+## r'^(ERROR = !| *!|)(syntax|parse|parse error: syntax)( error, )(unexpected
.* on line |unexpected .* in: )?(.*)\n', # 01: 5
r'^(ERROR = !| *!|)(syntax|parse|parse error: syntax)( error,
)(?:unexpected .* on line |unexpected .* in: )?(?:.*)\n', #
01: 3
r'^(!ERROR: .*: [0-9]+ times inserted nil due to errors at tuples
)([0-9]+)(\..*)\n', # 02:
3
- r'^( *!ERROR: shred: cannot stat .*: )(No such file or directory|Error
0)\n', # 03a: 2
- r'^(ERROR =| )( !ERROR: | !SQLException:assert:| !SQLException:sql:
| !SQLException:| !MALException:)([^:]+)(: *)([^ ].*)\n', # 03b: 5
- r'^(Connection warning:.*\()(mserver_mal|mserver_sql)(\).*)\n',
# 04: 3
- r'^(ERROR: I/O warning : failed to load external entity ")(.*)(".*)\n',
# 05: 3
- r'^(ERROR: shred:mainSHREDDER: xmlCreateURLParserCtxt\(")(.*)("\)
failed.*)\n', # 06:
3
- r'^(ERROR: err:FORG0001: could not cast value)( from )?(.*)( to
)(.*)(\..*)\n', #
07: 6
- r"^(type error: can't cast type ')(.*)(' to type ')(.*)('.*)\n",
# 08: 5
- r'^(type error: no variant of function )(.*)( accepts the given argument
type\(s\): )(?:.*)\n', # 09: 3
- r'^(type error: illegal arguments for function )(?:.*)\n',
# 10: 1
- r"^(ERROR: pcre_replace: .flags. contains invalid character
')(.*)('.*)\n",
# 11: 3
- r"^(ERROR: err:XPTY0004: illegal qname ')(.*)('.*)\n",
# 12: 3
- r'^(ERROR: err:XQDY0025: attribute names are not unique )(in constructed
element )?(?:.*)\n', # 13: 2
- r"^(error in function application: at )(.*)(: wrong number of arguments
for function `)(.*)(' \(expected )(.*)(, got )(.*)(\).*)\n", # 14: 9
- r'^(error in function application: at )(.*)(?:: )(?:.*)(?: expects at
least .* arguments? \(got .*\).*)\n', # 15: 2
- r'^(ERROR: err:FOER0000)(?:.*)\n',
# 16: 1
- r"^(illegal reference to context node: at )(.*)(: )(``.'' is
unbound|position information not available)(.*)\n",
# 17: 5
- r'^(variable\(s\) out of scope or unknown: at )(?:.*)\n',
# 18: 1
- r'^(bad usage of XML namespaces: at )(?:.*)\n',
# 19: 1
- r'^(QUERY = import rpc-module namespace xrpc =
"http://www.monetdb.nl/basicfunctions"; at
")(/.*)(/tests/XRpc/basic_queries/Tests/basicfunctions.xq";)\n', # 20: 3
- r"^(QUERY = connect)( to|)( ')(localhost)(' port )([0-9]+)( .*)\n",
# 21: 7
+# r'^( *!ERROR: shred: cannot stat .*: )(No such file or directory|Error
0)\n', # 03: 2
+# r'^(Connection warning:.*\()(mserver_mal|mserver_sql)(\).*)\n',
# 04: 3
+# r'^(ERROR: I/O warning : failed to load external entity ")(.*)(".*)\n',
# 05: 3
+# r'^(ERROR: shred:mainSHREDDER: xmlCreateURLParserCtxt\(")(.*)("\)
failed.*)\n', # 06:
3
+# r'^(ERROR: err:FORG0001: could not cast value)( from )?(.*)( to
)(.*)(\..*)\n', #
07: 6
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
