1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00

Fix header comments and remove an unnecessary version restriction from the

carray() table-valued function implementation.

FossilOrigin-Name: 021d0fb8d85e44839d2b4fdb90b15f0e1f2442e6
This commit is contained in:
drh
2016-07-13 00:55:28 +00:00
parent dd703e22a5
commit ce0442edf3
3 changed files with 9 additions and 14 deletions

View File

@ -14,7 +14,7 @@
** returns the values in a C-language array. ** returns the values in a C-language array.
** Examples: ** Examples:
** **
** SELECT * FROM array($ptr,5) ** SELECT * FROM carray($ptr,5)
** **
** The query above returns 5 integers contained in a C-language array ** The query above returns 5 integers contained in a C-language array
** at the address $ptr. $ptr is a pointer to the array of integers that ** at the address $ptr. $ptr is a pointer to the array of integers that
@ -24,7 +24,7 @@
** the C-language array. Allowed values of the third parameter are ** the C-language array. Allowed values of the third parameter are
** 'int32', 'int64', 'double', 'char*'. Example: ** 'int32', 'int64', 'double', 'char*'. Example:
** **
** SELECT * FROM array($ptr,10,'char*'); ** SELECT * FROM carray($ptr,10,'char*');
** **
** HOW IT WORKS ** HOW IT WORKS
** **
@ -358,11 +358,6 @@ int sqlite3_carray_init(
int rc = SQLITE_OK; int rc = SQLITE_OK;
SQLITE_EXTENSION_INIT2(pApi); SQLITE_EXTENSION_INIT2(pApi);
#ifndef SQLITE_OMIT_VIRTUALTABLE #ifndef SQLITE_OMIT_VIRTUALTABLE
if( sqlite3_libversion_number()<3008012 ){
*pzErrMsg = sqlite3_mprintf(
"carray() requires SQLite 3.8.12 or later");
return SQLITE_ERROR;
}
rc = sqlite3_create_module(db, "carray", &carrayModule, 0); rc = sqlite3_create_module(db, "carray", &carrayModule, 0);
#endif #endif
return rc; return rc;

View File

@ -1,5 +1,5 @@
C Fix\sthe\serror\scounter\sreset\sin\sLemon\sgenerated\sparsers.\s\sThis\shas\sno\seffect\non\sSQLite. C Fix\sheader\scomments\sand\sremove\san\sunnecessary\sversion\srestriction\sfrom\sthe\ncarray()\stable-valued\sfunction\simplementation.
D 2016-07-12T19:54:49.418 D 2016-07-13T00:55:28.831
F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@ -204,7 +204,7 @@ F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
F ext/icu/icu.c 43df9d8ef2fae7a325100ebd713ab089dc829dd7 F ext/icu/icu.c 43df9d8ef2fae7a325100ebd713ab089dc829dd7
F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
F ext/misc/amatch.c 211108e201105e4bb0c076527b8cfd34330fc234 F ext/misc/amatch.c 211108e201105e4bb0c076527b8cfd34330fc234
F ext/misc/carray.c 29f3b2dbb93b93cedcc571660203d1e24d921bd3 F ext/misc/carray.c 214c9e9d909ceaae3b2f5f917cc2204deca85cc6
F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704 F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704
F ext/misc/compress.c 122faa92d25033d6c3f07c39231de074ab3d2e83 F ext/misc/compress.c 122faa92d25033d6c3f07c39231de074ab3d2e83
F ext/misc/csv.c b92692b057707f5b7bb91feaedde790b2e38304e F ext/misc/csv.c b92692b057707f5b7bb91feaedde790b2e38304e
@ -1505,7 +1505,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 77c692a6704cd877ba35d0afb774ab9b46364d59 P 3ef93950d30b34d852d6bbc101d433a04112868a
R cb6d43e13605575cc663251c668c01f6 R 51e8986673c5be3a3aaceb79764f3cbc
U drh U drh
Z 3209e04e0b1433ba8d0db8fc637ac637 Z 12b2ac3f05d95585a2345745d9c04f9c

View File

@ -1 +1 @@
3ef93950d30b34d852d6bbc101d433a04112868a 021d0fb8d85e44839d2b4fdb90b15f0e1f2442e6