Merge tag 'upstream/2.2.1'

Upstream version 2.2.1
# gpg: Signature made Tue 13 Aug 2013 03:42:56 PM EDT using RSA key ID 374BBE81
# gpg: Good signature from "Hans-Christoph Steiner <hans@at.or.at>"
# gpg:                 aka "[jpeg image of size 5408]"
# gpg:                 aka "Hans-Christoph Steiner <hs420@nyu.edu>"
# gpg:                 aka "Hans-Christoph Steiner <hans@eds.org>"
# gpg:                 aka "Hans-Christoph Steiner <hans@guardianproject.info>"
# gpg:                 aka "Hans-Christoph Steiner <hansi@nyu.edu>"
# gpg:                 aka "Hans-Christoph Steiner <hans@guardianproject.info>"

1 files changed, 123 insertions, 0 deletions

diff --git a/test/orderby3.test b/test/orderby3.test
new file mode 100644
index 0000000..f005f0d
--- /dev/null
+++ b/test/orderby3.test
@@ -0,0 +1,123 @@
+# 2013 January 09
+#
+# 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.  The
+# focus of this file is testing that the optimizations that disable
+# ORDER BY clauses work correctly on a 3-way join.  See ticket
+# http://www.sqlite.org/src/956e4d7f89
+#
+
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set ::testprefix orderby3
+
+# Generate test data for a join.  Verify that the join gets the
+# correct answer.
+#
+do_execsql_test 1.0 {
+  CREATE TABLE t1(a INTEGER PRIMARY KEY);
+  CREATE TABLE t2(b INTEGER PRIMARY KEY, c INTEGER);
+  CREATE TABLE t3(d INTEGER);
+    
+  INSERT INTO t1 VALUES(1),(2),(3);
+    
+  INSERT INTO t2 VALUES(3, 1);
+  INSERT INTO t2 VALUES(4, 2);
+  INSERT INTO t2 VALUES(5, 3);
+    
+  INSERT INTO t3 VALUES(4),(3),(5);
+} {}
+do_execsql_test 1.1.asc {
+  SELECT t1.a
+    FROM t1, t2, t3
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a;
+} {1 2 3}
+do_execsql_test 1.1.desc {
+  SELECT t1.a
+    FROM t1, t2, t3
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a DESC;
+} {3 2 1}
+do_execsql_test 1.123.asc {
+  SELECT t1.a
+    FROM t1 CROSS JOIN t2 CROSS JOIN t3
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a;
+} {1 2 3}
+do_execsql_test 1.123.desc {
+  SELECT t1.a
+    FROM t1 CROSS JOIN t2 CROSS JOIN t3
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a DESC;
+} {3 2 1}
+do_execsql_test 1.132.asc {
+  SELECT t1.a
+    FROM t1 CROSS JOIN t3 CROSS JOIN t2
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a;
+} {1 2 3}
+do_execsql_test 1.132.desc {
+  SELECT t1.a
+    FROM t1 CROSS JOIN t3 CROSS JOIN t2
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a DESC;
+} {3 2 1}
+do_execsql_test 1.213.asc {
+  SELECT t1.a
+    FROM t2 CROSS JOIN t1 CROSS JOIN t3
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a;
+} {1 2 3}
+do_execsql_test 1.213.desc {
+  SELECT t1.a
+    FROM t2 CROSS JOIN t1 CROSS JOIN t3
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a DESC;
+} {3 2 1}
+do_execsql_test 1.231.asc {
+  SELECT t1.a
+    FROM t2 CROSS JOIN t3 CROSS JOIN t1
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a;
+} {1 2 3}
+do_execsql_test 1.231.desc {
+  SELECT t1.a
+    FROM t2 CROSS JOIN t3 CROSS JOIN t1
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a DESC;
+} {3 2 1}
+do_execsql_test 1.312.asc {
+  SELECT t1.a
+    FROM t3 CROSS JOIN t1 CROSS JOIN t2
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a;
+} {1 2 3}
+do_execsql_test 1.312.desc {
+  SELECT t1.a
+    FROM t3 CROSS JOIN t1 CROSS JOIN t2
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a DESC;
+} {3 2 1}
+do_execsql_test 1.321.asc {
+  SELECT t1.a
+    FROM t3 CROSS JOIN t2 CROSS JOIN t1
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a;
+} {1 2 3}
+do_execsql_test 1.321.desc {
+  SELECT t1.a
+    FROM t3 CROSS JOIN t2 CROSS JOIN t1
+   WHERE t1.a=t2.c AND t2.b=t3.d
+   ORDER BY t1.a DESC;
+} {3 2 1}
+
+finish_test