Add the sqlite3_db_filename() interface.

FossilOrigin-Name: 93a947989b57959aacc37007a143fdf3921793ab

diff --git a/manifest b/manifest
index 67fa8c4f423469f82030ee5c923fa2f510bcb570..cb7ea23d33284d56e2cc8b66a3916682bccabb2f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Back\sout\sthe\s[ceee03c79a]\schange.
-D 2011-11-16T23:29:37.606
+C Add\sthe\ssqlite3_db_filename()\sinterface.
+D 2011-11-17T00:56:20.474
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -147,7 +147,7 @@ F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
 F src/loadext.c d0d2022a5a07274d408820b978b9e549189d314f
-F src/main.c 3acbdf6f8b93093bd7f96bdfd7f88bab95a5cd7a
+F src/main.c 55cbc40465fb58708cb82d4a285a6ea8cf1e4581
 F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 7456e2ca0524609ebc06a9befeda5289d4575ad4
@@ -182,14 +182,14 @@ F src/resolve.c 365ab1c870e38596d6869e76fb544fe6e4ffc809
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c 80f3ac44a8514b1d107b80f5df4a424ae059d2b6
 F src/shell.c 29812a900a780eb0f835c4bc65e216272689def8
-F src/sqlite.h.in a9d9b247a5e1a203bc24154fdfe8fad49978faa1
+F src/sqlite.h.in acd5715227b060010729b86c11c9a3882f818ec9
 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 F src/sqliteInt.h f412e020e1009163c74be56eaac1bf7f6c0a4515
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 F src/tclsqlite.c de581e2e71f5e7f98366156afad83b4742ac6fe0
-F src/test1.c 348de9657e874bff49b99dcd7307074b6feaf456
+F src/test1.c a445a5d09f63ca66a704720dbec240c65806bcd1
 F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
 F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
 F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@ -274,7 +274,7 @@ F test/async2.test c0a9bd20816d7d6a2ceca7b8c03d3d69c28ffb8b
 F test/async3.test d73a062002376d7edc1fe3edff493edbec1fc2f7
 F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
 F test/async5.test 0dd8701bd588bf6e70c2557a22ae3f22b2567b4c
-F test/attach.test 0e6f8de2589f11a5f474ef57fe5af2877e61c0e8
+F test/attach.test 0d112b7713611fdf0340260192749737135fda5f
 F test/attach2.test e54436ed956d3d88bdee61221da59bf3935a0966
 F test/attach3.test d89ccfe4fe6e2b5e368d480fcdfe4b496c54cf4e
 F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
@@ -976,7 +976,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 3f58e7c8895d1252eff56282c08b1a6f1194452c 1bbbf8574a820c5f787a937f02a8e2a91264ace0
-R 8e7cbea058ef7fa5fd72b3406095ff67
+P 69ec53fc1c60b07bf4aaa983dcd5bf3164fb1ea5
+R 99f71d23f57bbcc6e05ddde9985c021b
 U drh
-Z e301581f8f88dd3a374b15753c08fc01
+Z aa529bb687e7c2c3b8e94ee609022d00

diff --git a/manifest.uuid b/manifest.uuid
index 485d59ac9c0f1061272fe9d0aeb3b6d27bbc7d78..3f500824231bbf23947a152601baf15d5d76ffff 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-69ec53fc1c60b07bf4aaa983dcd5bf3164fb1ea5
\ No newline at end of file
+93a947989b57959aacc37007a143fdf3921793ab
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index edca15290330d3983ade23dfc19dcb6f2fd3a376..43cd82eaa63e9b734bb6cb0fca18838b7eff021e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2970,3 +2970,17 @@ const char *sqlite3_uri_parameter(const char *zFilename, const char *zParam){
   }
   return 0;
 }
+
+/*
+** Return the filename of the database associated with a database
+** connection.
+*/
+const char *sqlite3_db_filename(sqlite3 *db, const char *zDbName){
+  int i;
+  for(i=0; i<db->nDb; i++){
+    if( db->aDb[i].pBt && sqlite3StrICmp(zDbName, db->aDb[i].zName)==0 ){
+      return sqlite3BtreeGetFilename(db->aDb[i].pBt);
+    }
+  }
+  return 0;
+}

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index dc193c6dafe0f2826a37ba8a157781c2ac26d74f..f70893a3db37ccc953484e0b7e96c601ce85bd53 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -4373,6 +4373,17 @@ int sqlite3_get_autocommit(sqlite3*);
 */
 sqlite3 *sqlite3_db_handle(sqlite3_stmt*);
 
+/*
+** CAPI3REF: Return The Filename For A Database Connection
+**
+** ^The sqlite3_db_filename(D,N) interface returns a pointer to a filename
+** associated with database N of connection D.  ^The main database file
+** has the name "main".  If there is no attached database N on the database
+** connection D, or if database N is a temporary or in-memory database, then
+** a NULL pointer is returned.
+*/
+const char *sqlite3_db_filename(sqlite3 *db, const char *zDbName);
+
 /*
 ** CAPI3REF: Find the next prepared statement
 **

diff --git a/src/test1.c b/src/test1.c
index 9cd54e45610788b72159603e985b296517b412d8..3cf9b1375ed0b483065bd88516ac31a415f08fa0 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -4618,6 +4618,29 @@ static int test_db_release_memory(
   return TCL_OK;
 }
 
+/*
+** Usage:  sqlite3_db_filename DB DBNAME
+**
+** Return the name of a file associated with a database.
+*/
+static int test_db_filename(
+  void * clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  sqlite3 *db;
+  const char *zDbName;
+  if( objc!=3 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "DB DBNAME");
+    return TCL_ERROR;
+  }
+  if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
+  zDbName = Tcl_GetString(objv[2]);
+  Tcl_AppendResult(interp, sqlite3_db_filename(db, zDbName), (void*)0);
+  return TCL_OK;
+}
+
 /*
 ** Usage:  sqlite3_soft_heap_limit ?N?
 **
@@ -5941,6 +5964,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
 
      { "sqlite3_release_memory",        test_release_memory,     0},
      { "sqlite3_db_release_memory",     test_db_release_memory,  0},
+     { "sqlite3_db_filename",           test_db_filename,        0},
      { "sqlite3_soft_heap_limit",       test_soft_heap_limit,    0},
      { "sqlite3_thread_cleanup",        test_thread_cleanup,     0},
      { "sqlite3_pager_refcounts",       test_pager_refcounts,    0},

diff --git a/test/attach.test b/test/attach.test
index d57f5bfb52766365fb808db51b8f22ed9d707cb5..be5f9881c31833e2da37256dfb19f2c66f3c8c9f 100644 (file)
--- a/test/attach.test
+++ b/test/attach.test
@@ -51,6 +51,25 @@ do_test attach-1.3 {
     SELECT * FROM two.t2;
   }
 } {1 x 2 y}
+
+# Tests for the sqlite3_db_filename interface
+#
+do_test attach-1.3.1 {
+  file tail [sqlite3_db_filename db main]
+} {test.db}
+do_test attach-1.3.2 {
+  file tail [sqlite3_db_filename db MAIN]
+} {test.db}
+do_test attach-1.3.3 {
+  file tail [sqlite3_db_filename db temp]
+} {}
+do_test attach-1.3.4 {
+  file tail [sqlite3_db_filename db two]
+} {test2.db}
+do_test attach-1.3.5 {
+  file tail [sqlite3_db_filename db three]
+} {}
+
 do_test attach-1.4 {
   execsql {
     SELECT * FROM t2;