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/vtab1.test | 50 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 15 deletions(-)

(limited to 'test/vtab1.test')

diff --git a/test/vtab1.test b/test/vtab1.test
index 1f17e53..0542ee6 100644
--- a/test/vtab1.test
+++ b/test/vtab1.test
@@ -618,8 +618,9 @@ do_test vtab1-5-6 {
 do_test vtab1-5-7 {
   filter $::echo_module
 } [list \
-  xFilter {SELECT rowid, * FROM 't2' WHERE d = ?} \
   xFilter {SELECT rowid, * FROM 't1'}             \
+  xFilter {SELECT rowid, * FROM 't2' WHERE d = ?} \
+  xFilter {SELECT rowid, * FROM 't2' WHERE d = ?} \
 ]
 
 execsql {
@@ -1039,10 +1040,10 @@ do_test vtab1.12-1 {
 # First test outside of a transaction.
 do_test vtab1.12-2 {
   catchsql { INSERT INTO echo_c SELECT * FROM b; }
-} {1 {echo-vtab-error: column a is not unique}}
+} {1 {echo-vtab-error: UNIQUE constraint failed: c.a}}
 do_test vtab1.12-2.1 {
   sqlite3_errmsg db
-} {echo-vtab-error: column a is not unique}
+} {echo-vtab-error: UNIQUE constraint failed: c.a}
 do_test vtab1.12-3 {
   execsql { SELECT * FROM c }
 } {3 G H}
@@ -1051,7 +1052,7 @@ do_test vtab1.12-3 {
 do_test vtab1.12-4 {
   execsql  {BEGIN}
   catchsql { INSERT INTO echo_c SELECT * FROM b; }
-} {1 {echo-vtab-error: column a is not unique}}
+} {1 {echo-vtab-error: UNIQUE constraint failed: c.a}}
 do_test vtab1.12-5 {
   execsql { SELECT * FROM c }
 } {3 G H}
@@ -1133,12 +1134,12 @@ do_test vtab1-14.015 {
 
 
 
-do_test vtab1-14.1 {
-  execsql { DELETE FROM c }
-  set echo_module ""
-  execsql { SELECT * FROM echo_c WHERE rowid IN (1, 2, 3) }
-  set echo_module
-} {/xBestIndex {SELECT rowid, . FROM 'c' WHERE rowid = .} xFilter {SELECT rowid, . FROM 'c' WHERE rowid = .} 1/}
+#do_test vtab1-14.1 {
+#  execsql { DELETE FROM c }
+#  set echo_module ""
+#  execsql { SELECT * FROM echo_c WHERE rowid IN (1, 2, 3) }
+#  set echo_module
+#} {/.*xBestIndex {SELECT rowid, . FROM 'c' WHERE rowid = .} xFilter {SELECT rowid, . FROM 'c'} 1/}
 
 do_test vtab1-14.2 {
   set echo_module ""
@@ -1152,11 +1153,11 @@ do_test vtab1-14.3 {
   set echo_module
 } [list xBestIndex {SELECT rowid, * FROM 'c' WHERE a = ?} xFilter {SELECT rowid, * FROM 'c' WHERE a = ?} 1]
 
-do_test vtab1-14.4 {
-  set echo_module ""
-  execsql { SELECT * FROM echo_c WHERE a IN (1, 2) }
-  set echo_module
-} {/xBestIndex {SELECT rowid, . FROM 'c' WHERE a = .} xFilter {SELECT rowid, . FROM 'c' WHERE a = .} 1/}
+#do_test vtab1-14.4 {
+#  set echo_module ""
+#  execsql { SELECT * FROM echo_c WHERE a IN (1, 2) }
+#  set echo_module
+#} {/xBestIndex {SELECT rowid, . FROM 'c' WHERE a = .} xFilter {SELECT rowid, . FROM 'c' WHERE a = .} 1/}
 
 do_test vtab1-15.1 {
   execsql {
@@ -1375,4 +1376,23 @@ do_execsql_test 20.4 {
   ORDER BY 1, 2;
 } {5 5 6 6 11 11 12 12}
 
+#-------------------------------------------------------------------------
+#
+do_execsql_test 21.1 {
+  CREATE TABLE t9(a,b,c);
+  CREATE VIRTUAL TABLE t9v USING echo(t9);
+
+  INSERT INTO t9 VALUES(1,2,3);
+  INSERT INTO t9 VALUES(3,2,1);
+  INSERT INTO t9 VALUES(2,2,2);
+}
+
+do_execsql_test 21.2 {
+  SELECT * FROM t9v WHERE a<b;
+} {1 2 3}
+
+do_execsql_test 21.3 {
+  SELECT * FROM t9v WHERE a=b;
+} {2 2 2}
+
 finish_test
-- 
cgit v1.2.3