Allow the database name in a DETACH statement to be quoted.

Ticket #1151. (CVS 2386)

FossilOrigin-Name: 24e887735256499e58dabe90463524d9e6eb08ce

diff --git a/manifest b/manifest
index 1acdaf63d57aebac4973df70090b6aa0e5425cb4..29110b4ff3344526f5c9e72433eb98a7598169fd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Be\smore\saggressive\sabout\susing\sthe\sbusy\shandler.\s\sTicket\s#1159.\s(CVS\s2385)
-D 2005-03-14T02:01:50
+C Allow\sthe\sdatabase\sname\sin\sa\sDETACH\sstatement\sto\sbe\squoted.\nTicket\s#1151.\s(CVS\s2386)
+D 2005-03-15T02:04:12
 F Makefile.in 5c00d0037104de2a50ac7647a5f12769795957a3
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -28,7 +28,7 @@ F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.def dbaeb20c153e1d366e8f421b55a573f5dfc00863
 F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a
 F src/alter.c 6dab3d91aa4bf5c24e874145a2a547070c8c1883
-F src/attach.c f78f76bc6a8e5e487ca53636e21ccba2484a9a61
+F src/attach.c 43099c31dfa82b77e671918fc5565ae7ea211af1
 F src/auth.c 18c5a0befe20f3a58a41e3ddd78f372faeeefe1f
 F src/btree.c 1d9b2179ccac13970c883da6ae3758cc72978bb0
 F src/btree.h 2e2cc923224649337d7217df0dd32b06673ca180
@@ -86,7 +86,7 @@ F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3
 F test/alter.test 3a20ce14c3989f7e2e75da50797065c2e56f838b
 F test/alter2.test 60ba0a7057dc71ad630a1cc7c487104346849d50
-F test/attach.test 3c951c822047854fd6c2f1f6ad7c0ad82c7aa90b
+F test/attach.test e6bda19cc954fd84836fadbd70d80134cb17918a
 F test/attach2.test 6f3a3a3a7f5be40388dd4d805e0e0712718dca9d
 F test/attach3.test c05c70b933afbde0901dab9da3e66ee842c09f38
 F test/auth.test b24d12de3a6ba49237216429f8dc672a8a52b342
@@ -274,7 +274,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P 78012246fc1c1fe844d192cfff69a736e388ce7a
-R 12c7fb7c202c4d99608b53151d0373a0
+P 644c6398e52481e5dda87671e1c196b26b1e4990
+R c7a0fd10b1d2a373374c7ed8ae164835
 U drh
-Z 9df5123a27f166217f6a13afcd69b178
+Z 2ee8d8f83569ed719ed59eea247ccc2d

diff --git a/manifest.uuid b/manifest.uuid
index 31cd06605ba9ed9de63ed526cda9a80d878d6cc2..bc59624ad5703517452e5c260102c1ea9246d714 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-644c6398e52481e5dda87671e1c196b26b1e4990
\ No newline at end of file
+24e887735256499e58dabe90463524d9e6eb08ce
\ No newline at end of file

diff --git a/src/attach.c b/src/attach.c
index 095d2ab6204409054a000e6d7e3680844f7c75a2..6a1f34e4d9485fafa71bb9bc853b1dd395c1a717 100644 (file)
--- a/src/attach.c
+++ b/src/attach.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to implement the ATTACH and DETACH commands.
 **
-** $Id: attach.c,v 1.31 2005/01/24 10:25:59 danielk1977 Exp $
+** $Id: attach.c,v 1.32 2005/03/15 02:04:12 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -158,6 +158,7 @@ void sqlite3Detach(Parse *pParse, Token *pDbname){
   sqlite3 *db;
   Vdbe *v;
   Db *pDb = 0;
+  char *zName;
 
   v = sqlite3GetVdbe(pParse);
   if( !v ) return;
@@ -165,20 +166,22 @@ void sqlite3Detach(Parse *pParse, Token *pDbname){
   sqlite3VdbeAddOp(v, OP_Halt, 0, 0);
   if( pParse->explain ) return;
   db = pParse->db;
+  zName = sqlite3NameFromToken(pDbname);
+  if( zName==0 ) return;
   for(i=0; i<db->nDb; i++){
     pDb = &db->aDb[i];
-    if( pDb->pBt==0 || pDb->zName==0 ) continue;
-    if( strlen(pDb->zName)!=pDbname->n ) continue;
-    if( sqlite3StrNICmp(pDb->zName, pDbname->z, pDbname->n)==0 ) break;
+    if( pDb->pBt==0 ) continue;
+    if( sqlite3StrICmp(pDb->zName, zName)==0 ) break;
   }
   if( i>=db->nDb ){
-    sqlite3ErrorMsg(pParse, "no such database: %T", pDbname);
+    sqlite3ErrorMsg(pParse, "no such database: %z", zName);
     return;
   }
   if( i<2 ){
-    sqlite3ErrorMsg(pParse, "cannot detach database %T", pDbname);
+    sqlite3ErrorMsg(pParse, "cannot detach database %z", zName);
     return;
   }
+  sqliteFree(zName);
   if( !db->autoCommit ){
     sqlite3ErrorMsg(pParse, "cannot DETACH database within transaction");
     pParse->rc = SQLITE_ERROR;

diff --git a/test/attach.test b/test/attach.test
index 21dc7244ac046436206fb91a701ecfa00582d8f9..89b8d8ba64c04d1568313408245c6b4f79dc971d 100644 (file)
--- a/test/attach.test
+++ b/test/attach.test
@@ -12,7 +12,7 @@
 # focus of this script is testing the ATTACH and DETACH commands
 # and related functionality.
 #
-# $Id: attach.test,v 1.38 2005/03/02 05:18:57 drh Exp $
+# $Id: attach.test,v 1.39 2005/03/15 02:04:13 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -80,7 +80,7 @@ do_test attach-1.9 {
 } {0 {}}
 do_test attach-1.10 {
   catchsql {
-    DETACH DATABASE three;
+    DETACH DATABASE [three];
   }
 } {0 {}}
 do_test attach-1.11 {
@@ -172,7 +172,7 @@ do_test attach-1.22 {
 } {1 {too many attached databases - max 10}}
 do_test attach-1.23 {
   catchsql {
-    DETACH db14;
+    DETACH "db14";
   }
 } {1 {no such database: db14}}
 do_test attach-1.24 {