Changeset: b13ea45fbd3e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b13ea45fbd3e
Modified Files:
sql/backends/monet5/sql.mal
sql/server/sql_scan.c
sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err
sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
sql/test/copy/Tests/nonutf8.stable.err
sql/test/subquery/Tests/correlated.stable.err
Branch: Nov2019
Log Message:
Don't stack error codes
diffs (138 lines):
diff --git a/sql/backends/monet5/sql.mal b/sql/backends/monet5/sql.mal
--- a/sql/backends/monet5/sql.mal
+++ b/sql/backends/monet5/sql.mal
@@ -369,7 +369,7 @@ inline function sql.subzero_or_one( b:ba
c01 := calc.not(c0);
c1 := calc.>(m,1:lng);
c11 := calc.and(c01,c1);
- sql.assert(c11, "21000!zero_or_one: cardinality violation, scalar
expression expected");
+ sql.assert(c11, "zero_or_one: cardinality violation, scalar expression
expected");
return zero_or_one := b;
end sql.subzero_or_one;
@@ -433,7 +433,7 @@ inline function sql.all( b:bat[:any_1],
c01 := calc.not(c0);
c1 := calc.>(m,1:lng);
c11 := calc.and(c01,c1);
- sql.assert(c11, "21000!zero_or_one: cardinality violation, scalar
expression expected ");
+ sql.assert(c11, "zero_or_one: cardinality violation, scalar expression
expected ");
return all := b;
end sql.all;
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -753,7 +753,7 @@ scanner_string(mvc *c, int quote, bool e
cur = scanner_getc(lc);
}
}
- (void) sql_error(c, 2, SQLSTATE(42000) "%s", lc->errstr ? lc->errstr :
"unexpected end of input");
+ (void) sql_error(c, 2, "%s", lc->errstr ? lc->errstr : SQLSTATE(42000)
"unexpected end of input");
return LEX_ERROR;
}
diff --git a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err
b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err
--- a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err
+++ b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err
@@ -31,7 +31,7 @@ stderr of test 'pivot.Bug-3339` in direc
MAPI = (monetdb) /var/tmp/mtest-16107/.s.monetdb.31536
QUERY = SELECT (SELECT * FROM groupElements(pivot.x))
FROM (SELECT * FROM tmp) as pivot;
-ERROR = !21000!zero_or_one: cardinality violation, scalar expression expected
+ERROR = !zero_or_one: cardinality violation, scalar expression expected
CODE = M0M29
# 09:16:37 >
diff --git a/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
b/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
--- a/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
+++ b/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
@@ -18,7 +18,7 @@ ERROR = !syntax error, unexpected LIMIT,
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = SELECT date, (SELECT date from test_subquery where date >
t1892413a.date) as dtNext from test_subquery t1892413a;
-ERROR = !21000!zero_or_one: cardinality violation, scalar expression expected
+ERROR = !zero_or_one: cardinality violation, scalar expression expected
CODE = M0M29
# 10:24:35 >
diff --git a/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
b/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
--- a/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
+++ b/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
@@ -33,7 +33,7 @@ stdout of test 'bug_in_selection.SF-1892
[ 19260102 ]
[ 19260104 ]
#SELECT date, (SELECT max(date) from test_subquery where date >
t1892413a.date) as dtNext from test_subquery t1892413a;
-% .t1892413a, .L6 # table_name
+% .t1892413a, .L3 # table_name
% date, dtnext # name
% int, int # type
% 8, 8 # length
diff --git a/sql/test/copy/Tests/nonutf8.stable.err
b/sql/test/copy/Tests/nonutf8.stable.err
--- a/sql/test/copy/Tests/nonutf8.stable.err
+++ b/sql/test/copy/Tests/nonutf8.stable.err
@@ -31,19 +31,19 @@ stderr of test 'nonutf8` in directory 's
# 15:39:57 >
MAPI = (monetdb) /var/tmp/mtest-2478/.s.monetdb.31776
-QUERY = insert into nonutf8 values ('zwaar lange golf piek -dal ±10cm vak5');
+QUERY = insert into nonutf8 values ('zwaar lange golf piek -dal �10cm vak5');
copy 2 records into nonutf8 from stdin;
- zwaar lange golf piek -dal ±10cm vak5
- ±17 %
-ERROR = !42000!invalid start of UTF-8 sequence
+ zwaar lange golf piek -dal �10cm vak5
+ �17 %
+ERROR = !invalid start of UTF-8 sequence
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = insert into nonutf8 values ('zwaar lange golf piek -dal ±10cm vak5');
+QUERY = insert into nonutf8 values ('zwaar lange golf piek -dal �10cm vak5');
copy 2 records into nonutf8 from stdin;
- zwaar lange golf piek -dal ±10cm vak5
- ±17 %
+ zwaar lange golf piek -dal �10cm vak5
+ �17 %
select * from nonutf8;
ERROR = !syntax error, unexpected sqlINT in: "7"
diff --git a/sql/test/subquery/Tests/correlated.stable.err
b/sql/test/subquery/Tests/correlated.stable.err
--- a/sql/test/subquery/Tests/correlated.stable.err
+++ b/sql/test/subquery/Tests/correlated.stable.err
@@ -36,7 +36,7 @@ stderr of test 'correlated` in directory
MAPI = (monetdb) /var/tmp/mtest-8372/.s.monetdb.37437
QUERY = SELECT i, (SELECT 42+i1.i FROM integers) AS j FROM integers i1 ORDER
BY i;
-ERROR = !21000!zero_or_one: cardinality violation, scalar expression expected
+ERROR = !zero_or_one: cardinality violation, scalar expression expected
CODE = M0M29
MAPI = (monetdb) /var/tmp/mtest-8372/.s.monetdb.37437
QUERY = SELECT i, (SELECT 42+i1.i FROM integers LIMIT 1) AS j FROM integers i1
ORDER BY i;
@@ -76,7 +76,7 @@ ERROR = !SELECT: subquery must return on
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-19820/.s.monetdb.36524
QUERY = SELECT (SELECT SUM(i1.i) FROM integers) AS k FROM integers i1 GROUP BY
i ORDER BY i; --cardinality violation, scalar expression expected
-ERROR = !21000!zero_or_one: cardinality violation, scalar expression expected
+ERROR = !zero_or_one: cardinality violation, scalar expression expected
CODE = M0M29
MAPI = (monetdb) /var/tmp/mtest-31859/.s.monetdb.35446
QUERY = SELECT CAST((SELECT i+SUM(i1.i) FROM integers WHERE i=1 LIMIT 1) AS
BIGINT) FROM integers i1; --error, no LIMIT on subqueries
@@ -84,7 +84,7 @@ ERROR = !syntax error, unexpected LIMIT,
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-31859/.s.monetdb.35446
QUERY = SELECT i, CAST(SUM(i1.i) AS BIGINT), CAST((SELECT SUM(i1.i) FROM
integers) AS BIGINT) AS k FROM integers i1 GROUP BY i ORDER BY i; --error,
cardinality violation, scalar expression expected
-ERROR = !21000!zero_or_one: cardinality violation, scalar expression expected
+ERROR = !zero_or_one: cardinality violation, scalar expression expected
CODE = M0M29
MAPI = (monetdb) /var/tmp/mtest-31859/.s.monetdb.35446
QUERY = SELECT FIRST(i), CAST((SELECT SUM(i1.i)) AS BIGINT) FROM integers i1;
--error, no first aggregate available yet
@@ -92,7 +92,7 @@ ERROR = !SELECT: no such unary operator
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-31859/.s.monetdb.35446
QUERY = SELECT i, SUM(i1.i) FROM integers i1 GROUP BY i ORDER BY (SELECT
SUM(i1.i) FROM integers); --error, cardinality violation, scalar expression
expected
-ERROR = !21000!zero_or_one: cardinality violation, scalar expression expected
+ERROR = !zero_or_one: cardinality violation, scalar expression expected
CODE = M0M29
MAPI = (monetdb) /var/tmp/mtest-31859/.s.monetdb.35446
QUERY = SELECT i, SUM((SELECT SUM(i)*i1.i FROM integers LIMIT 0)) AS k FROM
integers i1 GROUP BY i ORDER BY i; --error, no LIMIT on subqueries
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
