aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main.c42
-rw-r--r--src/pager.c131
-rw-r--r--src/pager.h6
-rw-r--r--src/sqlite.h.in27
-rw-r--r--src/sqliteInt.h3
5 files changed, 165 insertions, 44 deletions
diff --git a/src/main.c b/src/main.c
index c0f53916a..5426c8d71 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4272,13 +4272,17 @@ int sqlite3UriCount(const char *z){
** returns a NULL pointer.
*/
const char *sqlite3_uri_parameter(const char *zFilename, const char *zParam){
+ const Pager *pPager;
+ const char *z;
if( zFilename==0 || zParam==0 ) return 0;
- zFilename += sqlite3Strlen30(zFilename) + 1;
- while( zFilename[0] ){
- int x = strcmp(zFilename, zParam);
- zFilename += sqlite3Strlen30(zFilename) + 1;
- if( x==0 ) return zFilename;
- zFilename += sqlite3Strlen30(zFilename) + 1;
+ pPager = sqlite3PagerFromFilename(zFilename);
+ assert( pPager!=0 );
+ z = sqlite3PagerQueryParameters(pPager);
+ while( z[0] ){
+ int x = strcmp(z, zParam);
+ z += sqlite3Strlen30(z) + 1;
+ if( x==0 ) return z;
+ z += sqlite3Strlen30(z) + 1;
}
return 0;
}
@@ -4309,6 +4313,32 @@ sqlite3_int64 sqlite3_uri_int64(
}
/*
+** Translate a filename that was handed to a VFS routine into the corresponding
+** database, journal, or WAL file.
+**
+** It is an error to pass this routine a filename string that was not
+** passed into the VFS from the SQLite core. Doing so is similar to
+** passing free() a pointer that was not obtained from malloc() - it is
+** an error that we cannot easily detect but that will likely cause memory
+** corruption.
+*/
+const char *sqlite3_filename_database(const char *zFilename){
+ const Pager *pPager = sqlite3PagerFromFilename(zFilename);
+ assert( pPager!=0 );
+ return sqlite3PagerFilename(pPager, 0);
+}
+const char *sqlite3_filename_journal(const char *zFilename){
+ const Pager *pPager = sqlite3PagerFromFilename(zFilename);
+ assert( pPager!=0 );
+ return sqlite3PagerJournalFilename(pPager);
+}
+const char *sqlite3_filename_wal(const char *zFilename){
+ const Pager *pPager = sqlite3PagerFromFilename(zFilename);
+ assert( pPager!=0 );
+ return sqlite3PagerWalFilename(pPager);
+}
+
+/*
** Return the Btree pointer identified by zDbName. Return NULL if not found.
*/
Btree *sqlite3DbNameToBtree(sqlite3 *db, const char *zDbName){
diff --git a/src/pager.c b/src/pager.c
index 0fae9ae3d..685f0462b 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -696,6 +696,7 @@ struct Pager {
Pgno mxPgno; /* Maximum allowed size of the database */
i64 journalSizeLimit; /* Size limit for persistent journal files */
char *zFilename; /* Name of the database file */
+ char *zQueryParam; /* URI query parameters on the filename */
char *zJournal; /* Name of the journal file */
int (*xBusyHandler)(void*); /* Function to call when busy */
void *pBusyHandlerArg; /* Context argument for xBusyHandler */
@@ -4838,53 +4839,72 @@ int sqlite3PagerOpen(
** Database file handle (pVfs->szOsFile bytes)
** Sub-journal file handle (journalFileSize bytes)
** Main journal file handle (journalFileSize bytes)
+ ** Pointer back to self (sizeof(*Pager) bytes)
** Database file name (nPathname+1 bytes)
+ ** URI query parameters (nUriByte bytes)
+ ** padding for 8-byte alignment
+ ** Pointer back to self (sizeof(*Pager) bytes)
+ ** WAL filename (nPathname+4+1 bytes)
+ ** padding for 8-byte alignment
+ ** Pointer back to self (sizeof(*Pager) bytes)
** Journal file name (nPathname+8+1 bytes)
*/
pPtr = (u8 *)sqlite3MallocZero(
- ROUND8(sizeof(*pPager)) + /* Pager structure */
- ROUND8(pcacheSize) + /* PCache object */
- ROUND8(pVfs->szOsFile) + /* The main db file */
- journalFileSize * 2 + /* The two journal files */
- nPathname + 1 + nUriByte + /* zFilename */
- nPathname + 8 + 2 /* zJournal */
+ ROUND8(sizeof(*pPager)) + /* Pager structure */
+ ROUND8(pcacheSize) + /* PCache object */
+ ROUND8(pVfs->szOsFile) + /* The main db file */
+ journalFileSize * 2 + /* The two journal files */
+ sizeof(Pager*) + /* Self-pointer for database */
+ ROUND8(nPathname + 1 + nUriByte) + /* database filename + query params */
+ sizeof(Pager*) + /* Self-pointer for journal */
+ ROUND8(nPathname + 8 + 2) + /* zJournal */
#ifndef SQLITE_OMIT_WAL
- + nPathname + 4 + 2 /* zWal */
+ sizeof(Pager*) + /* Self-pointer for zWal */
+ ROUND8(nPathname + 4 + 2) + /* zWal */
#endif
+ 0
);
assert( EIGHT_BYTE_ALIGNMENT(SQLITE_INT_TO_PTR(journalFileSize)) );
if( !pPtr ){
sqlite3DbFree(0, zPathname);
return SQLITE_NOMEM_BKPT;
}
- pPager = (Pager*)(pPtr);
- pPager->pPCache = (PCache*)(pPtr += ROUND8(sizeof(*pPager)));
- pPager->fd = (sqlite3_file*)(pPtr += ROUND8(pcacheSize));
- pPager->sjfd = (sqlite3_file*)(pPtr += ROUND8(pVfs->szOsFile));
- pPager->jfd = (sqlite3_file*)(pPtr += journalFileSize);
- pPager->zFilename = (char*)(pPtr += journalFileSize);
+ pPager = (Pager*)pPtr; pPtr += ROUND8(sizeof(*pPager));
+ pPager->pPCache = (PCache*)pPtr; pPtr += ROUND8(pcacheSize);
+ pPager->fd = (sqlite3_file*)pPtr; pPtr += ROUND8(pVfs->szOsFile);
+ pPager->sjfd = (sqlite3_file*)pPtr; pPtr += journalFileSize;
+ pPager->jfd = (sqlite3_file*)pPtr; pPtr += journalFileSize;
assert( EIGHT_BYTE_ALIGNMENT(pPager->jfd) );
- /* Fill in the Pager.zFilename and Pager.zJournal buffers, if required. */
- if( zPathname ){
- assert( nPathname>0 );
- memcpy(pPager->zFilename, zPathname, nPathname);
- if( nUri ) memcpy(&pPager->zFilename[nPathname+1], zUri, nUriByte);
- pPager->zJournal = (char*)(pPtr += nPathname + 1 + nUriByte);
- memcpy(pPager->zJournal, zPathname, nPathname);
- memcpy(&pPager->zJournal[nPathname], "-journal", 8);
- sqlite3FileSuffix3(pPager->zFilename, pPager->zJournal);
+ /* Fill in the Pager.zFilename and pPager.zQueryParam fields */
+ assert( EIGHT_BYTE_ALIGNMENT(pPtr) );
+ memcpy(pPtr, &pPager, sizeof(pPager)); pPtr += sizeof(pPager);
+ pPager->zFilename = (char*)pPtr;
+ if( nPathname==0 ) zPathname = "";
+ memcpy(pPtr, zPathname, nPathname);
+ pPager->zQueryParam = pPager->zFilename + nPathname + 1;
+ if( zUri ) memcpy(pPager->zQueryParam, zUri, nUriByte);
+ assert( nUriByte>=1 );
+ assert( nUriByte >= nUri*3 + 1 );
+ pPtr += ROUND8(nPathname + 1 + nUriByte);
+
#ifndef SQLITE_OMIT_WAL
- pPager->zWal = (char*)(pPtr += nPathname + 8 + 2);
- memcpy(pPager->zWal, zPathname, nPathname);
- memcpy(&pPager->zWal[nPathname], "-wal", 4);
- sqlite3FileSuffix3(pPager->zFilename, pPager->zWal);
- assert( sqlite3UriCount(pPager->zWal)==0 );
+ /* Fill in Pager.zWal */
+ assert( EIGHT_BYTE_ALIGNMENT(pPtr) );
+ memcpy(pPtr, &pPager, sizeof(pPager)); pPtr += sizeof(pPager);
+ pPager->zWal = (char*)pPtr;
+ memcpy(pPtr, zPathname, nPathname);
+ memcpy(pPtr+nPathname, "-wal", 4); pPtr += ROUND8(nPathname + 4 + 2);
#endif
- assert( sqlite3UriCount(pPager->zFilename)==nUri );
- assert( sqlite3UriCount(pPager->zJournal)==0 );
- sqlite3DbFree(0, zPathname);
- }
+
+ /* Fill in Pager.zJournal */
+ assert( EIGHT_BYTE_ALIGNMENT(pPtr) );
+ memcpy(pPtr, &pPager, sizeof(pPager)); pPtr += sizeof(pPager);
+ pPager->zJournal = (char*)pPtr;
+ memcpy(pPtr, zPathname, nPathname);
+ memcpy(pPtr+nPathname, "-journal",8); /*pPtr += ROUND8(nPathname + 8 + 2);*/
+
+ if( nPathname ) sqlite3DbFree(0, zPathname);
pPager->pVfs = pVfs;
pPager->vfsFlags = vfsFlags;
@@ -4933,9 +4953,9 @@ int sqlite3PagerOpen(
}
#endif
}
- pPager->noLock = sqlite3_uri_boolean(zFilename, "nolock", 0);
+ pPager->noLock = sqlite3_uri_boolean(pPager->zFilename, "nolock", 0);
if( (iDc & SQLITE_IOCAP_IMMUTABLE)!=0
- || sqlite3_uri_boolean(zFilename, "immutable", 0) ){
+ || sqlite3_uri_boolean(pPager->zFilename, "immutable", 0) ){
vfsFlags |= SQLITE_OPEN_READONLY;
goto act_like_temp_file;
}
@@ -6999,11 +7019,52 @@ int sqlite3PagerSavepoint(Pager *pPager, int op, int iSavepoint){
** shared cache, it uses nullIfMemDb==0 so that in-memory databases can
** participate in shared-cache.
*/
-const char *sqlite3PagerFilename(Pager *pPager, int nullIfMemDb){
+const char *sqlite3PagerFilename(const Pager *pPager, int nullIfMemDb){
return (nullIfMemDb && pPager->memDb) ? "" : pPager->zFilename;
}
/*
+** Return the name of the Journal file or WAL file of the given pager.
+*/
+const char *sqlite3PagerJournalFilename(const Pager *pPager){
+ assert( pPager!=0 );
+ return pPager->zJournal;
+}
+#ifndef SQLITE_OMIT_WAL
+const char *sqlite3PagerWalFilename(const Pager *pPager){
+ assert( pPager!=0 );
+ return pPager->zWal;
+}
+#endif /* SQLITE_OMIT_WAL */
+
+/* Return a pointer to the URI query parameters associated with the
+** pager.
+**
+** The query parameters are a sequence of strings pairs. The first
+** string of each pair is the key and the second string is the value.
+** All strings are terminated by a single 0x00 byte. The list is
+** terminated by the first empty-string key.
+*/
+const char *sqlite3PagerQueryParameters(const Pager *pPager){
+ assert( pPager!=0 );
+ return pPager->zQueryParam;
+}
+
+/* If zFilename is a filename passed to the xOpen method of the VFS -
+** either the main database file, the WAL file, or the journal file -
+** then this routine returns a pointer to the Pager object associated
+** with that file.
+*/
+const Pager *sqlite3PagerFromFilename(const char *zFilename){
+ const Pager **pp = (const Pager**)zFilename;
+ pp--;
+ assert( (*pp)->zFilename==zFilename
+ || (*pp)->zJournal==zFilename
+ || (*pp)->zWal==zFilename );
+ return *pp;
+}
+
+/*
** Return the VFS structure for the pager.
*/
sqlite3_vfs *sqlite3PagerVfs(Pager *pPager){
@@ -7655,6 +7716,8 @@ int sqlite3PagerCloseWal(Pager *pPager, sqlite3 *db){
return rc;
}
+
+
#ifdef SQLITE_ENABLE_SNAPSHOT
/*
** If this is a WAL database, obtain a snapshot handle for the snapshot
diff --git a/src/pager.h b/src/pager.h
index de96dc551..2e8ba30f3 100644
--- a/src/pager.h
+++ b/src/pager.h
@@ -203,7 +203,11 @@ u32 sqlite3PagerDataVersion(Pager*);
int sqlite3PagerRefcount(Pager*);
#endif
int sqlite3PagerMemUsed(Pager*);
-const char *sqlite3PagerFilename(Pager*, int);
+const char *sqlite3PagerFilename(const Pager*, int);
+const char *sqlite3PagerWalFilename(const Pager*);
+const char *sqlite3PagerJournalFilename(const Pager*);
+const char *sqlite3PagerQueryParameters(const Pager*);
+const Pager *sqlite3PagerFromFilename(const char*);
sqlite3_vfs *sqlite3PagerVfs(Pager*);
sqlite3_file *sqlite3PagerFile(Pager*);
sqlite3_file *sqlite3PagerJrnlFile(Pager*);
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 909666975..7f76e0855 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -3536,6 +3536,33 @@ const char *sqlite3_uri_parameter(const char *zFilename, const char *zParam);
int sqlite3_uri_boolean(const char *zFile, const char *zParam, int bDefault);
sqlite3_int64 sqlite3_uri_int64(const char*, const char*, sqlite3_int64);
+/*
+** CAPI3REF: Translate filenames
+**
+** These routines are available to VFS implementations for translating
+** filenames between the main database file, the journal file, and the
+** WAL file.
+**
+** If F is the name of an sqlite database file, journal file, or WAL file
+** then sqlite3_filename_database(F) returns the name of the corresponding
+** database file.
+**
+** If F is the name of an sqlite database file, journal file, or WAL file
+** then sqlite3_filename_journal(F) returns the name of the corresponding
+** rollback journal file.
+**
+** If F is the name of an sqlite database file, journal file, or WAL file
+** then sqlite3_filename_wal(F) returns the name of the corresponding
+** WAL file.
+**
+** In all of the above, if F is not the name of a database, journal or WAL
+** filename passed into the VFS from the SQLite core, then the result is
+** undefined and is likely a memory access violation.
+*/
+const char *sqlite3_filename_database(const char*);
+const char *sqlite3_filename_journal(const char*);
+const char *sqlite3_filename_wal(const char*);
+
/*
** CAPI3REF: Error Codes And Messages
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 14c17a42e..53e7095da 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -4108,9 +4108,6 @@ void sqlite3AddDefaultValue(Parse*,Expr*,const char*,const char*);
void sqlite3AddCollateType(Parse*, Token*);
void sqlite3AddGenerated(Parse*,Expr*,Token*);
void sqlite3EndTable(Parse*,Token*,Token*,u8,Select*);
-#ifdef SQLITE_DEBUG
- int sqlite3UriCount(const char*);
-#endif
int sqlite3ParseUri(const char*,const char*,unsigned int*,
sqlite3_vfs**,char**,char **);
#ifdef SQLITE_HAS_CODEC
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-21 15:26:43 +0000