Changeset: 8a58c89c6290 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a58c89c6290
Modified Files:
monetdb5/modules/mal/pcre.c
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.out
Branch: Jun2020
Log Message:
Use input seqbase for output result. Also added more simple test
diffs (43 lines):
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -913,7 +913,7 @@ re_like_proj(BAT **bnp, BAT *b, const ch
assert(ATOMstorage(b->ttype) == TYPE_str);
- bn = COLnew(0, TYPE_bit, q, TRANSIENT);
+ bn = COLnew(b->hseqbase, TYPE_bit, q, TRANSIENT);
if (bn == NULL) {
msg = createException(MAL, "pcre.likeselect", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
goto bailout;
diff --git a/sql/test/miscellaneous/Tests/simple_selects.sql
b/sql/test/miscellaneous/Tests/simple_selects.sql
--- a/sql/test/miscellaneous/Tests/simple_selects.sql
+++ b/sql/test/miscellaneous/Tests/simple_selects.sql
@@ -108,6 +108,10 @@ select x like null, null like x, null li
x not like null, null not like x, null not like null, x not ilike null,
null not ilike x, null not ilike null from x;
-- all NULL
+select x like null from x;
+ -- NULL
+ -- NULL
+
select x like x, x ilike x, x not like x, x not ilike x from x;
-- NULL NULL NULL NULL
-- True True False False
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
@@ -323,6 +323,13 @@ stdout of test 'simple_selects` in direc
% 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5 # length
[ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL ]
[ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL ]
+#select x like null from x;
+% sys.%1 # table_name
+% %1 # name
+% boolean # type
+% 5 # length
+[ NULL ]
+[ NULL ]
#select x like x, x ilike x, x not like x, x not ilike x from x;
% sys.%1, sys.%2, sys.%3, sys.%4 # table_name
% %1, %2, %3, %4 # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
