From 97602f859355d93c20e97f1cbb57a5cc3b449d61 Mon Sep 17 00:00:00 2001 From: drh Date: Sun, 24 May 2009 11:07:49 +0000 Subject: [PATCH] Correct and clarify the documentation on the third parameter to sqlite3_create_function(). (CVS 6672) FossilOrigin-Name: 6b7929ed36fa14291b6cb09de5808100945ad7a0 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/sqlite.h.in | 8 +++++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 7dc24de90e..5044dfb73f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\stransform\sa\sWHERE\sclause\sof\sthe\sform\s"a\s=\s?\sOR\sa\s=\s?"\sto\s"a\sIN\s(?,\s?)"\sif\s"a"\sis\sa\scolumn\sof\sa\svirtual\stable.\sTicket\s#3871.\s(CVS\s6671) -D 2009-05-22T15:43:27 +C Correct\sand\sclarify\sthe\sdocumentation\son\sthe\sthird\sparameter\sto\nsqlite3_create_function().\s(CVS\s6672) +D 2009-05-24T11:07:49 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -160,7 +160,7 @@ F src/resolve.c 2ce8f8bc8a0c913cbaec3fb3da2be113ea1fa5af F src/rowset.c c64dafba1f9fd876836c8db8682966b9d197eb1f F src/select.c 88e654ab5b183e4fdb084680b66b5bfa6f214dc5 F src/shell.c 7eacd0bdaa887931f5ff205c9defc3e8df95a2dd -F src/sqlite.h.in 72b9457725c0d6af5755648fac46acb1fa9ff810 +F src/sqlite.h.in 66f0884d0a6e84babf3a9f3be6c1ca3e94711356 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17 F src/sqliteInt.h b4cc76a99bc82894703528376067c743eb27184c F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d @@ -730,7 +730,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 93369d91abe10975507ea9302c145e3ddd0c2c76 -R 031fba78b50558f4af4dcca1f55d016a -U danielk1977 -Z 9bdd39326969f0ae9a78f00d0f047279 +P fad88e71cf195e703f7b56b13f0c1818fd0dac84 +R 83f4b69c6a1f98c5bfb6215a23f6d8c5 +U drh +Z d8368db6da4f3cfc3fbf1f91fdeb6519 diff --git a/manifest.uuid b/manifest.uuid index 07c1628da9..5e7f278de2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fad88e71cf195e703f7b56b13f0c1818fd0dac84 \ No newline at end of file +6b7929ed36fa14291b6cb09de5808100945ad7a0 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 0c41003002..dad74e33ac 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -30,7 +30,7 @@ ** the version number) and changes its name to "sqlite3.h" as ** part of the build process. ** -** @(#) $Id: sqlite.h.in,v 1.452 2009/05/22 01:02:27 drh Exp $ +** @(#) $Id: sqlite.h.in,v 1.453 2009/05/24 11:07:49 drh Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -3074,8 +3074,10 @@ int sqlite3_reset(sqlite3_stmt *pStmt); ** ** The third parameter (nArg) ** is the number of arguments that the SQL function or -** aggregate takes. If this parameter is negative, then the SQL function or -** aggregate may take any number of arguments. +** aggregate takes. If this parameter is -1, then the SQL function or +** aggregate may take any number of arguments between 0 and the limit +** set by [sqlite3_limit]([SQLITE_LIMIT_FUNCTION_ARG]). If the third +** parameter must not be less than -1 or greater than 255. ** ** The fourth parameter, eTextRep, specifies what ** [SQLITE_UTF8 | text encoding] this SQL function prefers for -- 2.47.3