From 21717ed6f0946697840cbe6d818c040997fbad8f Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 13 Oct 2008 15:35:08 +0000 Subject: [PATCH] Fix the SQLITE_OMIT_DATETIME_FUNCS compile-time option so that it builds successfully. (CVS 5815) FossilOrigin-Name: c3f91645159511250c9f86c2a97d819f0253d182 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/date.c | 8 ++++---- src/sqliteInt.h | 4 +++- tool/omittest.tcl | 7 +++---- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/manifest b/manifest index 5a13cef345..d26ca2abae 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C In\srollback.test,\sdo\snot\scheck\sfor\sjournal\sdeletion\sif\sthe\sjournal\smode\nis\snot\sDELETE.\s\sCall\sshow_memstats\safter\seach\stest\smodule\sin\sall.test\nand\squick.test.\s(CVS\s5814) -D 2008-10-13T14:16:11 +C Fix\sthe\sSQLITE_OMIT_DATETIME_FUNCS\scompile-time\soption\sso\sthat\sit\sbuilds\nsuccessfully.\s(CVS\s5815) +D 2008-10-13T15:35:09 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 2014e5a4010ad5ebbcaedff98240b3d14ee83838 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -105,7 +105,7 @@ F src/btreeInt.h e38e9b2b285f40f5bc0a6664f630d4a141622f16 F src/build.c 8714bd809583bbe07bf22d0e1808a3fc31abe330 F src/callback.c e970e5beddbdb23f89a6d05cb1a6419d9f755624 F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c -F src/date.c 1b1fc801df40aae891bff8b03f65313df192d677 +F src/date.c 6f4277fa56d8c1b8e70c0bde838c9e99609f5ec0 F src/delete.c d3f2adfdd07e701115a111cc81dca33ed6039d10 F src/expr.c f84e7606f4d6c4b7ae48f324ca625e3b4a90acdd F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff @@ -152,7 +152,7 @@ F src/select.c d910d7350df0d918e22286c5bfd39d4ea68ec813 F src/shell.c d83b578a8ccdd3e0e7fef4388a0887ce9f810967 F src/sqlite.h.in c255878b950548a136375f3ecdfcc367026dc951 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17 -F src/sqliteInt.h d828c17fb591d8f27280cd23a06ac7a962606d24 +F src/sqliteInt.h 69ad0023756cc738d2a5f9def8a0b21d90350667 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76 F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8 @@ -635,7 +635,7 @@ F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 F tool/mksqlite3c.tcl f74c5aacea1668dcf4ac0b75f3e1830942b733f6 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87 -F tool/omittest.tcl 4be55add3ec87f45fe041b7bfa8f16dab8105431 +F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816 F tool/showdb.c a086a3d788c7a23cb008317c3180ceb19f20bce0 @@ -648,7 +648,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 73efca985a05930df761b42886a3ba1c5199f32a -R a137108881ea503d595235c9c0998c29 +P df2c28dc7310510bada292a2e8c1be073803858c +R bc81ea37625583209032a34682fe8302 U drh -Z 0311988efaee1ccf84df6a1be703b5f6 +Z 0963db5df93e45df99a5a15dd02614fb diff --git a/manifest.uuid b/manifest.uuid index 445d9567f9..83eb159a14 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -df2c28dc7310510bada292a2e8c1be073803858c \ No newline at end of file +c3f91645159511250c9f86c2a97d819f0253d182 \ No newline at end of file diff --git a/src/date.c b/src/date.c index 2c2f899ec5..df05ffd13f 100644 --- a/src/date.c +++ b/src/date.c @@ -16,7 +16,7 @@ ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: date.c,v 1.91 2008/10/07 12:32:13 drh Exp $ +** $Id: date.c,v 1.92 2008/10/13 15:35:09 drh Exp $ ** ** SQLite processes all times and dates as Julian Day numbers. The ** dates and times are stored as the number of days since noon @@ -1064,9 +1064,9 @@ void sqlite3RegisterDateTimeFunctions(void){ FUNCTION(current_timestamp, 0, 0, 0, ctimestampFunc), FUNCTION(current_date, 0, 0, 0, cdateFunc ), #else - FUNCTION(current_time, 0, "%H:%M:%S", 0, currentTimeFunc), - FUNCTION(current_timestamp, 0, "%Y-%m-%d", 0, currentTimeFunc), - FUNCTION(current_date, 0, "%Y-%m-%d %H:%M:%S", 0, currentTimeFunc), + STR_FUNCTION(current_time, 0, "%H:%M:%S", 0, currentTimeFunc), + STR_FUNCTION(current_timestamp, 0, "%Y-%m-%d", 0, currentTimeFunc), + STR_FUNCTION(current_date, 0, "%Y-%m-%d %H:%M:%S", 0, currentTimeFunc), #endif }; int i; diff --git a/src/sqliteInt.h b/src/sqliteInt.h index ab46f4c522..e4ef1d0b69 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.783 2008/10/11 18:11:21 drh Exp $ +** @(#) $Id: sqliteInt.h,v 1.784 2008/10/13 15:35:09 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -848,6 +848,8 @@ struct FuncDef { */ #define FUNCTION(zName, nArg, iArg, bNC, xFunc) \ {nArg, SQLITE_UTF8, bNC*8, SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, #zName} +#define STR_FUNCTION(zName, nArg, pArg, bNC, xFunc) \ + {nArg, SQLITE_UTF8, bNC*8, pArg, 0, xFunc, 0, 0, #zName} #define LIKEFUNC(zName, nArg, arg, flags) \ {nArg, SQLITE_UTF8, flags, (void *)arg, 0, likeFunc, 0, 0, #zName} #define AGGREGATE(zName, nArg, arg, nc, xStep, xFinal) \ diff --git a/tool/omittest.tcl b/tool/omittest.tcl index 7fd8309209..ec1508c239 100644 --- a/tool/omittest.tcl +++ b/tool/omittest.tcl @@ -1,5 +1,5 @@ -set rcsid {$Id: omittest.tcl,v 1.7 2008/08/22 13:57:39 pweilbacher Exp $} +set rcsid {$Id: omittest.tcl,v 1.8 2008/10/13 15:35:09 drh Exp $} # Documentation for this script. This may be output to stderr # if the script is invoked incorrectly. @@ -47,7 +47,7 @@ they do not respect the OPTS variable. # proc run_quick_test {dir omit_symbol_list} { # Compile the value of the OPTS Makefile variable. - set opts "-DSQLITE_MEMDEBUG -DSQLITE_DEBUG" + set opts "-DSQLITE_MEMDEBUG -DSQLITE_DEBUG -DSQLITE_NO_SYNC" if {$::tcl_platform(platform)=="windows"} { append opts " -DSQLITE_OS_WIN=1" } elseif {$::tcl_platform(platform)=="os2"} { @@ -155,7 +155,7 @@ proc main {argv} { SQLITE_OMIT_CONFLICT_CLAUSE \ SQLITE_OMIT_DATETIME_FUNCS \ SQLITE_OMIT_DECLTYPE \ - SQLITE_OMIT_DISKIO \ + off_SQLITE_OMIT_DISKIO \ SQLITE_OMIT_EXPLAIN \ SQLITE_OMIT_FLAG_PRAGMAS \ SQLITE_OMIT_FLOATING_POINT \ @@ -170,7 +170,6 @@ proc main {argv} { SQLITE_OMIT_MEMORYDB \ SQLITE_OMIT_OR_OPTIMIZATION \ SQLITE_OMIT_PAGER_PRAGMAS \ - SQLITE_OMIT_PARSER \ SQLITE_OMIT_PRAGMA \ SQLITE_OMIT_PROGRESS_CALLBACK \ SQLITE_OMIT_QUICKBALANCE \