From 2d97242175417a4f6d7f996872eb4bd81744bab6 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 20 Jul 2004 00:40:01 +0000 Subject: [PATCH] Comment out all of date/time functions with SQLITE_OMIT_DATETIME_FUNCS. Ticket #784. (CVS 1829) FossilOrigin-Name: 28c01d2ac705923d3210ec2b8906541f42ec6f25 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/date.c | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 12ce254370..522c544f5d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Correct\shandling\sof\sviews\son\stables\swith\squoted\scolumn\snames.\s\sTicket\s#756.\s(CVS\s1827) -D 2004-07-20T00:20:47 +C Comment\sout\sall\sof\sdate/time\sfunctions\swith\sSQLITE_OMIT_DATETIME_FUNCS.\nTicket\s#784.\s(CVS\s1829) +D 2004-07-20T00:40:01 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -28,7 +28,7 @@ F src/btree.h 41cb3ff6ebc3f6da2d0a074e39ff8c7a2287469f F src/btree_rb.c af40501eedd7b673ffd5e02f3a4702c76596d64a F src/build.c cb1ab5ce737ae6b6fe141e256c5e7c524c78ed68 F src/copy.c 750e13828c3e4a293123e36aaa7cf0f22466248a -F src/date.c 6ccb9336f1faef639d52b0aa4d31244d665607fa +F src/date.c 54befeafe3e2af041c22bcc49fd79f0396b75c4d F src/delete.c 82001c74882319f94dab5f6b92a27311b31092ae F src/encode.c fc8c51f0b61bc803ccdec092e130bebe762b0a2f F src/expr.c 8c3f5603c3e98b1c146d18076ba3e82cdbb59c11 @@ -189,7 +189,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P db5ae13db3edec82dd2ead3b76fc9f89f33b2dc2 -R e16d653d018602be1f19944b4f6597e0 +P ef0d5ebe96b9babe275d62ed6abe95652838de5f +R cda82a4951d281d09e47e2d6fddf0eeb U drh -Z 9b8e15d2f6d27acf7fe448eb52d58528 +Z 894b83d5da2df546db7a6341fe8948a8 diff --git a/manifest.uuid b/manifest.uuid index 2285542a16..2bb68b12e1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ef0d5ebe96b9babe275d62ed6abe95652838de5f \ No newline at end of file +28c01d2ac705923d3210ec2b8906541f42ec6f25 \ No newline at end of file diff --git a/src/date.c b/src/date.c index 418cce52d2..e0e69eca82 100644 --- a/src/date.c +++ b/src/date.c @@ -16,7 +16,7 @@ ** sqliteRegisterDateTimeFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: date.c,v 1.16.2.1 2004/07/18 22:25:15 drh Exp $ +** $Id: date.c,v 1.16.2.2 2004/07/20 00:40:01 drh Exp $ ** ** NOTES: ** @@ -849,19 +849,18 @@ static void strftimeFunc(sqlite_func *context, int argc, const char **argv){ ** external linkage. */ void sqliteRegisterDateTimeFunctions(sqlite *db){ +#ifndef SQLITE_OMIT_DATETIME_FUNCS static struct { char *zName; int nArg; int dataType; void (*xFunc)(sqlite_func*,int,const char**); } aFuncs[] = { -#ifndef SQLITE_OMIT_DATETIME_FUNCS { "julianday", -1, SQLITE_NUMERIC, juliandayFunc }, { "date", -1, SQLITE_TEXT, dateFunc }, { "time", -1, SQLITE_TEXT, timeFunc }, { "datetime", -1, SQLITE_TEXT, datetimeFunc }, { "strftime", -1, SQLITE_TEXT, strftimeFunc }, -#endif }; int i; @@ -872,4 +871,5 @@ void sqliteRegisterDateTimeFunctions(sqlite *db){ sqlite_function_type(db, aFuncs[i].zName, aFuncs[i].dataType); } } +#endif } -- 2.47.2