/ Check-in [d2cca36a]
Login

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

Overview
Comment:Fix a problem preventing testfixture from being built with SQLITE_OMIT_VIRTUALTABLE.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: d2cca36adc69d2c8e7707d70cbd75c497eae6a1a3f8a9dd18249ca6804c9db5f
User & Date: dan 2019-02-06 13:41:19
Context
2019-02-06
13:48
Do not attempt to test the shell ".trace" command in SQLITE_OMIT_TRACE builds. check-in: 3839e909 user: dan tags: trunk
13:41
Fix a problem preventing testfixture from being built with SQLITE_OMIT_VIRTUALTABLE. check-in: d2cca36a user: dan tags: trunk
01:18
When extending the size of SrcList objects, do not attempt to use extra space on the end of the allocation, as that provides scarcely any performance benefit but does greatly complicate cross-platform testing. check-in: 3087a0c3 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/misc/prefixes.c.

    15     15   **      prefixes('abcdefg')
    16     16   **
    17     17   ** The function has a single (non-HIDDEN) column named prefix that takes
    18     18   ** on all prefixes of the string in its argument, including an empty string
    19     19   ** and the input string itself.  The order of prefixes is from longest
    20     20   ** to shortest.
    21     21   */
           22  +#if !defined(SQLITE_CORE) || !defined(SQLITE_OMIT_VIRTUALTABLE)
    22     23   #if !defined(SQLITEINT_H)
    23     24   #include "sqlite3ext.h"
    24     25   #endif
    25     26   SQLITE_EXTENSION_INIT1
    26     27   #include <string.h>
    27     28   #include <assert.h>
    28     29   
................................................................................
   311    312     if( rc==SQLITE_OK ){
   312    313       rc = sqlite3_create_function(
   313    314           db, "prefix_length", 2, SQLITE_UTF8, 0, prefixLengthFunc, 0, 0
   314    315       );
   315    316     }
   316    317     return rc;
   317    318   }
          319  +#endif /* !defined(SQLITE_CORE) || !defined(SQLITE_OMIT_VIRTUALTABLE) */

Changes to src/test1.c.

  7137   7137     extern int sqlite3_eval_init(sqlite3*,char**,const sqlite3_api_routines*);
  7138   7138     extern int sqlite3_explain_init(sqlite3*,char**,const sqlite3_api_routines*);
  7139   7139     extern int sqlite3_fileio_init(sqlite3*,char**,const sqlite3_api_routines*);
  7140   7140     extern int sqlite3_fuzzer_init(sqlite3*,char**,const sqlite3_api_routines*);
  7141   7141     extern int sqlite3_ieee_init(sqlite3*,char**,const sqlite3_api_routines*);
  7142   7142     extern int sqlite3_nextchar_init(sqlite3*,char**,const sqlite3_api_routines*);
  7143   7143     extern int sqlite3_percentile_init(sqlite3*,char**,const sqlite3_api_routines*);
         7144  +#ifndef SQLITE_OMIT_VIRTUALTABLE
  7144   7145     extern int sqlite3_prefixes_init(sqlite3*,char**,const sqlite3_api_routines*);
         7146  +#endif
  7145   7147     extern int sqlite3_regexp_init(sqlite3*,char**,const sqlite3_api_routines*);
  7146   7148     extern int sqlite3_remember_init(sqlite3*,char**,const sqlite3_api_routines*);
  7147   7149     extern int sqlite3_series_init(sqlite3*,char**,const sqlite3_api_routines*);
  7148   7150     extern int sqlite3_spellfix_init(sqlite3*,char**,const sqlite3_api_routines*);
  7149   7151     extern int sqlite3_totype_init(sqlite3*,char**,const sqlite3_api_routines*);
  7150   7152     extern int sqlite3_wholenumber_init(sqlite3*,char**,const sqlite3_api_routines*);
  7151   7153     extern int sqlite3_unionvtab_init(sqlite3*,char**,const sqlite3_api_routines*);
................................................................................
  7163   7165       { "eval",                  sqlite3_eval_init                 },
  7164   7166       { "explain",               sqlite3_explain_init              },
  7165   7167       { "fileio",                sqlite3_fileio_init               },
  7166   7168       { "fuzzer",                sqlite3_fuzzer_init               },
  7167   7169       { "ieee754",               sqlite3_ieee_init                 },
  7168   7170       { "nextchar",              sqlite3_nextchar_init             },
  7169   7171       { "percentile",            sqlite3_percentile_init           },
         7172  +#ifndef SQLITE_OMIT_VIRTUALTABLE
  7170   7173       { "prefixes",              sqlite3_prefixes_init             },
         7174  +#endif
  7171   7175       { "regexp",                sqlite3_regexp_init               },
  7172   7176       { "remember",              sqlite3_remember_init             },
  7173   7177       { "series",                sqlite3_series_init               },
  7174   7178       { "spellfix",              sqlite3_spellfix_init             },
  7175   7179       { "totype",                sqlite3_totype_init               },
  7176   7180       { "unionvtab",             sqlite3_unionvtab_init            },
  7177   7181       { "wholenumber",           sqlite3_wholenumber_init          },