Use the database name supplied to table_info() and related pragmas. (CVS 2001)

FossilOrigin-Name: 0415af325739fd4e0bd4761c889719355a1ec4ff

diff --git a/manifest b/manifest
index dafdca0178617d347c4c9e9ceb92668db9b5764e..8ffe90b49109d92f4d576a47d26bedd470b30f6c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sDEFERRED,\sIMMEDIATE,\sand\sEXCLUSIVE\stransactions.\s(CVS\s2000)
-D 2004-10-05T02:41:42
+C Use\sthe\sdatabase\sname\ssupplied\sto\stable_info()\sand\srelated\spragmas.\s(CVS\s2001)
+D 2004-10-05T15:42:53
 F Makefile.in 78ddc9fca09ab6e3b75a79ecf8d490e34cd0519c
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -55,7 +55,7 @@ F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c dc0ffab9941393b072e0b1f1f3de54830727cec9
 F src/pager.h 774d1973acbda341827d21b0da0150575d69f7d9
 F src/parse.y e03d7d7f712ad2b5be61e9a024820c0a8ffdf36d
-F src/pragma.c ba7fdd19c1680bb9bfc8bc5230278f6ae6b1c8ff
+F src/pragma.c 4a071a1908aa7fb5930a9d73fd300a6aa2ac07e1
 F src/printf.c 40770e1f553612d13dfc86d236086e69baa62fe1
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c 96b1489111abe9b584be2f2cce26ad6f2d425b4e
@@ -250,7 +250,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P e8e972ba65fc36171f6b685e8a8f67f93452e031
-R d2fc50e21e7b6df513c30d8cad94f529
+P 81ff8107ad63113782cf5a9ba7a512496114ba08
+R ff0efd5a5f898106b48c51aa9ee32ff8
 U drh
-Z d7255f319d142e01096c8a1787a44a2e
+Z 077e72fc4e15bfcfe383832545b7afca

diff --git a/manifest.uuid b/manifest.uuid
index 9ed2e6008a36d04fc88c92dd28d8a7347caa0612..1ef9202e6e14fe312261930e417392ac0a3158d6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-81ff8107ad63113782cf5a9ba7a512496114ba08
\ No newline at end of file
+0415af325739fd4e0bd4761c889719355a1ec4ff
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index 1373501a778e0a5a43c08c0a361b84d1e71f3b44..4c7b72047e1eefc968cb8f438659d8613e59e6f7 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to implement the PRAGMA command.
 **
-** $Id: pragma.c,v 1.68 2004/10/05 02:41:43 drh Exp $
+** $Id: pragma.c,v 1.69 2004/10/05 15:42:53 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -384,7 +384,7 @@ void sqlite3Pragma(
   if( sqlite3StrICmp(zLeft, "table_info")==0 && zRight ){
     Table *pTab;
     if( sqlite3ReadSchema(pParse) ) goto pragma_out;
-    pTab = sqlite3FindTable(db, zRight, 0);
+    pTab = sqlite3FindTable(db, zRight, zDb);
     if( pTab ){
       int i;
       sqlite3VdbeSetNumCols(v, 6);
@@ -413,7 +413,7 @@ void sqlite3Pragma(
     Index *pIdx;
     Table *pTab;
     if( sqlite3ReadSchema(pParse) ) goto pragma_out;
-    pIdx = sqlite3FindIndex(db, zRight, 0);
+    pIdx = sqlite3FindIndex(db, zRight, zDb);
     if( pIdx ){
       int i;
       pTab = pIdx->pTable;
@@ -436,7 +436,7 @@ void sqlite3Pragma(
     Index *pIdx;
     Table *pTab;
     if( sqlite3ReadSchema(pParse) ) goto pragma_out;
-    pTab = sqlite3FindTable(db, zRight, 0);
+    pTab = sqlite3FindTable(db, zRight, zDb);
     if( pTab ){
       v = sqlite3GetVdbe(pParse);
       pIdx = pTab->pIndex;
@@ -462,7 +462,7 @@ void sqlite3Pragma(
     FKey *pFK;
     Table *pTab;
     if( sqlite3ReadSchema(pParse) ) goto pragma_out;
-    pTab = sqlite3FindTable(db, zRight, 0);
+    pTab = sqlite3FindTable(db, zRight, zDb);
     if( pTab ){
       v = sqlite3GetVdbe(pParse);
       pFK = pTab->pFKey;