/ Check-in [0259b629]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

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

Overview
Comment:Check-in [87a6a9970b] did not completely disable FTS4. This check-in aims to finish the job.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 0259b6299e435b3c3a7ca33df8c38c8a5dc84a61
User & Date: drh 2010-03-09 13:02:09
Context
2010-03-09
13:12
Version 3.6.23 release candidate 3 check-in: 747baea5 user: drh tags: trunk
13:02
Check-in [87a6a9970b] did not completely disable FTS4. This check-in aims to finish the job. check-in: 0259b629 user: drh tags: trunk
12:35
Version 3.6.23 release candidate 2 check-in: 73f4d292 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/ctime.c.

    80     80   #endif
    81     81   #ifdef SQLITE_ENABLE_FTS3
    82     82     "ENABLE_FTS3",
    83     83   #endif
    84     84   #ifdef SQLITE_ENABLE_FTS3_PARENTHESIS
    85     85     "ENABLE_FTS3_PARENTHESIS",
    86     86   #endif
           87  +#if 0 /* Disabled because FTS4 is not ready for publication */
    87     88   #ifdef SQLITE_ENABLE_FTS4
    88     89     "ENABLE_FTS4",
           90  +#endif
    89     91   #endif
    90     92   #ifdef SQLITE_ENABLE_ICU
    91     93     "ENABLE_ICU",
    92     94   #endif
    93     95   #ifdef SQLITE_ENABLE_IOTRACE
    94     96     "ENABLE_IOTRACE",
    95     97   #endif

Changes to test/fts4aa.test.

    16     16   set testdir [file dirname $argv0]
    17     17   source $testdir/tester.tcl
    18     18   
    19     19   # If SQLITE_ENABLE_FTS3 is defined, omit this file.
    20     20   ifcapable !fts3 {
    21     21     finish_test
    22     22     return
           23  +}
           24  +if {[db eval {SELECT sqlite_compileoption_used('ENABLE_FTS4')}]==0} {
           25  +  finish_test
           26  +  return
    23     27   }
    24     28   
    25     29   do_test fts4aa-1.0 {
    26     30   db eval {
    27     31   CREATE VIRTUAL TABLE t1 USING fts4(words, tokenize porter);
    28     32   BEGIN TRANSACTION;
    29     33   INSERT INTO t1(docid,words) VALUES(1001001,'In the beginning God created the heaven and the earth.');