From f8fb27f4a95da62c92709582a4b18b1b6f8a403a Mon Sep 17 00:00:00 2001 From: larrybr Date: Thu, 15 Apr 2021 00:26:34 +0000 Subject: [PATCH 1/3] Bring pragma compile_options up to date. And make mkctimec.tcl help do so. FossilOrigin-Name: 63ea3e298c575a408e5c5e12368292c966db6dcffcb6e1c770734f28b8757635 --- manifest | 16 +++---- manifest.uuid | 2 +- src/ctime.c | 19 ++++++++- tool/mkctimec.tcl | 103 +++++++++++++++++++++++++++++++++++++++------- 4 files changed, 114 insertions(+), 26 deletions(-) diff --git a/manifest b/manifest index f7000bbdfd..2d1f0482ec 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Prevent\san\sassert()\sfrom\sfailing\sif\ssqlite3_blob_reopen()\sis\scalled\son\sa\sblob-handle\sthat\shas\salready\shit\san\sSQLITE_CORRUPT\serror. -D 2021-04-14T15:25:10.656 +C Bring\spragma\scompile_options\sup\sto\sdate.\sAnd\smake\smkctimec.tcl\shelp\sdo\sso. +D 2021-04-15T00:26:34.919 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -489,7 +489,7 @@ F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae F src/build.c 9f15ff3e074d3989cc1396f575118eb4c28fb677d33f54393ec263799c94b5bd F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e -F src/ctime.c 2a322b9a3d75771fb4d99e0702851f4f68dda982507a0f798eefb0712969a410 +F src/ctime.c 39fb02038fa3091cf8bc443083f7778f95b8cd7d44b007a1a86095759e7c359a F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c @@ -1839,7 +1839,7 @@ F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x -F tool/mkctimec.tcl dd183b73ae1c28249669741c250525f0407e579a70482371668fd5f130d9feb3 +F tool/mkctimec.tcl 064bd59aa21ebb97d150b9355876c4444dc6886528551fa8f164d241f7df26be F tool/mkkeywordhash.c 08b6e4d7a482a7f37a9a0032e7ba968e26624a027b6b2e9ba589be6f5e3d8c2c F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33 F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c @@ -1912,7 +1912,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 3c266690c753d093c2cb74138a46ed69276d85cd119d687a6858c84211e84eaf -R 1229821373c94710c6cfca65316fcc76 -U dan -Z d1d1b9d93c24f2fe354e7ba5f2704dee +P b5dc7aba036cfd6d09c68dd17608328063634ca99ff341f97bab2dc2a1f59b11 +R b95c72c4911ad1a00cf52d8c60561403 +U larrybr +Z a3c0c1fe90ff7f207fa76ea789d0c43a diff --git a/manifest.uuid b/manifest.uuid index 5b985ac25b..5911dc02fb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b5dc7aba036cfd6d09c68dd17608328063634ca99ff341f97bab2dc2a1f59b11 \ No newline at end of file +63ea3e298c575a408e5c5e12368292c966db6dcffcb6e1c770734f28b8757635 \ No newline at end of file diff --git a/src/ctime.c b/src/ctime.c index 7982f23aeb..3a4e3487fb 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -196,7 +196,7 @@ static const char * const sqlite3azCompileOpt[] = { #if SQLITE_ENABLE_BYTECODE_VTAB "ENABLE_BYTECODE_VTAB", #endif -#if SQLITE_ENABLE_CEROD +#ifdef SQLITE_ENABLE_CEROD "ENABLE_CEROD=" CTIMEOPT_VAL(SQLITE_ENABLE_CEROD), #endif #if SQLITE_ENABLE_COLUMN_METADATA @@ -211,12 +211,21 @@ static const char * const sqlite3azCompileOpt[] = { #if SQLITE_ENABLE_CURSOR_HINTS "ENABLE_CURSOR_HINTS", #endif +#if SQLITE_ENABLE_DBPAGE_VTAB + "ENABLE_DBPAGE_VTAB", +#endif #if SQLITE_ENABLE_DBSTAT_VTAB "ENABLE_DBSTAT_VTAB", #endif +#if SQLITE_ENABLE_DESERIALIZE + "ENABLE_DESERIALIZE", +#endif #if SQLITE_ENABLE_EXPENSIVE_ASSERT "ENABLE_EXPENSIVE_ASSERT", #endif +#if SQLITE_ENABLE_EXPLAIN_COMMENTS + "ENABLE_EXPLAIN_COMMENTS", +#endif #if SQLITE_ENABLE_FTS1 "ENABLE_FTS1", #endif @@ -280,6 +289,9 @@ static const char * const sqlite3azCompileOpt[] = { #if SQLITE_ENABLE_NULL_TRIM "ENABLE_NULL_TRIM", #endif +#if SQLITE_ENABLE_OFFSET_SQL_FUNC + "ENABLE_OFFSET_SQL_FUNC", +#endif #if SQLITE_ENABLE_OVERSIZE_CELL_CHECK "ENABLE_OVERSIZE_CELL_CHECK", #endif @@ -310,7 +322,7 @@ static const char * const sqlite3azCompileOpt[] = { #if SQLITE_ENABLE_SQLLOG "ENABLE_SQLLOG", #endif -#if defined(SQLITE_ENABLE_STAT4) +#if SQLITE_ENABLE_STAT4 "ENABLE_STAT4", #endif #if SQLITE_ENABLE_STMTVTAB @@ -571,6 +583,9 @@ static const char * const sqlite3azCompileOpt[] = { #if SQLITE_OMIT_INTEGRITY_CHECK "OMIT_INTEGRITY_CHECK", #endif +#if SQLITE_OMIT_INTROSPECTION_PRAGMAS + "OMIT_INTROSPECTION_PRAGMAS", +#endif #if SQLITE_OMIT_LIKE_OPTIMIZATION "OMIT_LIKE_OPTIMIZATION", #endif diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl index 499d5a5639..e2c5cafa04 100644 --- a/tool/mkctimec.tcl +++ b/tool/mkctimec.tcl @@ -40,13 +40,17 @@ set boolean_options { SQLITE_ENABLE_8_3_NAMES SQLITE_ENABLE_API_ARMOR SQLITE_ENABLE_ATOMIC_WRITE - SQLITE_ENABLE_CEROD + SQLITE_ENABLE_BATCH_ATOMIC_WRITE + SQLITE_ENABLE_BYTECODE_VTAB SQLITE_ENABLE_COLUMN_METADATA SQLITE_ENABLE_COLUMN_USED_MASK SQLITE_ENABLE_COSTMULT SQLITE_ENABLE_CURSOR_HINTS + SQLITE_ENABLE_DBPAGE_VTAB SQLITE_ENABLE_DBSTAT_VTAB + SQLITE_ENABLE_DESERIALIZE SQLITE_ENABLE_EXPENSIVE_ASSERT + SQLITE_ENABLE_EXPLAIN_COMMENTS SQLITE_ENABLE_FTS1 SQLITE_ENABLE_FTS2 SQLITE_ENABLE_FTS3 @@ -54,26 +58,34 @@ set boolean_options { SQLITE_ENABLE_FTS3_TOKENIZER SQLITE_ENABLE_FTS4 SQLITE_ENABLE_FTS5 + SQLITE_ENABLE_GEOPOLY SQLITE_ENABLE_HIDDEN_COLUMNS SQLITE_ENABLE_ICU SQLITE_ENABLE_IOTRACE SQLITE_ENABLE_JSON1 SQLITE_ENABLE_LOAD_EXTENSION SQLITE_ENABLE_LOCKING_STYLE + SQLITE_ENABLE_MATH_FUNCTIONS SQLITE_ENABLE_MEMORY_MANAGEMENT SQLITE_ENABLE_MEMSYS3 SQLITE_ENABLE_MEMSYS5 SQLITE_ENABLE_MULTIPLEX + SQLITE_ENABLE_NORMALIZE SQLITE_ENABLE_NULL_TRIM + SQLITE_ENABLE_OFFSET_SQL_FUNC SQLITE_ENABLE_OVERSIZE_CELL_CHECK SQLITE_ENABLE_PREUPDATE_HOOK + SQLITE_ENABLE_QPSG SQLITE_ENABLE_RBU SQLITE_ENABLE_RTREE SQLITE_ENABLE_SELECTTRACE SQLITE_ENABLE_SESSION SQLITE_ENABLE_SNAPSHOT + SQLITE_ENABLE_SORTER_REFERENCES SQLITE_ENABLE_SQLLOG + SQLITE_ENABLE_STAT4 SQLITE_ENABLE_STMT_SCANSTATUS + SQLITE_ENABLE_STMTVTAB SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION SQLITE_ENABLE_UNLOCK_NOTIFY SQLITE_ENABLE_UPDATE_DELETE_LIMIT @@ -85,7 +97,6 @@ set boolean_options { SQLITE_EXTRA_IFNULLROW SQLITE_FTS5_ENABLE_TEST_MI SQLITE_FTS5_NO_WITHOUT_ROWID - SQLITE_HAS_CODEC SQLITE_HOMEGROWN_RECURSIVE_MUTEX SQLITE_IGNORE_AFP_LOCK_ERRORS SQLITE_IGNORE_FLOCK_LOCK_ERRORS @@ -116,7 +127,6 @@ set boolean_options { SQLITE_OMIT_AUTOVACUUM SQLITE_OMIT_BETWEEN_OPTIMIZATION SQLITE_OMIT_BLOB_LITERAL - SQLITE_OMIT_BTREECOUNT SQLITE_OMIT_CAST SQLITE_OMIT_CHECK SQLITE_OMIT_COMPLETE @@ -135,6 +145,7 @@ set boolean_options { SQLITE_OMIT_HEX_INTEGER SQLITE_OMIT_INCRBLOB SQLITE_OMIT_INTEGRITY_CHECK + SQLITE_OMIT_INTROSPECTION_PRAGMAS SQLITE_OMIT_LIKE_OPTIMIZATION SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_LOCALTIME @@ -191,7 +202,15 @@ set boolean_options { SQLITE_ZERO_MALLOC } -# All compile time options for which the assigned value is other than boolean. +# All compile time options for which the assigned value is other than boolean +# and is a comma-separated scalar pair. +# +set value2_options { + SQLITE_DEFAULT_LOOKASIDE +} + +# All compile time options for which the assigned value is other than boolean +# and is a single scalar. # set value_options { SQLITE_BITMASK_TYPE @@ -200,7 +219,6 @@ set value_options { SQLITE_DEFAULT_FILE_PERMISSIONS SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT SQLITE_DEFAULT_LOCKING_MODE - SQLITE_DEFAULT_LOOKASIDE SQLITE_DEFAULT_MMAP_SIZE SQLITE_DEFAULT_PAGE_SIZE SQLITE_DEFAULT_PCACHE_INITSZ @@ -212,6 +230,7 @@ set value_options { SQLITE_DEFAULT_WAL_SYNCHRONOUS SQLITE_DEFAULT_WORKER_THREADS SQLITE_ENABLE_8_3_NAMES + SQLITE_ENABLE_CEROD SQLITE_ENABLE_LOCKING_STYLE SQLITE_EXTRA_INIT SQLITE_EXTRA_SHUTDOWN @@ -245,13 +264,6 @@ set value_options { # Options that require custom code. # -set options(ENABLE_STAT3) { -#if defined(SQLITE_ENABLE_STAT4) - "ENABLE_STAT4", -#elif defined(SQLITE_ENABLE_STAT3) - "ENABLE_STAT3", -#endif -} set options(COMPILER) { #if defined(__clang__) && defined(__clang_major__) "COMPILER=clang-" CTIMEOPT_VAL(__clang_major__) "." @@ -274,7 +286,7 @@ set options(THREADSAFE) { #elif defined(THREADSAFE) "THREADSAFE=" CTIMEOPT_VAL(THREADSAFE), #else - "THREADSAFE=1" + "THREADSAFE=1", #endif } @@ -303,9 +315,70 @@ foreach v $value_options { #endif }] } + +foreach v $value2_options { + set name [trim_name $v] + set options($name) [subst { +#ifdef $v + "$name=" CTIMEOPT_VAL2($v), +#endif +}] +} -foreach o [lsort [array names options]] { - puts [string trim $options($o)] +# Split a string on a regex, return all parts in order. +# Any elements with an even index may be empty. +# Elements with odd indices will match the regex. +proc split_on_re {re str {nrepps 1}} { + set chunks {} + set cix 0 + set resm [regexp -all -inline -indices $re $str] + if {[llength $resm]==0} { + return $str + } + set rix 0 + while {$rix < [llength $resm]} { + set mre [lindex $resm $rix] + incr rix $nrepps + set mbx [lindex $mre 0] + set mex [lindex $mre 1] + lappend chunks [string range $str $cix [expr $mbx - 1]] + lappend chunks [string range $str $mbx $mex] + set cix [expr $mex + 1] + } + lappend chunks [string range $str $cix end] + return $chunks } +set ctime_c "src/ctime.c" +if {[catch {set cfd [open $ctime_c r]}]!=0} { + puts stderr "File '$ctime_c' unreadable. Run this script from checkout root." + exit 1; +} + +set ctfc [read $cfd] +close $cfd + +set re {/\*\s+\*+\s*((BEGIN)|(END)) CODE GENERATED BY (\S+)\s+\*/\s+} +set renpp 5 + +set ctfcChunks [split_on_re $re $ctfc $renpp] +if {[llength $ctfcChunks] != 5} { + puts stderr "File '$ctime_c' has too few generated code markers." + exit 1; +} + +if {[catch {set cfd [open $ctime_c w]}]!=0} { + puts stderr "File '$ctime_c' unwritable." + exit 1; +} + +puts -nonewline $cfd [lindex $ctfcChunks 0] +puts -nonewline $cfd [lindex $ctfcChunks 1] +foreach o [lsort [array names options]] { + puts $cfd [string trim $options($o)] +} +puts -nonewline $cfd [lindex $ctfcChunks 3] +puts -nonewline $cfd [lindex $ctfcChunks 4] + +close $cfd From 5ae13144ef058dceae3177dc5e0375eacfa12d84 Mon Sep 17 00:00:00 2001 From: larrybr Date: Fri, 16 Apr 2021 10:25:54 +0000 Subject: [PATCH 2/3] Dial back assumptions on compile option defaults to reflect actual conditionals. FossilOrigin-Name: cb3127725dbb9490f9bb3a95d7fd52acd78390981ee8b7c6da35bdfb84ad0359 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/ctime.c | 26 +++++++++----------------- tool/mkctimec.tcl | 19 ++++++++++++++----- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/manifest b/manifest index 0bec6dcbb1..08c89acab9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\sfrom\s(forked)\strunk.\sHandle\scompile\soptions\sthat\sdiffer\sfrom\sdefault\sby\sbeing\s0. -D 2021-04-15T23:43:25.989 +C Dial\sback\sassumptions\son\scompile\soption\sdefaults\sto\sreflect\sactual\sconditionals. +D 2021-04-16T10:25:54.528 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -489,7 +489,7 @@ F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae F src/build.c 9f15ff3e074d3989cc1396f575118eb4c28fb677d33f54393ec263799c94b5bd F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e -F src/ctime.c b3886a79e23e71d8e2acbee090bf08f13f4efd0312d06c64e910b76bf8eb3e5a +F src/ctime.c fbc6243075128ddf187ec469a6d178ebd58bb6eae8e3ba191446fa18cffb17c3 F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c @@ -1839,7 +1839,7 @@ F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x -F tool/mkctimec.tcl 7e5fc6eca3c701dcb0f669eefaff3d872f00708c2902561759a4a0b193d2e97e +F tool/mkctimec.tcl 6469850ad5e9f9173046da7569a0a6f40c5b21316406b70aaa029b357bc8d220 F tool/mkkeywordhash.c 08b6e4d7a482a7f37a9a0032e7ba968e26624a027b6b2e9ba589be6f5e3d8c2c F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33 F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c @@ -1912,7 +1912,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 63ea3e298c575a408e5c5e12368292c966db6dcffcb6e1c770734f28b8757635 2363a14ca723c0343fbe350f6c19787a7a47c2289fd9af136c97a451b53b5226 -R a2d0ebd6bfcd194144667102be607922 +P 6eb83f83d280f82bd225972f52c52922257303740a968457ff0be08d43993d59 +R 81b6477b1bd41ea5f96a630ccfc9d907 U larrybr -Z da3344fd449b8db410018370a9ecf455 +Z cb4d1f0cfcf57b3bffb8efd3b5ca63ec diff --git a/manifest.uuid b/manifest.uuid index 5f9595b546..f7982e889e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6eb83f83d280f82bd225972f52c52922257303740a968457ff0be08d43993d59 \ No newline at end of file +cb3127725dbb9490f9bb3a95d7fd52acd78390981ee8b7c6da35bdfb84ad0359 \ No newline at end of file diff --git a/src/ctime.c b/src/ctime.c index 2f17ca7608..7aae08d746 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -475,11 +475,6 @@ static const char * const sqlite3azCompileOpt[] = { #if SQLITE_MUTEX_NOOP "MUTEX_NOOP", #endif -#ifdef SQLITE_MUTEX_NREF -# if SQLITE_MUTEX_NREF != 1 - "MUTEX_NREF=" CTIMEOPT_VAL(SQLITE_MUTEX_NREF), -# endif -#endif #if SQLITE_MUTEX_OMIT "MUTEX_OMIT", #endif @@ -549,10 +544,8 @@ static const char * const sqlite3azCompileOpt[] = { #if SQLITE_OMIT_CTE "OMIT_CTE", #endif -#ifdef SQLITE_OMIT_DATETIME_FUNCS -# if SQLITE_OMIT_DATETIME_FUNCS != 1 - "OMIT_DATETIME_FUNCS=" CTIMEOPT_VAL(SQLITE_OMIT_DATETIME_FUNCS), -# endif +#if defined(SQLITE_OMIT_DATETIME_FUNCS) || defined(SQLITE_OMIT_FLOATING_POINT) + "OMIT_DATETIME_FUNCS", #endif #if SQLITE_OMIT_DECLTYPE "OMIT_DECLTYPE", @@ -593,10 +586,8 @@ static const char * const sqlite3azCompileOpt[] = { #if SQLITE_OMIT_LIKE_OPTIMIZATION "OMIT_LIKE_OPTIMIZATION", #endif -#ifdef SQLITE_OMIT_LOAD_EXTENSION -# if SQLITE_OMIT_LOAD_EXTENSION != 1 - "OMIT_LOAD_EXTENSION=" CTIMEOPT_VAL(SQLITE_OMIT_LOAD_EXTENSION), -# endif +#if SQLITE_OMIT_LOAD_EXTENSION + "OMIT_LOAD_EXTENSION", #endif #if SQLITE_OMIT_LOCALTIME "OMIT_LOCALTIME", @@ -731,10 +722,11 @@ static const char * const sqlite3azCompileOpt[] = { #if SQLITE_SUBSTR_COMPATIBILITY "SUBSTR_COMPATIBILITY", #endif -#ifdef SQLITE_SYSTEM_MALLOC -# if SQLITE_SYSTEM_MALLOC != 1 - "SYSTEM_MALLOC=" CTIMEOPT_VAL(SQLITE_SYSTEM_MALLOC), -# endif +#if (!defined(SQLITE_WIN32_MALLOC) \ + && !defined(SQLITE_ZERO_MALLOC) \ + && !defined(SQLITE_MEMDEBUG) \ + ) || defined(SQLITE_SYSTEM_MALLOC) + "SYSTEM_MALLOC", #endif #if SQLITE_TCL "TCL", diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl index 1d4607e253..2861ae93d4 100644 --- a/tool/mkctimec.tcl +++ b/tool/mkctimec.tcl @@ -14,15 +14,10 @@ # set boolean_defnnz_options { {SQLITE_HOMEGROWN_RECURSIVE_MUTEX 1} - {SQLITE_OMIT_LOAD_EXTENSION 1} {SQLITE_POWERSAFE_OVERWRITE 1} {SQLITE_DEFAULT_MEMSTATUS 1} - {SQLITE_SYSTEM_MALLOC 1} - {SQLITE_OMIT_DATETIME_FUNCS 1} {SQLITE_OMIT_TRACE 1} - {SQLITE_ENABLE_FTS3 1} {SQLITE_ALLOW_COVERING_INDEX_SCAN 1} - {SQLITE_MUTEX_NREF 1} } # All Boolean compile time options which default to 0 or empty. @@ -158,6 +153,7 @@ set boolean_defnil_options { SQLITE_OMIT_INTEGRITY_CHECK SQLITE_OMIT_INTROSPECTION_PRAGMAS SQLITE_OMIT_LIKE_OPTIMIZATION + SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_LOCALTIME SQLITE_OMIT_LOOKASIDE SQLITE_OMIT_MEMORYDB @@ -287,6 +283,19 @@ set options(HAVE_ISNAN) { "HAVE_ISNAN", #endif } +set options(OMIT_DATETIME_FUNCS) { +#if defined(SQLITE_OMIT_DATETIME_FUNCS) || defined(SQLITE_OMIT_FLOATING_POINT) + "OMIT_DATETIME_FUNCS", +#endif +} +set options(SYSTEM_MALLOC) "\ +#if (!defined(SQLITE_WIN32_MALLOC) \\ + && !defined(SQLITE_ZERO_MALLOC) \\ + && !defined(SQLITE_MEMDEBUG) \\ + ) || defined(SQLITE_SYSTEM_MALLOC) + \"SYSTEM_MALLOC\", +#endif +" set options(THREADSAFE) { #if defined(SQLITE_THREADSAFE) "THREADSAFE=" CTIMEOPT_VAL(SQLITE_THREADSAFE), From 14e250ac16567f33d49d964b80aa35aedfa34788 Mon Sep 17 00:00:00 2001 From: larrybr Date: Wed, 19 May 2021 20:01:53 +0000 Subject: [PATCH 3/3] Incorporate ..._DESERIALIZE revision. FossilOrigin-Name: b70587cca9e4f0116621e27362186e9329bcea8016c6565cd3ec5a9bf4a99d46 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/ctime.c | 6 +++--- tool/mkctimec.tcl | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 231f1fbf9c..71b5636dee 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C merge\sfrom\strunk -D 2021-05-19T19:55:10.206 +C Incorporate\s..._DESERIALIZE\srevision. +D 2021-05-19T20:01:53.234 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -490,7 +490,7 @@ F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae F src/build.c 4e13b92f77d3f6dc1285c3636a2ba7c6af5cbb793e52075a762fbcebcd36e968 F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e -F src/ctime.c fbc6243075128ddf187ec469a6d178ebd58bb6eae8e3ba191446fa18cffb17c3 +F src/ctime.c 3052b6b05ed9ef547a3dd66b8e01bfa9d582e78752ad6ed327da84652641e038 F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c @@ -1840,7 +1840,7 @@ F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x -F tool/mkctimec.tcl 6469850ad5e9f9173046da7569a0a6f40c5b21316406b70aaa029b357bc8d220 +F tool/mkctimec.tcl 06b0d503ee0e6c2d4abe83563b43d4925a12e31ec9fb3249ce39661f53fbd1ce F tool/mkkeywordhash.c 08b6e4d7a482a7f37a9a0032e7ba968e26624a027b6b2e9ba589be6f5e3d8c2c F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33 F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c @@ -1913,7 +1913,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 3ff228249adf2da345d3e19e9af3e23d1354f6b9a35ddbe9864e1a07716d871c 4e81ea3b15fb3fce5f31b77273639e748a735ab0970620e564e9a5c977b24a1a -R ea5c2f2d0e31f28da39a2a85c2aa9d20 +P 19ffe3cfe278a4046f32df56f75080c2377e4c44ad40a02d39db8e7701526204 +R b79079c9927fb0cb56cad0473e73ea54 U larrybr -Z aa5a2c613a1eb5b66660089c16f7322a +Z 0c270da26eb4d97d44b3fbdea701b7af diff --git a/manifest.uuid b/manifest.uuid index e1633a6196..f59f8b9167 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -19ffe3cfe278a4046f32df56f75080c2377e4c44ad40a02d39db8e7701526204 \ No newline at end of file +b70587cca9e4f0116621e27362186e9329bcea8016c6565cd3ec5a9bf4a99d46 \ No newline at end of file diff --git a/src/ctime.c b/src/ctime.c index 7aae08d746..fa69216c6d 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -221,9 +221,6 @@ static const char * const sqlite3azCompileOpt[] = { #if SQLITE_ENABLE_DBSTAT_VTAB "ENABLE_DBSTAT_VTAB", #endif -#if SQLITE_ENABLE_DESERIALIZE - "ENABLE_DESERIALIZE", -#endif #if SQLITE_ENABLE_EXPENSIVE_ASSERT "ENABLE_EXPENSIVE_ASSERT", #endif @@ -553,6 +550,9 @@ static const char * const sqlite3azCompileOpt[] = { #if SQLITE_OMIT_DEPRECATED "OMIT_DEPRECATED", #endif +#if SQLITE_OMIT_DESERIALIZE + "OMIT_DESERIALIZE", +#endif #if SQLITE_OMIT_DISKIO "OMIT_DISKIO", #endif diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl index 2861ae93d4..2f15ac9fb7 100644 --- a/tool/mkctimec.tcl +++ b/tool/mkctimec.tcl @@ -59,7 +59,6 @@ set boolean_defnil_options { SQLITE_ENABLE_CURSOR_HINTS SQLITE_ENABLE_DBPAGE_VTAB SQLITE_ENABLE_DBSTAT_VTAB - SQLITE_ENABLE_DESERIALIZE SQLITE_ENABLE_EXPENSIVE_ASSERT SQLITE_ENABLE_EXPLAIN_COMMENTS SQLITE_ENABLE_FTS3 @@ -142,6 +141,7 @@ set boolean_defnil_options { SQLITE_OMIT_CTE SQLITE_OMIT_DECLTYPE SQLITE_OMIT_DEPRECATED + SQLITE_OMIT_DESERIALIZE SQLITE_OMIT_DISKIO SQLITE_OMIT_EXPLAIN SQLITE_OMIT_FLAG_PRAGMAS