/ Check-in [60cf7e44]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix two test script problems revealed by permutations.test.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 60cf7e44871ca8d2136ddad02188f0b9f9c380c1
User & Date: dan 2013-07-05 19:16:58
Context
2013-07-06
17:57
Drop any existing mapping of the database file when exiting the pager "error state", as it may at this point be too large for the database file. Do not invoke file-control MMAP_SIZE if the database file handle does not support xFetch and xUnfetch (on the grounds that xUnfetch(0) calls to invalidate the mapping cannot be made). check-in: 0ae7e75b user: dan tags: trunk
2013-07-05
19:16
Fix two test script problems revealed by permutations.test. check-in: 60cf7e44 user: dan tags: trunk
16:54
Replace an erroneous SQLITE_OMIT_VIRTUAL_TABLE in vdbeaux.c with SQLITE_OMIT_WAL. Also fix some test script problems. check-in: ff8c3f78 user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/autoindex1.test.

    20     20   #
    21     21   ifcapable {!autoindex} {
    22     22     finish_test
    23     23     return
    24     24   }
    25     25   
    26     26   # Setup for logging 
           27  +db close
    27     28   sqlite3_shutdown
    28     29   test_sqlite3_log [list lappend ::log]
    29     30   set ::log [list]
    30     31   sqlite3 db test.db
    31     32   
    32     33   
    33     34   # With automatic index turned off, we do a full scan of the T2 table

Changes to test/where2.test.

   302    302   do_test where2-6.6 {
   303    303     queryplan {
   304    304       SELECT b.* FROM t1 a, t1 b
   305    305        WHERE a.w=1 AND (b.z=10 OR a.y=b.z OR b.z=10)
   306    306        ORDER BY +b.w
   307    307     }
   308    308   } [list 1 0 4 4 2 1 9 10 sort a i1w b $::idx]
          309  +
          310  +if {[permutation] != "no_optimization"} {
   309    311   
   310    312   # Ticket #2249.  Make sure the OR optimization is not attempted if
   311    313   # comparisons between columns of different affinities are needed.
   312    314   #
   313    315   do_test where2-6.7 {
   314    316     execsql {
   315    317       CREATE TABLE t2249a(a TEXT UNIQUE);
................................................................................
   469    471   } {1 2 3 2 3 sort}
   470    472   do_test where2-7.4 {
   471    473     cksort {
   472    474       create unique index i9y on t9(y);
   473    475       select * from t8, t9 where a=1 and y=3 order by b, x
   474    476     }
   475    477   } {1 2 3 2 3 nosort}
          478  +
          479  +} ;# if {[permutation] != "no_optimization"}
   476    480   
   477    481   # Ticket #1807.  Using IN constrains on multiple columns of
   478    482   # a multi-column index.
   479    483   #
   480    484   ifcapable subquery {
   481    485     do_test where2-8.1 {
   482    486       execsql {