mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the documentation for the sqlite3_uri_*() routines to make it clear

Browse Source 
that there argument must be a database filename passed into xOpen().
No changes to code.

FossilOrigin-Name: 08230a3a8c88f275bfc0ba72d3fea3260f24fc63
This commit is contained in:
drh 2012-01-13 15:50:02 +00:00
parent 983371d999
commit 065dfe692a
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Fix\sbackup2.test\sso\sthat\sit\spasses\son\sOpenBSD\s(which\sproduces\sa\sslightly\sdifferent\serror\smessage\sin\sone\scase).
D 2012-01-13T15:21:07.523
C Update\sthe\sdocumentation\sfor\sthe\ssqlite3_uri_*()\sroutines\sto\smake\sit\sclear\nthat\sthere\sargument\smust\sbe\sa\sdatabase\sfilename\spassed\sinto\sxOpen().\nNo\schanges\sto\scode.
D 2012-01-13T15:50:02.146
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -182,7 +182,7 @@ F src/resolve.c 3d3e80a98f203ac6b9329e9621e29eda85ddfd40
F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
F src/select.c a1d075db66a0ea42807353501b62997969e5be79
F src/shell.c aa4183d4a5243d8110b1d3d77faa4aea7e9c9c2d
F src/sqlite.h.in 02352d9488394a3489b2d153360da58a7c392070
F src/sqlite.h.in 8f46bc8c0d2f08abd9965ebcd0aaef5607ffa27f
F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
F src/sqliteInt.h b8fdd9c39c8d7f5c794f4ea917293d9c75b9aff2
F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@ -987,7 +987,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
P 3f4899a923f06d48edf6eeeb1c52b01958779efc
R 8282b4acb12e09eca726a3ea9ed80d3a
U dan
Z d481ab93d6d7db386c4493125e7648e2
P 227cfe11c4a1c095ccad76116dc4a68cccc5e8f0
R ca9b41255e58bd932abff81962aad33c
U drh
Z f379d4c85e9a75cdc92cb058ea5e8982

2
manifest.uuid
View File

@ -1 +1 @@
227cfe11c4a1c095ccad76116dc4a68cccc5e8f0
08230a3a8c88f275bfc0ba72d3fea3260f24fc63

11
src/sqlite.h.in
View File

@ -2627,8 +2627,10 @@ int sqlite3_open_v2(
** to see if a database file was a URI that contained a specific query
** parameter, and if so obtains the value of that query parameter.
**
** If F is the filename pointer passed into the xOpen() method of a VFS
** implementation and P is the name of the query parameter, then
** If F is the database filename pointer passed into the xOpen() method of
** a VFS implementation when the flags parameter to xOpen() has one or
** more of the [SQLITE_OPEN_URI] or [SQLITE_OPEN_MAIN_DB] bits set and
** P is the name of the query parameter, then
** sqlite3_uri_parameter(F,P) returns the value of the P
** parameter if it exists or a NULL pointer if P does not appear as a
** query parameter on F. If P is a query parameter of F
@ -2648,8 +2650,9 @@ int sqlite3_open_v2(
**
** If F is a NULL pointer, then sqlite3_uri_parameter(F,P) returns NULL and
** sqlite3_uri_boolean(F,P,B) returns B. If F is not a NULL pointer and
** is not a pathname pointer that SQLite passed into the xOpen VFS method,
** then the behavior of this routine is undefined and probably undesirable.
** is not a databaes file pathname pointer that SQLite passed into the xOpen
** VFS method, then the behavior of this routine is undefined and probably
** undesirable.
*/
const char *sqlite3_uri_parameter(const char *zFilename, const char *zParam);
int sqlite3_uri_boolean(const char *zFile, const char *zParam, int bDefault);