| Index: third_party/sqlite/src/test/tkt-31338dca7e.test | 
| diff --git a/third_party/sqlite/src/test/tkt-31338dca7e.test b/third_party/sqlite/src/test/tkt-31338dca7e.test | 
| index 3f66816d64893048b7db80ab71c436a7fdbe81ab..41dd9d3bf8e9f7dda5625278b2df08b3259d47be 100644 | 
| --- a/third_party/sqlite/src/test/tkt-31338dca7e.test | 
| +++ b/third_party/sqlite/src/test/tkt-31338dca7e.test | 
| @@ -74,4 +74,105 @@ do_test tkt-31338-2.2 { | 
| } {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 | 
|  |