Allow INDEXED BY and NOT INDEXED clauses in SELECT statements. (CVS 5766)

FossilOrigin-Name: 98ca5580f5acd2e7b3ce512520ec0527f221505e

test/indexedby.test

@@ -0,0 +1,151 @@
+# 2008 October 4
+#
+# 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.
+#
+#***********************************************************************
+#
+# $Id: indexedby.test,v 1.1 2008/10/06 05:32:19 danielk1977 Exp $
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+# Create a schema with some indexes.
+#
+do_test indexedby-1.1 {
+  execsql {
+    CREATE TABLE t1(a, b);
+    CREATE INDEX i1 ON t1(a);
+    CREATE INDEX i2 ON t1(b);
+
+    CREATE TABLE t2(c, d);
+    CREATE INDEX i3 ON t2(c);
+    CREATE INDEX i4 ON t2(d);
+
+    CREATE VIEW v1 AS SELECT * FROM t1;
+  }
+} {}
+
+# Explain Query Plan
+#
+proc EQP {sql} {
+  uplevel "execsql {EXPLAIN QUERY PLAN $sql}"
+}
+
+# These tests are to check that "EXPLAIN QUERY PLAN" is working as expected.
+#
+do_test indexedby-1.2 {
+  EQP { select * from t1 WHERE a = 10; }
+} {0 0 {TABLE t1 WITH INDEX i1}}
+do_test indexedby-1.3 {
+  EQP { select * from t1 ; }
+} {0 0 {TABLE t1}}
+do_test indexedby-1.4 {
+  EQP { select * from t1, t2 WHERE c = 10; }
+} {0 1 {TABLE t2 WITH INDEX i3} 1 0 {TABLE t1}}
+
+# Parser tests. Test that an INDEXED BY or NOT INDEX clause can be 
+# attached to a table in the FROM clause, but not to a sub-select or
+# SQL view. Also test that specifying an index that does not exist or
+# is attached to a different table is detected as an error.
+# 
+do_test indexedby-2.1 {
+  execsql { SELECT * FROM t1 NOT INDEXED WHERE a = 'one' AND b = 'two'}
+} {}
+do_test indexedby-2.2 {
+  execsql { SELECT * FROM t1 INDEXED BY i1 WHERE a = 'one' AND b = 'two'}
+} {}
+do_test indexedby-2.3 {
+  execsql { SELECT * FROM t1 INDEXED BY i2 WHERE a = 'one' AND b = 'two'}
+} {}
+
+do_test indexedby-2.4 {
+  catchsql { SELECT * FROM t1 INDEXED BY i3 WHERE a = 'one' AND b = 'two'}
+} {1 {no such index: i3}}
+do_test indexedby-2.5 {
+  catchsql { SELECT * FROM t1 INDEXED BY i5 WHERE a = 'one' AND b = 'two'}
+} {1 {no such index: i5}}
+do_test indexedby-2.6 {
+  catchsql { SELECT * FROM t1 INDEXED BY WHERE a = 'one' AND b = 'two'}
+} {1 {near "WHERE": syntax error}}
+do_test indexedby-2.7 {
+  catchsql { SELECT * FROM v1 INDEXED BY i1 WHERE a = 'one' }
+} {1 {no such index: i1}}
+
+# Tests for single table cases.
+#
+do_test indexedby-3.1 {
+  EQP { SELECT * FROM t1 NOT INDEXED WHERE a = 'one' AND b = 'two'}
+} {0 0 {TABLE t1}}
+do_test indexedby-3.2 {
+  EQP { SELECT * FROM t1 INDEXED BY i1 WHERE a = 'one' AND b = 'two'}
+} {0 0 {TABLE t1 WITH INDEX i1}}
+do_test indexedby-3.3 {
+  EQP { SELECT * FROM t1 INDEXED BY i2 WHERE a = 'one' AND b = 'two'}
+} {0 0 {TABLE t1 WITH INDEX i2}}
+do_test indexedby-3.4 {
+  catchsql { SELECT * FROM t1 INDEXED BY i2 WHERE a = 'one' }
+} {1 {cannot use index: i2}}
+do_test indexedby-3.5 {
+  catchsql { SELECT * FROM t1 INDEXED BY i2 ORDER BY a }
+} {1 {cannot use index: i2}}
+do_test indexedby-3.6 {
+  catchsql { SELECT * FROM t1 INDEXED BY i1 WHERE a = 'one' }
+} {0 {}}
+do_test indexedby-3.7 {
+  catchsql { SELECT * FROM t1 INDEXED BY i1 ORDER BY a }
+} {0 {}}
+
+# Tests for multiple table cases.
+#
+do_test indexedby-4.1 {
+  EQP { SELECT * FROM t1, t2 WHERE a = c }
+} {0 0 {TABLE t1} 1 1 {TABLE t2 WITH INDEX i3}}
+do_test indexedby-4.2 {
+  EQP { SELECT * FROM t1 INDEXED BY i1, t2 WHERE a = c }
+} {0 1 {TABLE t2} 1 0 {TABLE t1 WITH INDEX i1}}
+
+# Test embedding an INDEXED BY in a CREATE VIEW statement. This block
+# also tests that nothing bad happens if an index refered to by
+# a CREATE VIEW statement is dropped and recreated.
+#
+do_test indexedby-5.1 {
+  execsql {
+    CREATE VIEW v2 AS SELECT * FROM t1 INDEXED BY i1 WHERE a > 5;
+  }
+  EQP { SELECT * FROM v2 }
+} {0 0 {TABLE t1 WITH INDEX i1}}
+do_test indexedby-5.2 {
+  EQP { SELECT * FROM v2 WHERE b = 10 }
+} {0 0 {TABLE t1 WITH INDEX i1}}
+do_test indexedby-5.3 {
+  execsql { DROP INDEX i1 }
+  catchsql { SELECT * FROM v2 }
+} {1 {no such index: i1}}
+do_test indexedby-5.4 {
+  # Recreate index i1 in such a way as it cannot be used by the view query.
+  execsql { CREATE INDEX i1 ON t1(b) }
+  catchsql { SELECT * FROM v2 }
+} {1 {cannot use index: i1}}
+do_test indexedby-5.5 {
+  # Drop and recreate index i1 again. This time, create it so that it can
+  # be used by the query.
+  execsql { DROP INDEX i1 ; CREATE INDEX i1 ON t1(a) }
+  catchsql { SELECT * FROM v2 }
+} {0 {}}
+
+# Test that "NOT INDEXED" may use the rowid index, but not others.
+# 
+do_test indexedby-6.1 {
+  EQP { SELECT * FROM t1 WHERE b = 10 ORDER BY rowid }
+} {0 0 {TABLE t1 WITH INDEX i2 ORDER BY}}
+do_test indexedby-6.2 {
+  EQP { SELECT * FROM t1 NOT INDEXED WHERE b = 10 ORDER BY rowid }
+} {0 0 {TABLE t1 USING PRIMARY KEY ORDER BY}}
+
+finish_test
+

test/malloc.test

@@ -16,7 +16,7 @@
 # to see what happens in the library if a malloc were to really fail
 # due to an out-of-memory situation.
 #
-# $Id: malloc.test,v 1.67 2008/09/23 16:41:30 danielk1977 Exp $
+# $Id: malloc.test,v 1.68 2008/10/06 05:32:19 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -660,6 +660,17 @@ do_malloc_test 27 -tclprep {
   }
 }
 
+# Test that malloc failures that occur while processing INDEXED BY
+# clauses are handled correctly.
+do_malloc_test 28 -sqlprep {
+  CREATE TABLE t1(a, b);
+  CREATE INDEX i1 ON t1(a);
+  CREATE VIEW v1 AS SELECT * FROM t1 INDEXED BY i1 WHERE a = 10;
+} -sqlbody {
+  SELECT * FROM t1 INDEXED BY i1 ORDER BY a;
+  SELECT * FROM v1;
+}
+
 # Ensure that no file descriptors were leaked.
 do_test malloc-99.X {
   catch {db close}