diff -r 000000000000 -r 08ec8eefde2f persistentstorage/sqlite3api/TEST/TclScript/collate8.test
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/persistentstorage/sqlite3api/TEST/TclScript/collate8.test	Fri Jan 22 11:06:30 2010 +0200
@@ -0,0 +1,125 @@
+#
+# 2007 June 20
+#
+# 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 script is making sure collations pass through the
+# unary + operator.
+#
+# $Id: collate8.test,v 1.2 2008/08/25 12:14:09 drh Exp $
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+do_test collate8-1.1 {
+  execsql {
+    CREATE TABLE t1(a TEXT COLLATE nocase);
+    INSERT INTO t1 VALUES('aaa');
+    INSERT INTO t1 VALUES('BBB');
+    INSERT INTO t1 VALUES('ccc');
+    INSERT INTO t1 VALUES('DDD');
+    SELECT a FROM t1 ORDER BY a;
+  }
+} {aaa BBB ccc DDD}
+do_test collate8-1.2 {
+  execsql {
+    SELECT rowid FROM t1 WHERE a<'ccc' ORDER BY 1
+  }
+} {1 2}
+do_test collate8-1.3 {
+  execsql {
+    SELECT rowid FROM t1 WHERE a<'ccc' COLLATE binary ORDER BY 1
+  }
+} {1 2 4}
+do_test collate8-1.4 {
+  execsql {
+    SELECT rowid FROM t1 WHERE +a<'ccc' ORDER BY 1
+  }
+} {1 2}
+do_test collate8-1.5 {
+  execsql {
+    SELECT a FROM t1 ORDER BY +a
+  }
+} {aaa BBB ccc DDD}
+do_test collate8-1.11 {
+  execsql {
+    SELECT a AS x FROM t1 ORDER BY "x";
+  }
+} {aaa BBB ccc DDD}
+do_test collate8-1.12 {
+  execsql {
+    SELECT a AS x FROM t1 WHERE x<'ccc' ORDER BY 1
+  }
+} {aaa BBB}
+do_test collate8-1.13 {
+  execsql {
+    SELECT a AS x FROM t1 WHERE x<'ccc' COLLATE binary ORDER BY [x]
+  }
+} {aaa BBB DDD}
+do_test collate8-1.14 {
+  execsql {
+    SELECT a AS x FROM t1 WHERE +x<'ccc' ORDER BY 1
+  }
+} {aaa BBB}
+do_test collate8-1.15 {
+  execsql {
+    SELECT a AS x FROM t1 ORDER BY +x
+  }
+} {aaa BBB ccc DDD}
+
+
+# When a result-set column is aliased into a WHERE clause, make sure the
+# collating sequence logic works correctly.
+#
+do_test collate8-2.1 {
+  execsql {
+    CREATE TABLE t2(a);
+    INSERT INTO t2 VALUES('abc');
+    INSERT INTO t2 VALUES('ABC');
+    SELECT a AS x FROM t2 WHERE x='abc';
+  }
+} {abc}
+do_test collate8-2.2 {
+  execsql {
+    SELECT a AS x FROM t2 WHERE x='abc' COLLATE nocase;
+  }
+} {abc ABC}
+do_test collate8-2.3 {
+  execsql {
+    SELECT a AS x FROM t2 WHERE (x COLLATE nocase)='abc';
+  }
+} {abc ABC}
+do_test collate8-2.4 {
+  execsql {
+    SELECT a COLLATE nocase AS x FROM t2 WHERE x='abc';
+  }
+} {abc ABC}
+do_test collate8-2.5 {
+  execsql {
+    SELECT a COLLATE nocase AS x FROM t2 WHERE (x COLLATE binary)='abc';
+  }
+} {abc}
+do_test collate8-2.6 {
+  execsql {
+    SELECT a COLLATE nocase AS x FROM t2 WHERE x='abc' COLLATE binary;
+  }
+} {abc ABC}
+do_test collate8-2.7 {
+  execsql {
+    SELECT * FROM t2 WHERE (a COLLATE nocase)='abc' COLLATE binary;
+  }
+} {abc ABC}
+do_test collate8-2.8 {
+  execsql {
+    SELECT a COLLATE nocase AS x FROM t2 WHERE 'abc'=x COLLATE binary;
+  }
+} {abc}
+
+finish_test