Upgrade our sqlite to 3.6.1, with the local changes made by Gears. I'm

checking in the full sqlite tree to make upstream merges easier.  This means
we'll have generated sources split out from the originals.

One important change this makes is that "BEGIN" now defaults to "BEGIN
IMMEDIATE" rather than "BEGIN DEFERRED".  This doesn't affect us because we
don't use unqualified BEGIN statements.

The full CL is too big for Rietveld.  I'm splitting it into 2.  This one is
reviewable.  The other CL is just a fresh drop of:
//depot/googleclient/gears/opensource/third_party/sqlite_google
Review URL: http://codereview.chromium.org/15067

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7623 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 258 insertions, 0 deletions

diff --git a/third_party/sqlite/test/colname.test b/third_party/sqlite/test/colname.test
new file mode 100755
index 0000000..d2292aa5
--- /dev/null
+++ b/third_party/sqlite/test/colname.test
@@ -0,0 +1,258 @@
+# 2008 July 15
+#
+# 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 how SQLite generates the names
+# of columns in a result set.
+#
+# $Id: colname.test,v 1.4 2008/08/02 20:09:37 drh Exp $
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+# Rules (applied in order):
+#
+# (1) If there is an AS clause, use it.
+#
+# (2) A non-trival expression (not a table column name) then the name is
+#     a copy of the expression text.
+#
+# (3) If short_column_names=ON, then just the abbreviated column name without
+#     the table name.
+#
+# (4) When short_column_names=OFF and full_column_names=OFF then
+#     use case (2) for simple queries and case (5) for joins.
+#
+# (5) When short_column_names=OFF and full_column_names=ON then
+#     use the form: TABLE.COLUMN
+#
+
+
+# Verify the default settings for short_column_name and full_column_name
+#
+do_test colname-1.1 {
+  db eval {PRAGMA short_column_names}
+} {1}
+do_test colname-1.2 {
+  db eval {PRAGMA full_column_names}
+} {0}
+
+# Tests for then short=ON and full=any
+#
+do_test colname-2.1 {
+  db eval {
+    CREATE TABLE tabc(a,b,c);
+    INSERT INTO tabc VALUES(1,2,3);
+    CREATE TABLE txyz(x,y,z);
+    INSERT INTO txyz VALUES(4,5,6);
+    CREATE TABLE tboth(a,b,c,x,y,z);
+    INSERT INTO tboth VALUES(11,12,13,14,15,16);
+    CREATE VIEW v1 AS SELECT tabC.a, txyZ.x, * 
+      FROM tabc, txyz ORDER BY 1 LIMIT 1;
+    CREATE VIEW v2 AS SELECT tabC.a, txyZ.x, tboTh.a, tbotH.x, *
+      FROM tabc, txyz, tboth ORDER BY 1 LIMIT 1;
+  }
+  execsql2 {
+    SELECT * FROM tabc;
+  }
+} {a 1 b 2 c 3}
+do_test colname-2.2 {
+  execsql2 {
+    SELECT Tabc.a, tAbc.b, taBc.c, * FROM tabc
+  }
+} {a 1 b 2 c 3 a 1 b 2 c 3}
+do_test colname-2.3 {
+  execsql2 {
+    SELECT +tabc.a, -tabc.b, tabc.c, * FROM tabc
+  }
+} {+tabc.a 1 -tabc.b -2 c 3 a 1 b 2 c 3}
+do_test colname-2.4 {
+  execsql2 {
+    SELECT +tabc.a AS AAA, -tabc.b AS BBB, tabc.c CCC, * FROM tabc
+  }
+} {AAA 1 BBB -2 CCC 3 a 1 b 2 c 3}
+do_test colname-2.5 {
+  execsql2 {
+    SELECT tabc.a, txyz.x, * FROM tabc, txyz;
+  }
+} {a 1 x 4 a 1 b 2 c 3 x 4 y 5 z 6}
+do_test colname-2.6 {
+  execsql2 {
+    SELECT tabc.a, txyz.x, tabc.*, txyz.* FROM tabc, txyz;
+  }
+} {a 1 x 4 a 1 b 2 c 3 x 4 y 5 z 6}
+do_test colname-2.7 {
+  execsql2 {
+    SELECT tabc.a, txyz.x, tboth.a, tboth.x, * FROM tabc, txyz, tboth;
+  }
+} {a 11 x 14 a 11 x 14 a 11 b 12 c 13 x 14 y 15 z 16 a 11 b 12 c 13 x 14 y 15 z 16}
+do_test colname-2.8 {
+  execsql2 {
+    SELECT * FROM v1 ORDER BY 2;
+  }
+} {a 1 x 4 a:1 1 b 2 c 3 x:1 4 y 5 z 6}
+do_test colname-2.9 {
+  execsql2 {
+    SELECT * FROM v2 ORDER BY 2;
+  }
+} {a 1 x 4 a:1 11 x:1 14 a:2 1 b 2 c 3 x:2 4 y 5 z 6 a:3 11 b:1 12 c:1 13 x:3 14 y:1 15 z:1 16}
+
+
+# Tests for short=OFF and full=OFF
+#
+do_test colname-3.1 {
+  db eval {
+    PRAGMA short_column_names=OFF;
+    PRAGMA full_column_names=OFF;
+    CREATE VIEW v3 AS SELECT tabC.a, txyZ.x, *
+      FROM tabc, txyz ORDER BY 1 LIMIT 1;
+    CREATE VIEW v4 AS SELECT tabC.a, txyZ.x, tboTh.a, tbotH.x, * 
+      FROM tabc, txyz, tboth ORDER BY 1 LIMIT 1;
+  }
+  execsql2 {
+    SELECT * FROM tabc;
+  }
+} {a 1 b 2 c 3}
+do_test colname-3.2 {
+  execsql2 {
+    SELECT Tabc.a, tAbc.b, taBc.c FROM tabc
+  }
+} {Tabc.a 1 tAbc.b 2 taBc.c 3}
+do_test colname-3.3 {
+  execsql2 {
+    SELECT +tabc.a, -tabc.b, tabc.c FROM tabc
+  }
+} {+tabc.a 1 -tabc.b -2 tabc.c 3}
+do_test colname-3.4 {
+  execsql2 {
+    SELECT +tabc.a AS AAA, -tabc.b AS BBB, tabc.c CCC FROM tabc
+  }
+} {AAA 1 BBB -2 CCC 3}
+do_test colname-3.5 {
+  execsql2 {
+    SELECT Tabc.a, Txyz.x, * FROM tabc, txyz;
+  }
+} {Tabc.a 1 Txyz.x 4 a 1 b 2 c 3 x 4 y 5 z 6}
+do_test colname-3.6 {
+  execsql2 {
+    SELECT tabc.*, txyz.* FROM tabc, txyz;
+  }
+} {a 1 b 2 c 3 x 4 y 5 z 6}
+do_test colname-3.7 {
+  execsql2 {
+    SELECT * FROM tabc, txyz, tboth;
+  }
+} {a 11 b 12 c 13 x 14 y 15 z 16 a 11 b 12 c 13 x 14 y 15 z 16}
+do_test colname-3.8 {
+  execsql2 {
+    SELECT v1.a, * FROM v1 ORDER BY 2;
+  }
+} {v1.a 1 a 1 x 4 a:1 1 b 2 c 3 x:1 4 y 5 z 6}
+do_test colname-3.9 {
+  execsql2 {
+    SELECT * FROM v2 ORDER BY 2;
+  }
+} {a 1 x 4 a:1 11 x:1 14 a:2 1 b 2 c 3 x:2 4 y 5 z 6 a:3 11 b:1 12 c:1 13 x:3 14 y:1 15 z:1 16}
+do_test colname-3.10 {
+  execsql2 {
+    SELECT * FROM v3 ORDER BY 2;
+  }
+} {a 1 x 4 a:1 1 b 2 c 3 x:1 4 y 5 z 6}
+do_test colname-3.11 {
+  execsql2 {
+    SELECT * FROM v4 ORDER BY 2;
+  }
+} {a 1 x 4 a:1 11 x:1 14 a:2 1 b 2 c 3 x:2 4 y 5 z 6 a:3 11 b:1 12 c:1 13 x:3 14 y:1 15 z:1 16}
+
+# Test for short=OFF and full=ON
+#
+do_test colname-4.1 {
+  db eval {
+    PRAGMA short_column_names=OFF;
+    PRAGMA full_column_names=ON;
+    CREATE VIEW v5 AS SELECT tabC.a, txyZ.x, *
+      FROM tabc, txyz ORDER BY 1 LIMIT 1;
+    CREATE VIEW v6 AS SELECT tabC.a, txyZ.x, tboTh.a, tbotH.x, * 
+      FROM tabc, txyz, tboth ORDER BY 1 LIMIT 1;
+  }
+  execsql2 {
+    SELECT * FROM tabc;
+  }
+} {tabc.a 1 tabc.b 2 tabc.c 3}
+do_test colname-4.2 {
+  execsql2 {
+    SELECT Tabc.a, tAbc.b, taBc.c FROM tabc
+  }
+} {tabc.a 1 tabc.b 2 tabc.c 3}
+do_test colname-4.3 {
+  execsql2 {
+    SELECT +tabc.a, -tabc.b, tabc.c FROM tabc
+  }
+} {+tabc.a 1 -tabc.b -2 tabc.c 3}
+do_test colname-4.4 {
+  execsql2 {
+    SELECT +tabc.a AS AAA, -tabc.b AS BBB, tabc.c CCC FROM tabc
+  }
+} {AAA 1 BBB -2 CCC 3}
+do_test colname-4.5 {
+  execsql2 {
+    SELECT Tabc.a, Txyz.x, * FROM tabc, txyz;
+  }
+} {tabc.a 1 txyz.x 4 tabc.a 1 tabc.b 2 tabc.c 3 txyz.x 4 txyz.y 5 txyz.z 6}
+do_test colname-4.6 {
+  execsql2 {
+    SELECT tabc.*, txyz.* FROM tabc, txyz;
+  }
+} {tabc.a 1 tabc.b 2 tabc.c 3 txyz.x 4 txyz.y 5 txyz.z 6}
+do_test colname-4.7 {
+  execsql2 {
+    SELECT * FROM tabc, txyz, tboth;
+  }
+} {tabc.a 1 tabc.b 2 tabc.c 3 txyz.x 4 txyz.y 5 txyz.z 6 tboth.a 11 tboth.b 12 tboth.c 13 tboth.x 14 tboth.y 15 tboth.z 16}
+do_test colname-4.8 {
+  execsql2 {
+    SELECT * FROM v1 ORDER BY 2;
+  }
+} {v1.a 1 v1.x 4 v1.a:1 1 v1.b 2 v1.c 3 v1.x:1 4 v1.y 5 v1.z 6}
+do_test colname-4.9 {
+  execsql2 {
+    SELECT * FROM v2 ORDER BY 2;
+  }
+} {v2.a 1 v2.x 4 v2.a:1 11 v2.x:1 14 v2.a:2 1 v2.b 2 v2.c 3 v2.x:2 4 v2.y 5 v2.z 6 v2.a:3 11 v2.b:1 12 v2.c:1 13 v2.x:3 14 v2.y:1 15 v2.z:1 16}
+do_test colname-4.10 {
+  execsql2 {
+    SELECT * FROM v3 ORDER BY 2;
+  }
+} {v3.a 1 v3.x 4 v3.a:1 1 v3.b 2 v3.c 3 v3.x:1 4 v3.y 5 v3.z 6}
+do_test colname-4.11 {
+  execsql2 {
+    SELECT * FROM v4 ORDER BY 2;
+  }
+} {v4.a 1 v4.x 4 v4.a:1 11 v4.x:1 14 v4.a:2 1 v4.b 2 v4.c 3 v4.x:2 4 v4.y 5 v4.z 6 v4.a:3 11 v4.b:1 12 v4.c:1 13 v4.x:3 14 v4.y:1 15 v4.z:1 16}
+do_test colname-4.12 {
+  execsql2 {
+    SELECT * FROM v5 ORDER BY 2;
+  }
+} {v5.a 1 v5.x 4 v5.a:1 1 v5.b 2 v5.c 3 v5.x:1 4 v5.y 5 v5.z 6}
+do_test colname-4.13 {
+  execsql2 {
+    SELECT * FROM v6 ORDER BY 2;
+  }
+} {v6.a 1 v6.x 4 v6.a:1 11 v6.x:1 14 v6.a:2 1 v6.b 2 v6.c 3 v6.x:2 4 v6.y 5 v6.z 6 v6.a:3 11 v6.b:1 12 v6.c:1 13 v6.x:3 14 v6.y:1 15 v6.z:1 16}
+
+# ticket #3229
+do_test colname-5.1 {
+  lreplace [db eval {
+    SELECT x.* FROM sqlite_master X LIMIT 1;
+  }] 3 3 x
+} {table tabc tabc x {CREATE TABLE tabc(a,b,c)}}
+
+finish_test