From 569c6676a6ddb0ff73821d7693b5e18ddef809b9 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 16 Oct 2014 22:51:35 -0400
Subject: Imported Upstream version 3.2.0

---
 test/collate2.test | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'test/collate2.test')

diff --git a/test/collate2.test b/test/collate2.test
index bf61923..d5aadb4 100644
--- a/test/collate2.test
+++ b/test/collate2.test
@@ -17,6 +17,8 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+set ::testprefix collate2
+
 #
 # Tests are organised as follows:
 #
@@ -636,13 +638,15 @@ do_test collate2-4.2 {
 do_test collate2-4.3 {
   execsql {
     SELECT collate2t1.a FROM collate2t1, collate2t3 
-      WHERE collate2t1.b = collate2t3.b||'';
+      WHERE collate2t1.b = collate2t3.b||''
+      ORDER BY +collate2t1.a DESC;
   }
 } {aa aA Aa AA}
 do_test collate2-4.4 {
   execsql {
     SELECT collate2t1.a FROM collate2t1, collate2t3 
-      WHERE collate2t3.b||'' = collate2t1.b;
+      WHERE collate2t3.b||'' = collate2t1.b
+      ORDER BY +collate2t1.a DESC;
   }
 } {aa aA Aa AA}
 
@@ -691,4 +695,30 @@ do_test collate2-5.5 {
   }
 } {aa aa}
 
+do_execsql_test 6.1 {
+  CREATE TABLE t1(x);
+  INSERT INTO t1 VALUES('b');
+  INSERT INTO t1 VALUES('B');
+}
+do_execsql_test 6.2 {
+  SELECT * FROM t1 WHERE x COLLATE nocase BETWEEN 'a' AND 'c';
+} {b B}
+do_execsql_test 6.3 {
+  SELECT * FROM t1 WHERE x BETWEEN 'a' COLLATE nocase AND 'c' COLLATE nocase;
+} {b B}
+do_execsql_test 6.4 {
+  SELECT * FROM t1 
+  WHERE x COLLATE nocase BETWEEN 'a' COLLATE nocase AND 'c' COLLATE nocase;
+} {b B}
+do_execsql_test 6.5 {
+  SELECT * FROM t1 WHERE +x COLLATE nocase BETWEEN 'a' AND 'c';
+} {b B}
+do_execsql_test 6.6 {
+  SELECT * FROM t1 WHERE +x BETWEEN 'a' COLLATE nocase AND 'c' COLLATE nocase;
+} {b B}
+do_execsql_test 6.7 {
+  SELECT * FROM t1 
+  WHERE +x COLLATE nocase BETWEEN 'a' COLLATE nocase AND 'c' COLLATE nocase;
+} {b B}
+
 finish_test
-- 
cgit v1.2.3