Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | A failed ATTACH leaves the database in a consistent state. Ticket #811. (CVS 1811) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
c22f9feb1bb00d1d54a8a87b55719557 |
User & Date: | drh 2004-07-19 00:56:24.000 |
Context
2004-07-19
| ||
02:12 | Correctly handle joins of more than 32 tables. Ticket #806. (CVS 1812) (check-in: 8806440970 user: drh tags: trunk) | |
00:56 | A failed ATTACH leaves the database in a consistent state. Ticket #811. (CVS 1811) (check-in: c22f9feb1b user: drh tags: trunk) | |
00:39 | When comparing two expressions do not apply affinity to either operand. Ticket #805. (CVS 1810) (check-in: 88a4e400f9 user: drh tags: trunk) | |
Changes
Changes to src/attach.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 | /* ** 2003 April 6 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code used to implement the ATTACH and DETACH commands. ** | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | /* ** 2003 April 6 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code used to implement the ATTACH and DETACH commands. ** ** $Id: attach.c,v 1.22 2004/07/19 00:56:24 drh Exp $ */ #include "sqliteInt.h" /* ** This routine is called by the parser to process an ATTACH statement: ** ** ATTACH DATABASE filename AS dbname |
︙ | ︙ | |||
104 105 106 107 108 109 110 | nKey = 0; } sqliteCodecAttach(db, db->nDb-1, zKey, nKey); } #endif sqliteFree(zFile); db->flags &= ~SQLITE_Initialized; | | < | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | nKey = 0; } sqliteCodecAttach(db, db->nDb-1, zKey, nKey); } #endif sqliteFree(zFile); db->flags &= ~SQLITE_Initialized; if( pParse->nErr==0 && rc==SQLITE_OK ){ rc = sqlite3ReadSchema(pParse); } if( rc ){ int i = db->nDb - 1; assert( i>=2 ); if( db->aDb[i].pBt ){ sqlite3BtreeClose(db->aDb[i].pBt); |
︙ | ︙ |
Changes to test/attach3.test.
︙ | ︙ | |||
8 9 10 11 12 13 14 | # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this script is testing the ATTACH and DETACH commands # and schema changes to attached databases. # | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this script is testing the ATTACH and DETACH commands # and schema changes to attached databases. # # $Id: attach3.test,v 1.9 2004/07/19 00:56:24 drh Exp $ # set testdir [file dirname $argv0] source $testdir/tester.tcl # Create tables t1 and t2 in the main database |
︙ | ︙ | |||
215 216 217 218 219 220 221 | # Make sure the aux.sqlite_master table is read-only do_test attach3-10.0 { catchsql { INSERT INTO aux.sqlite_master VALUES(1, 2, 3, 4, 5); } } {1 {table sqlite_master may not be modified}} | > > | | > > | > > > > | > > > > | > > | 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 | # Make sure the aux.sqlite_master table is read-only do_test attach3-10.0 { catchsql { INSERT INTO aux.sqlite_master VALUES(1, 2, 3, 4, 5); } } {1 {table sqlite_master may not be modified}} # Failure to attach leaves us in a workable state. # Ticket #811 # do_test attach3-11.0 { catchsql { ATTACH DATABASE '/nodir/nofile.x' AS notadb; } } {1 {unable to open database: /nodir/nofile.x}} do_test attach3-11.1 { catchsql { ATTACH DATABASE ':memory:' AS notadb; } } {0 {}} do_test attach3-11.2 { catchsql { DETACH DATABASE notadb; } } {0 {}} finish_test |