/ Check-in [60c62829]
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:Add the stmts virtual table to testfixture builds. Add new compile-time options SQLITE_ENABLE_QPSG and SQLITE_ENABLE_STMTSVTAB to ctime.c
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 60c628293a1d8a1505e1a36dbd01b1f62bcfd7915e144044c92385423cbf8e07
User & Date: drh 2017-06-29 13:41:59
Context
2017-06-29
14:17
A couple fixes for the Win32 interface for lsm1. check-in: ebbd98e9 user: mistachkin tags: trunk
13:41
Add the stmts virtual table to testfixture builds. Add new compile-time options SQLITE_ENABLE_QPSG and SQLITE_ENABLE_STMTSVTAB to ctime.c check-in: 60c62829 user: drh tags: trunk
13:35
Compilation fix for lsm1 using MSVC. check-in: b7794cc5 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

Changes to Makefile.in.

  1084   1084   # hidden when the library is built via the amalgamation).
  1085   1085   #
  1086   1086   TESTFIXTURE_FLAGS  = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
  1087   1087   TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE 
  1088   1088   TESTFIXTURE_FLAGS += -DBUILD_sqlite
  1089   1089   TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
  1090   1090   TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
         1091  +TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTSVTAB
  1091   1092   
  1092   1093   TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
  1093   1094   TESTFIXTURE_SRC1 = sqlite3.c
  1094   1095   TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
  1095   1096   TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
  1096   1097   
  1097   1098   testfixture$(TEXE):	$(TESTFIXTURE_SRC)

Changes to Makefile.msc.

  2086   2086   # hidden when the library is built via the amalgamation).
  2087   2087   #
  2088   2088   TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
  2089   2089   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE=""
  2090   2090   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CORE $(NO_WARN)
  2091   2091   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
  2092   2092   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
         2093  +TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTSVTAB
  2093   2094   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
  2094   2095   
  2095   2096   TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
  2096   2097   TESTFIXTURE_SRC1 = $(TESTEXT) $(SQLITE3C)
  2097   2098   !IF $(USE_AMALGAMATION)==0
  2098   2099   TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
  2099   2100   !ELSE

Changes to main.mk.

   773    773   
   774    774   # Rules to build the 'testfixture' application.
   775    775   #
   776    776   TESTFIXTURE_FLAGS  = -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
   777    777   TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
   778    778   TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
   779    779   TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
          780  +TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTSVTAB
   780    781   
   781    782   testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
   782    783   	$(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
   783    784   		$(TESTSRC) $(TESTSRC2) $(TOP)/src/tclsqlite.c                \
   784    785   		-o testfixture$(EXE) $(LIBTCL) libsqlite3.a $(THREADLIB)
   785    786   
   786    787   amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c  \

Changes to src/ctime.c.

   260    260     "ENABLE_NULL_TRIM",
   261    261   #endif
   262    262   #if SQLITE_ENABLE_OVERSIZE_CELL_CHECK
   263    263     "ENABLE_OVERSIZE_CELL_CHECK",
   264    264   #endif
   265    265   #if SQLITE_ENABLE_PREUPDATE_HOOK
   266    266     "ENABLE_PREUPDATE_HOOK",
          267  +#endif
          268  +#if SQLITE_ENABLE_QPSG
          269  +  "ENABLE_QPSG",
   267    270   #endif
   268    271   #if SQLITE_ENABLE_RBU
   269    272     "ENABLE_RBU",
   270    273   #endif
   271    274   #if SQLITE_ENABLE_RTREE
   272    275     "ENABLE_RTREE",
   273    276   #endif
................................................................................
   283    286   #if SQLITE_ENABLE_SQLLOG
   284    287     "ENABLE_SQLLOG",
   285    288   #endif
   286    289   #if defined(SQLITE_ENABLE_STAT4)
   287    290     "ENABLE_STAT4",
   288    291   #elif defined(SQLITE_ENABLE_STAT3)
   289    292     "ENABLE_STAT3",
          293  +#endif
          294  +#if SQLITE_ENABLE_STMTSVTAB
          295  +  "ENABLE_STMTSVTAB",
   290    296   #endif
   291    297   #if SQLITE_ENABLE_STMT_SCANSTATUS
   292    298     "ENABLE_STMT_SCANSTATUS",
   293    299   #endif
   294    300   #if SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
   295    301     "ENABLE_UNKNOWN_SQL_FUNCTION",
   296    302   #endif

Changes to src/test_config.c.

   556    556     Tcl_SetVar2(interp, "sqlite_options", "stat4", "0", TCL_GLOBAL_ONLY);
   557    557   #endif
   558    558   #if defined(SQLITE_ENABLE_STAT3) && !defined(SQLITE_ENABLE_STAT4)
   559    559     Tcl_SetVar2(interp, "sqlite_options", "stat3", "1", TCL_GLOBAL_ONLY);
   560    560   #else
   561    561     Tcl_SetVar2(interp, "sqlite_options", "stat3", "0", TCL_GLOBAL_ONLY);
   562    562   #endif
          563  +
          564  +#if defined(SQLITE_ENABLE_STMTSVTAB) && !defined(SQLITE_OMIT_VIRTUALTABLE)
          565  +  Tcl_SetVar2(interp, "sqlite_options", "stmtsvtab", "1", TCL_GLOBAL_ONLY);
          566  +#else
          567  +  Tcl_SetVar2(interp, "sqlite_options", "stmtsvtab", "0", TCL_GLOBAL_ONLY);
          568  +#endif
   563    569   
   564    570   #ifdef SQLITE_ENABLE_STMT_SCANSTATUS
   565    571     Tcl_SetVar2(interp, "sqlite_options", "scanstatus", "1", TCL_GLOBAL_ONLY);
   566    572   #else
   567    573     Tcl_SetVar2(interp, "sqlite_options", "scanstatus", "0", TCL_GLOBAL_ONLY);
   568    574   #endif
   569    575