1 files changed, 178 insertions, 0 deletions
diff --git a/test/tkt-31338dca7e.test b/test/tkt-31338dca7e.test
new file mode 100644
index 0000000..41dd9d3
--- /dev/null
+++ b/test/tkt-31338dca7e.test
@@ -0,0 +1,178 @@
+# 2009 December 16
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.
+#
+# This file implements tests to verify that ticket [31338dca7e] has been
+# fixed.  Ticket [31338dca7e] demonstrates problems with the OR-clause
+# optimization in joins where the WHERE clause is of the form
+#
+#     (x AND y) OR z
+#
+# And the x and y subterms from from different tables of the join.
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+do_test tkt-31338-1.1 {
+  db eval {
+    CREATE TABLE t1(x);
+    CREATE TABLE t2(y);
+    INSERT INTO t1 VALUES(111);
+    INSERT INTO t1 VALUES(222);
+    INSERT INTO t2 VALUES(333);
+    INSERT INTO t2 VALUES(444);
+    SELECT * FROM t1, t2
+     WHERE (x=111 AND y!=444) OR x=222
+     ORDER BY x, y;
+  }
+} {111 333 222 333 222 444}
+
+do_test tkt-31338-1.2 {
+  db eval {
+    CREATE INDEX t1x ON t1(x);
+    SELECT * FROM t1, t2
+     WHERE (x=111 AND y!=444) OR x=222
+     ORDER BY x, y;
+  }
+} {111 333 222 333 222 444}
+
+do_test tkt-31338-2.1 {
+  db eval {
+    CREATE TABLE t3(v,w);
+    CREATE TABLE t4(x,y);
+    CREATE TABLE t5(z);
+    INSERT INTO t3 VALUES(111,222);
+    INSERT INTO t3 VALUES(333,444);
+    INSERT INTO t4 VALUES(222,333);
+    INSERT INTO t4 VALUES(444,555);
+    INSERT INTO t5 VALUES(888);
+    INSERT INTO t5 VALUES(999);
+    
+    SELECT * FROM t3, t4, t5
+     WHERE (v=111 AND x=w AND z!=999) OR (v=333 AND x=444)
+     ORDER BY v, w, x, y, z;
+  }
+} {111 222 222 333 888 333 444 444 555 888 333 444 444 555 999}
+
+do_test tkt-31338-2.2 {
+  db eval {
+   CREATE INDEX t3v ON t3(v);
+   CREATE INDEX t4x ON t4(x);
+    SELECT * FROM t3, t4, t5
+     WHERE (v=111 AND x=w AND z!=999) OR (v=333 AND x=444)
+     ORDER BY v, w, x, y, z;
+  }
+} {111 222 222 333 888 333 444 444 555 888 333 444 444 555 999}
+
+
+# Ticket [2c2de252666662f5459904fc33a9f2956cbff23c]
+#
+do_test tkt-31338-3.1 {
+  foreach x [db eval {SELECT name FROM sqlite_master WHERE type='table'}] {
+     db eval "DROP TABLE $x"
+  }
+  db eval {
+    CREATE TABLE t1(a,b,c,d);
+    CREATE TABLE t2(e,f);
+    INSERT INTO t1 VALUES(1,2,3,4);
+    INSERT INTO t2 VALUES(10,-8);
+    CREATE INDEX t1a ON t1(a);
+    CREATE INDEX t1b ON t1(b);
+    CREATE TABLE t3(g);
+    INSERT INTO t3 VALUES(4);
+    CREATE TABLE t4(h);
+    INSERT INTO t4 VALUES(5);
+
+    SELECT * FROM t3 LEFT JOIN t1 ON d=g LEFT JOIN t4 ON c=h
+     WHERE (a=1 AND h=4)
+         OR (b IN (
+               SELECT x FROM (SELECT e+f AS x, e FROM t2 ORDER BY 1 LIMIT 2)
+               GROUP BY e
+            ));
+  }    
+} {4 1 2 3 4 {}}
+do_test tkt-31338-3.2 {
+  db eval {    
+    SELECT * FROM t3 LEFT JOIN t1 ON d=g LEFT JOIN t4 ON c=h
+     WHERE (a=1 AND h=4)
+         OR (b=2 AND b NOT IN (
+               SELECT x+1 FROM (SELECT e+f AS x, e FROM t2 ORDER BY 1 LIMIT 2)
+               GROUP BY e
+            ));
+  }    
+} {4 1 2 3 4 {}}
+do_test tkt-31338-3.3 {
+  db eval {    
+    SELECT * FROM t3 LEFT JOIN t1 ON d=g LEFT JOIN t4 ON c=h
+     WHERE (+a=1 AND h=4)
+         OR (b IN (
+               SELECT x FROM (SELECT e+f AS x, e FROM t2 ORDER BY 1 LIMIT 2)
+               GROUP BY e
+            ));
+  }    
+} {4 1 2 3 4 {}}
+do_test tkt-31338-3.4 {
+  db eval {    
+    SELECT * FROM t3 LEFT JOIN t1 ON d=g LEFT JOIN t4 ON c=h
+     WHERE (a=1 AND h=4)
+         OR (+b IN (
+               SELECT x FROM (SELECT e+f AS x, e FROM t2 ORDER BY 1 LIMIT 2)
+               GROUP BY e
+            ));
+  }    
+} {4 1 2 3 4 {}}
+
+do_test tkt-31338-3.5 {
+  db eval {
+    CREATE TABLE t5(a,b,c,d,e,f);
+    CREATE TABLE t6(g,h);
+    CREATE TRIGGER t6r AFTER INSERT ON t6 BEGIN
+      INSERT INTO t5    
+        SELECT * FROM t3 LEFT JOIN t1 ON d=g LEFT JOIN t4 ON c=h
+         WHERE (a=1 AND h=4)
+            OR (b IN (
+               SELECT x FROM (SELECT e+f AS x, e FROM t2 ORDER BY 1 LIMIT 2)
+               GROUP BY e
+            ));
+    END;
+    INSERT INTO t6 VALUES(88,99);
+    SELECT * FROM t5;
+  }    
+} {4 1 2 3 4 {}}
+
+do_test tkt-31338-3.6 {
+  db eval {    
+    INSERT INTO t1 VALUES(2,4,3,4);
+    INSERT INTO t1 VALUES(99,101,3,4);
+    INSERT INTO t1 VALUES(98,97,3,4);
+    SELECT * FROM t3 LEFT JOIN t1 ON d=g LEFT JOIN t4 ON c=h
+     WHERE (a=1 AND h=4)
+         OR (b IN (
+               SELECT x+a FROM (SELECT e+f AS x, e FROM t2 ORDER BY 1 LIMIT 2)
+               GROUP BY e
+            ));
+  }    
+} {4 2 4 3 4 {} 4 99 101 3 4 {}}
+
+do_test tkt-31338-3.7 {
+  db eval {
+    SELECT * FROM t3 LEFT JOIN t1 ON d=g LEFT JOIN t4 ON c=h
+     WHERE (a=1 AND h=4)
+         OR (b IN (
+               SELECT x FROM (SELECT e+f+a AS x, e FROM t2 ORDER BY 1 LIMIT 2)
+               GROUP BY e
+            ));
+  }    
+} {4 2 4 3 4 {} 4 99 101 3 4 {}}
+
+
+finish_test