Changeset: 57d8771f2335 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/57d8771f2335
Modified Files:
        sql/backends/monet5/rel_bin.c
Branch: default
Log Message:

merged with dec2023


diffs (55 lines):

diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -4357,7 +4357,7 @@ rel2bin_select(backend *be, sql_rel *rel
                if (s->nrcols == 0){
                        if (!predicate && sub && !list_empty(sub->op4.lval))
                                predicate = stmt_const(be, 
bin_find_smallest_column(be, sub), stmt_bool(be, 1));
-                       else
+                       else if (!predicate)
                                predicate = const_column(be, stmt_bool(be, 1));
                        if (e->type != e_cmp) {
                                sql_subtype *bt = sql_bind_localtype("bit");
diff --git a/sql/test/BugTracker-2024/Tests/All 
b/sql/test/BugTracker-2024/Tests/All
--- a/sql/test/BugTracker-2024/Tests/All
+++ b/sql/test/BugTracker-2024/Tests/All
@@ -23,3 +23,4 @@ where_null-7450
 between-boolean-7451
 concat_order-7455
 order-by-false-or-false-Bug-7456
+constant-expression-issue-7457
diff --git a/sql/test/BugTracker-2024/Tests/constant-expression-issue-7457.test 
b/sql/test/BugTracker-2024/Tests/constant-expression-issue-7457.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2024/Tests/constant-expression-issue-7457.test
@@ -0,0 +1,30 @@
+statement ok
+CREATE TABLE t0(c0 VARCHAR(500), c1 BOOLEAN)
+
+statement ok
+INSERT INTO t0 (c0, c1) VALUES ('a', false)
+
+statement ok
+INSERT INTO t0 (c0) VALUES ('b')
+
+query TT
+SELECT * FROM t0
+----
+a
+False
+b
+NULL
+
+query T
+SELECT (1 AND 3) FROM t0
+----
+True
+True
+
+query TT
+SELECT * FROM t0 WHERE (1 AND 3)
+----
+a
+False
+b
+NULL
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to