Changeset: e573bd725229 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e573bd725229
Modified Files:
sql/backends/monet5/generator/Tests/generator01.stable.err
sql/backends/monet5/generator/Tests/generator04.stable.err
sql/server/rel_exp.c
sql/test/SQLancer/Tests/sqlancer04.sql
sql/test/SQLancer/Tests/sqlancer04.stable.err
Branch: Oct2020
Log Message:
Small bugfix, don't show the label on error if that's the case
diffs (63 lines):
diff --git a/sql/backends/monet5/generator/Tests/generator01.stable.err
b/sql/backends/monet5/generator/Tests/generator01.stable.err
--- a/sql/backends/monet5/generator/Tests/generator01.stable.err
+++ b/sql/backends/monet5/generator/Tests/generator01.stable.err
@@ -103,7 +103,7 @@ ERROR = !Illegal generator range
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = select * from generate_series(cast(null as timestamp),10,1) ;
-ERROR = !types tinyint(4,0) and timestamp(7,0) are not equal for column '%2'
+ERROR = !types tinyint(4,0) and timestamp(7,0) are not equal
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = select * from generate_series(null,cast(10 as timestamp),cast(1 as
interval second)) ;
diff --git a/sql/backends/monet5/generator/Tests/generator04.stable.err
b/sql/backends/monet5/generator/Tests/generator04.stable.err
--- a/sql/backends/monet5/generator/Tests/generator04.stable.err
+++ b/sql/backends/monet5/generator/Tests/generator04.stable.err
@@ -53,7 +53,7 @@ MAPI = (monetdb) /var/tmp/mtest-30274/.
QUERY = select * from generate_series(
timestamp '2008-03-01 00:00',
timestamp '2008-03-04 12:00');
-ERROR = !types timestamp(7,0) and tinyint(8,0) are not equal for column '%1'
+ERROR = !types timestamp(7,0) and tinyint(8,0) are not equal
CODE = 42000
# 21:38:52 >
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -2962,9 +2962,9 @@ exp_check_type(mvc *sql, sql_subtype *t,
t->type->sqlname,
t->digits,
t->scale,
- (exp->type == e_column ? " for column '" : ""),
- (exp->type == e_column ? exp_name(exp) : ""),
- (exp->type == e_column ? "'" : "")
+ (exp->type == e_column && !has_label(exp) ? " for
column '" : ""),
+ (exp->type == e_column && !has_label(exp) ?
exp_name(exp) : ""),
+ (exp->type == e_column && !has_label(exp) ? "'" : "")
);
return res;
}
diff --git a/sql/test/SQLancer/Tests/sqlancer04.sql
b/sql/test/SQLancer/Tests/sqlancer04.sql
--- a/sql/test/SQLancer/Tests/sqlancer04.sql
+++ b/sql/test/SQLancer/Tests/sqlancer04.sql
@@ -424,3 +424,5 @@ WHERE (v4.vc0) IN (-2081865947, 30436))
0.10216334194461484941029993933625519275665283203125) AS STRING(478)))) AS
sub2 ON ((greatest(r'', r'32228'))NOT
ILIKE(CAST(30792 AS STRING(381))))) as res;
ROLLBACK;
+
+select cast(count(1) as interval second) from (values (false)) as v6(vc0);
--error
diff --git a/sql/test/SQLancer/Tests/sqlancer04.stable.err
b/sql/test/SQLancer/Tests/sqlancer04.stable.err
--- a/sql/test/SQLancer/Tests/sqlancer04.stable.err
+++ b/sql/test/SQLancer/Tests/sqlancer04.stable.err
@@ -55,6 +55,10 @@ MAPI = (monetdb) /var/tmp/mtest-13844/.
QUERY = select coalesce(-1129107763, '1415606329') from (values(1),(2)) as
t0(c0);
ERROR = !value too long for type (var)char(10)
CODE = 22001
+MAPI = (monetdb) /var/tmp/mtest-150622/.s.monetdb.34547
+QUERY = select cast(count(1) as interval second) from (values (false)) as
v6(vc0); --error
+ERROR = !types bigint(64,0) and sec_interval(13,0) are not equal
+CODE = 42000
# 09:44:50 >
# 09:44:50 > "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
