Changeset: 85278cd8f7a2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=85278cd8f7a2
Modified Files:
gdk/gdk_calc_compare.h
sql/test/miscellaneous/Tests/simple_selects.stable.out
Branch: octbugs
Log Message:
fixed small issue with nil, is_semantics (nil_matches) and voids in the ==
operator
diffs (37 lines):
diff --git a/gdk/gdk_calc_compare.h b/gdk/gdk_calc_compare.h
--- a/gdk/gdk_calc_compare.h
+++ b/gdk/gdk_calc_compare.h
@@ -838,7 +838,11 @@ BATcalcop(BAT *b1, BAT *b2, BAT *s1, BAT
if (BATtvoid(b1) && BATtvoid(b2) && ci1.tpe == cand_dense && ci2.tpe ==
cand_dense) {
TPE res;
- if (is_oid_nil(b1->tseqbase) || is_oid_nil(b2->tseqbase))
+ if ((is_oid_nil(b1->tseqbase) || is_oid_nil(b2->tseqbase))
+#ifdef NIL_MATCHES_FLAG
+ && !nil_matches
+#endif
+ )
res = TPE_nil;
else
res = OP(b1->tseqbase + ci1.seq, b2->tseqbase +
ci2.seq);
diff --git a/sql/test/miscellaneous/Tests/simple_selects.stable.out
b/sql/test/miscellaneous/Tests/simple_selects.stable.out
--- a/sql/test/miscellaneous/Tests/simple_selects.stable.out
+++ b/sql/test/miscellaneous/Tests/simple_selects.stable.out
@@ -424,6 +424,17 @@ project (
| | ) [ tinyint "1" as "x"."x" ]
| ) [ "x"."x" as "z" ] [ "z" ]
) [ "z", tinyint "2" ]
+#select 1, null except select 1, null;
+% .%11, .%11 # table_name
+% %2, %3 # name
+% tinyint, char # type
+% 1, 0 # length
+#select 1, null intersect select 1, null;
+% .%11, .%11 # table_name
+% %2, %3 # name
+% tinyint, char # type
+% 1, 0 # length
+[ 1, NULL ]
# 17:31:38 >
# 17:31:38 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
