drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 1 | /* |
| 2 | ** 2003 April 6 |
| 3 | ** |
| 4 | ** The author disclaims copyright to this source code. In place of |
| 5 | ** a legal notice, here is a blessing: |
| 6 | ** |
| 7 | ** May you do good and not evil. |
| 8 | ** May you find forgiveness for yourself and forgive others. |
| 9 | ** May you share freely, never taking more than you give. |
| 10 | ** |
| 11 | ************************************************************************* |
| 12 | ** This file contains code used to implement the ATTACH and DETACH commands. |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 13 | */ |
| 14 | #include "sqliteInt.h" |
| 15 | |
drh | fdbcdee | 2007-03-27 14:44:50 +0000 | [diff] [blame] | 16 | #ifndef SQLITE_OMIT_ATTACH |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 17 | /* |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 18 | ** Resolve an expression that was part of an ATTACH or DETACH statement. This |
| 19 | ** is slightly different from resolving a normal SQL expression, because simple |
| 20 | ** identifiers are treated as strings, not possible column names or aliases. |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 21 | ** |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 22 | ** i.e. if the parser sees: |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 23 | ** |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 24 | ** ATTACH DATABASE abc AS def |
| 25 | ** |
| 26 | ** it treats the two expressions as literal strings 'abc' and 'def' instead of |
| 27 | ** looking for columns of the same name. |
| 28 | ** |
| 29 | ** This only applies to the root node of pExpr, so the statement: |
| 30 | ** |
| 31 | ** ATTACH DATABASE abc||def AS 'db2' |
| 32 | ** |
| 33 | ** will fail because neither abc or def can be resolved. |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 34 | */ |
danielk1977 | f011300 | 2006-01-24 12:09:17 +0000 | [diff] [blame] | 35 | static int resolveAttachExpr(NameContext *pName, Expr *pExpr) |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 36 | { |
| 37 | int rc = SQLITE_OK; |
| 38 | if( pExpr ){ |
| 39 | if( pExpr->op!=TK_ID ){ |
drh | 7d10d5a | 2008-08-20 16:35:10 +0000 | [diff] [blame] | 40 | rc = sqlite3ResolveExprNames(pName, pExpr); |
drh | b63f274 | 2007-05-09 20:31:29 +0000 | [diff] [blame] | 41 | if( rc==SQLITE_OK && !sqlite3ExprIsConstant(pExpr) ){ |
drh | 33e619f | 2009-05-28 01:00:55 +0000 | [diff] [blame] | 42 | sqlite3ErrorMsg(pName->pParse, "invalid name: \"%s\"", pExpr->u.zToken); |
drh | b63f274 | 2007-05-09 20:31:29 +0000 | [diff] [blame] | 43 | return SQLITE_ERROR; |
| 44 | } |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 45 | }else{ |
| 46 | pExpr->op = TK_STRING; |
| 47 | } |
| 48 | } |
| 49 | return rc; |
| 50 | } |
| 51 | |
| 52 | /* |
| 53 | ** An SQL user-function registered to do the work of an ATTACH statement. The |
| 54 | ** three arguments to the function come directly from an attach statement: |
| 55 | ** |
| 56 | ** ATTACH DATABASE x AS y KEY z |
| 57 | ** |
| 58 | ** SELECT sqlite_attach(x, y, z) |
| 59 | ** |
| 60 | ** If the optional "KEY z" syntax is omitted, an SQL NULL is passed as the |
| 61 | ** third argument. |
| 62 | */ |
| 63 | static void attachFunc( |
| 64 | sqlite3_context *context, |
danielk1977 | 62c14b3 | 2008-11-19 09:05:26 +0000 | [diff] [blame] | 65 | int NotUsed, |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 66 | sqlite3_value **argv |
drh | 25d6543 | 2004-07-22 15:02:25 +0000 | [diff] [blame] | 67 | ){ |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 68 | int i; |
| 69 | int rc = 0; |
drh | fa4a4b9 | 2008-03-19 21:45:51 +0000 | [diff] [blame] | 70 | sqlite3 *db = sqlite3_context_db_handle(context); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 71 | const char *zName; |
| 72 | const char *zFile; |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 73 | Db *aNew; |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 74 | char *zErrDyn = 0; |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 75 | |
danielk1977 | 62c14b3 | 2008-11-19 09:05:26 +0000 | [diff] [blame] | 76 | UNUSED_PARAMETER(NotUsed); |
| 77 | |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 78 | zFile = (const char *)sqlite3_value_text(argv[0]); |
| 79 | zName = (const char *)sqlite3_value_text(argv[1]); |
drh | ea063f5 | 2006-05-25 11:52:37 +0000 | [diff] [blame] | 80 | if( zFile==0 ) zFile = ""; |
| 81 | if( zName==0 ) zName = ""; |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 82 | |
| 83 | /* Check for the following errors: |
| 84 | ** |
| 85 | ** * Too many attached databases, |
| 86 | ** * Transaction currently open |
| 87 | ** * Specified database name already being used. |
| 88 | */ |
drh | bb4957f | 2008-03-20 14:03:29 +0000 | [diff] [blame] | 89 | if( db->nDb>=db->aLimit[SQLITE_LIMIT_ATTACHED]+2 ){ |
drh | 9ae7a74 | 2009-04-30 05:19:04 +0000 | [diff] [blame] | 90 | zErrDyn = sqlite3MPrintf(db, "too many attached databases - max %d", |
drh | bb4957f | 2008-03-20 14:03:29 +0000 | [diff] [blame] | 91 | db->aLimit[SQLITE_LIMIT_ATTACHED] |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 92 | ); |
| 93 | goto attach_error; |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 94 | } |
danielk1977 | 92f9a1b | 2004-06-19 09:08:16 +0000 | [diff] [blame] | 95 | if( !db->autoCommit ){ |
drh | 9ae7a74 | 2009-04-30 05:19:04 +0000 | [diff] [blame] | 96 | zErrDyn = sqlite3MPrintf(db, "cannot ATTACH database within transaction"); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 97 | goto attach_error; |
danielk1977 | d5d5652 | 2005-03-16 12:15:20 +0000 | [diff] [blame] | 98 | } |
drh | 81e293b | 2003-06-06 19:00:42 +0000 | [diff] [blame] | 99 | for(i=0; i<db->nDb; i++){ |
drh | 124b27e | 2004-06-19 16:06:10 +0000 | [diff] [blame] | 100 | char *z = db->aDb[i].zName; |
drh | c0b6181 | 2009-04-30 01:22:41 +0000 | [diff] [blame] | 101 | assert( z && zName ); |
| 102 | if( sqlite3StrICmp(z, zName)==0 ){ |
drh | 9ae7a74 | 2009-04-30 05:19:04 +0000 | [diff] [blame] | 103 | zErrDyn = sqlite3MPrintf(db, "database %s is already in use", zName); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 104 | goto attach_error; |
drh | 81e293b | 2003-06-06 19:00:42 +0000 | [diff] [blame] | 105 | } |
| 106 | } |
| 107 | |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 108 | /* Allocate the new entry in the db->aDb[] array and initialise the schema |
| 109 | ** hash tables. |
| 110 | */ |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 111 | if( db->aDb==db->aDbStatic ){ |
drh | e5ae573 | 2008-06-15 02:51:47 +0000 | [diff] [blame] | 112 | aNew = sqlite3DbMallocRaw(db, sizeof(db->aDb[0])*3 ); |
| 113 | if( aNew==0 ) return; |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 114 | memcpy(aNew, db->aDb, sizeof(db->aDb[0])*2); |
| 115 | }else{ |
drh | e5ae573 | 2008-06-15 02:51:47 +0000 | [diff] [blame] | 116 | aNew = sqlite3DbRealloc(db, db->aDb, sizeof(db->aDb[0])*(db->nDb+1) ); |
| 117 | if( aNew==0 ) return; |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 118 | } |
| 119 | db->aDb = aNew; |
drh | c47fd8e | 2009-04-30 13:30:32 +0000 | [diff] [blame] | 120 | aNew = &db->aDb[db->nDb]; |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 121 | memset(aNew, 0, sizeof(*aNew)); |
danielk1977 | da18423 | 2006-01-05 11:34:32 +0000 | [diff] [blame] | 122 | |
| 123 | /* Open the database file. If the btree is successfully opened, use |
| 124 | ** it to obtain the database schema. At this point the schema may |
| 125 | ** or may not be initialised. |
| 126 | */ |
drh | 75c014c | 2010-08-30 15:02:28 +0000 | [diff] [blame] | 127 | rc = sqlite3BtreeOpen(zFile, db, &aNew->pBt, 0, |
| 128 | db->openFlags | SQLITE_OPEN_MAIN_DB); |
drh | c47fd8e | 2009-04-30 13:30:32 +0000 | [diff] [blame] | 129 | db->nDb++; |
| 130 | if( rc==SQLITE_CONSTRAINT ){ |
| 131 | rc = SQLITE_ERROR; |
| 132 | zErrDyn = sqlite3MPrintf(db, "database is already attached"); |
| 133 | }else if( rc==SQLITE_OK ){ |
drh | 3b02013 | 2008-04-17 17:02:01 +0000 | [diff] [blame] | 134 | Pager *pPager; |
drh | 1743575 | 2007-08-16 04:30:38 +0000 | [diff] [blame] | 135 | aNew->pSchema = sqlite3SchemaGet(db, aNew->pBt); |
danielk1977 | da18423 | 2006-01-05 11:34:32 +0000 | [diff] [blame] | 136 | if( !aNew->pSchema ){ |
| 137 | rc = SQLITE_NOMEM; |
drh | 29c636b | 2006-01-09 23:40:25 +0000 | [diff] [blame] | 138 | }else if( aNew->pSchema->file_format && aNew->pSchema->enc!=ENC(db) ){ |
drh | 9ae7a74 | 2009-04-30 05:19:04 +0000 | [diff] [blame] | 139 | zErrDyn = sqlite3MPrintf(db, |
danielk1977 | 14db266 | 2006-01-09 16:12:04 +0000 | [diff] [blame] | 140 | "attached databases must use the same text encoding as main database"); |
drh | 9ae7a74 | 2009-04-30 05:19:04 +0000 | [diff] [blame] | 141 | rc = SQLITE_ERROR; |
danielk1977 | 14db266 | 2006-01-09 16:12:04 +0000 | [diff] [blame] | 142 | } |
drh | 3b02013 | 2008-04-17 17:02:01 +0000 | [diff] [blame] | 143 | pPager = sqlite3BtreePager(aNew->pBt); |
| 144 | sqlite3PagerLockingMode(pPager, db->dfltLockMode); |
drh | af034ed | 2010-02-12 19:46:26 +0000 | [diff] [blame] | 145 | sqlite3BtreeSecureDelete(aNew->pBt, |
| 146 | sqlite3BtreeSecureDelete(db->aDb[0].pBt,-1) ); |
danielk1977 | da18423 | 2006-01-05 11:34:32 +0000 | [diff] [blame] | 147 | } |
danielk1977 | 91cf71b | 2004-06-26 06:37:06 +0000 | [diff] [blame] | 148 | aNew->safety_level = 3; |
dan | 39547b4 | 2010-02-23 11:05:26 +0000 | [diff] [blame] | 149 | aNew->zName = sqlite3DbStrDup(db, zName); |
| 150 | if( rc==SQLITE_OK && aNew->zName==0 ){ |
| 151 | rc = SQLITE_NOMEM; |
| 152 | } |
| 153 | |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 154 | |
shaneh | ad9f9f6 | 2010-02-17 17:48:46 +0000 | [diff] [blame] | 155 | #ifdef SQLITE_HAS_CODEC |
drh | e68e8c5 | 2009-11-04 01:56:27 +0000 | [diff] [blame] | 156 | if( rc==SQLITE_OK ){ |
drh | 3262cb2 | 2007-03-27 21:47:06 +0000 | [diff] [blame] | 157 | extern int sqlite3CodecAttach(sqlite3*, int, const void*, int); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 158 | extern void sqlite3CodecGetKey(sqlite3*, int, void**, int*); |
drh | 72e5c6d | 2005-12-29 23:04:01 +0000 | [diff] [blame] | 159 | int nKey; |
| 160 | char *zKey; |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 161 | int t = sqlite3_value_type(argv[2]); |
| 162 | switch( t ){ |
| 163 | case SQLITE_INTEGER: |
| 164 | case SQLITE_FLOAT: |
drh | 1743575 | 2007-08-16 04:30:38 +0000 | [diff] [blame] | 165 | zErrDyn = sqlite3DbStrDup(db, "Invalid key value"); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 166 | rc = SQLITE_ERROR; |
| 167 | break; |
| 168 | |
| 169 | case SQLITE_TEXT: |
| 170 | case SQLITE_BLOB: |
| 171 | nKey = sqlite3_value_bytes(argv[2]); |
| 172 | zKey = (char *)sqlite3_value_blob(argv[2]); |
drh | e68e8c5 | 2009-11-04 01:56:27 +0000 | [diff] [blame] | 173 | rc = sqlite3CodecAttach(db, db->nDb-1, zKey, nKey); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 174 | break; |
| 175 | |
| 176 | case SQLITE_NULL: |
| 177 | /* No key specified. Use the key from the main database */ |
| 178 | sqlite3CodecGetKey(db, 0, (void**)&zKey, &nKey); |
drh | e68e8c5 | 2009-11-04 01:56:27 +0000 | [diff] [blame] | 179 | rc = sqlite3CodecAttach(db, db->nDb-1, zKey, nKey); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 180 | break; |
drh | 25d6543 | 2004-07-22 15:02:25 +0000 | [diff] [blame] | 181 | } |
drh | 4d189ca | 2004-02-12 18:46:38 +0000 | [diff] [blame] | 182 | } |
| 183 | #endif |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 184 | |
| 185 | /* If the file was opened successfully, read the schema for the new database. |
| 186 | ** If this fails, or if opening the file failed, then close the file and |
| 187 | ** remove the entry from the db->aDb[] array. i.e. put everything back the way |
| 188 | ** we found it. |
| 189 | */ |
| 190 | if( rc==SQLITE_OK ){ |
danielk1977 | 4eab8b7 | 2007-12-27 15:12:16 +0000 | [diff] [blame] | 191 | sqlite3BtreeEnterAll(db); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 192 | rc = sqlite3Init(db, &zErrDyn); |
danielk1977 | 4eab8b7 | 2007-12-27 15:12:16 +0000 | [diff] [blame] | 193 | sqlite3BtreeLeaveAll(db); |
drh | 447623d | 2003-12-06 22:22:35 +0000 | [diff] [blame] | 194 | } |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 195 | if( rc ){ |
danielk1977 | f011300 | 2006-01-24 12:09:17 +0000 | [diff] [blame] | 196 | int iDb = db->nDb - 1; |
| 197 | assert( iDb>=2 ); |
| 198 | if( db->aDb[iDb].pBt ){ |
| 199 | sqlite3BtreeClose(db->aDb[iDb].pBt); |
| 200 | db->aDb[iDb].pBt = 0; |
| 201 | db->aDb[iDb].pSchema = 0; |
drh | 447623d | 2003-12-06 22:22:35 +0000 | [diff] [blame] | 202 | } |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 203 | sqlite3ResetInternalSchema(db, 0); |
danielk1977 | f011300 | 2006-01-24 12:09:17 +0000 | [diff] [blame] | 204 | db->nDb = iDb; |
danielk1977 | e979565 | 2009-05-01 06:19:21 +0000 | [diff] [blame] | 205 | if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){ |
drh | 1743575 | 2007-08-16 04:30:38 +0000 | [diff] [blame] | 206 | db->mallocFailed = 1; |
drh | 6c19747 | 2009-04-30 05:40:34 +0000 | [diff] [blame] | 207 | sqlite3DbFree(db, zErrDyn); |
drh | 9ae7a74 | 2009-04-30 05:19:04 +0000 | [diff] [blame] | 208 | zErrDyn = sqlite3MPrintf(db, "out of memory"); |
| 209 | }else if( zErrDyn==0 ){ |
| 210 | zErrDyn = sqlite3MPrintf(db, "unable to open database: %s", zFile); |
drh | 6103fe9 | 2006-04-05 11:57:37 +0000 | [diff] [blame] | 211 | } |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 212 | goto attach_error; |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 213 | } |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 214 | |
| 215 | return; |
danielk1977 | d5d5652 | 2005-03-16 12:15:20 +0000 | [diff] [blame] | 216 | |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 217 | attach_error: |
| 218 | /* Return an error if we get here */ |
| 219 | if( zErrDyn ){ |
| 220 | sqlite3_result_error(context, zErrDyn, -1); |
drh | 633e6d5 | 2008-07-28 19:34:53 +0000 | [diff] [blame] | 221 | sqlite3DbFree(db, zErrDyn); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 222 | } |
drh | 69544ec | 2008-02-06 14:11:34 +0000 | [diff] [blame] | 223 | if( rc ) sqlite3_result_error_code(context, rc); |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 224 | } |
| 225 | |
| 226 | /* |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 227 | ** An SQL user-function registered to do the work of an DETACH statement. The |
| 228 | ** three arguments to the function come directly from a detach statement: |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 229 | ** |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 230 | ** DETACH DATABASE x |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 231 | ** |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 232 | ** SELECT sqlite_detach(x) |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 233 | */ |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 234 | static void detachFunc( |
| 235 | sqlite3_context *context, |
danielk1977 | 62c14b3 | 2008-11-19 09:05:26 +0000 | [diff] [blame] | 236 | int NotUsed, |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 237 | sqlite3_value **argv |
| 238 | ){ |
| 239 | const char *zName = (const char *)sqlite3_value_text(argv[0]); |
drh | fa4a4b9 | 2008-03-19 21:45:51 +0000 | [diff] [blame] | 240 | sqlite3 *db = sqlite3_context_db_handle(context); |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 241 | int i; |
danielk1977 | e0d4b06 | 2004-06-28 01:11:46 +0000 | [diff] [blame] | 242 | Db *pDb = 0; |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 243 | char zErr[128]; |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 244 | |
danielk1977 | 62c14b3 | 2008-11-19 09:05:26 +0000 | [diff] [blame] | 245 | UNUSED_PARAMETER(NotUsed); |
| 246 | |
drh | ea063f5 | 2006-05-25 11:52:37 +0000 | [diff] [blame] | 247 | if( zName==0 ) zName = ""; |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 248 | for(i=0; i<db->nDb; i++){ |
drh | 124b27e | 2004-06-19 16:06:10 +0000 | [diff] [blame] | 249 | pDb = &db->aDb[i]; |
drh | ae8b361 | 2005-03-15 02:04:12 +0000 | [diff] [blame] | 250 | if( pDb->pBt==0 ) continue; |
| 251 | if( sqlite3StrICmp(pDb->zName, zName)==0 ) break; |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 252 | } |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 253 | |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 254 | if( i>=db->nDb ){ |
drh | ea063f5 | 2006-05-25 11:52:37 +0000 | [diff] [blame] | 255 | sqlite3_snprintf(sizeof(zErr),zErr, "no such database: %s", zName); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 256 | goto detach_error; |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 257 | } |
| 258 | if( i<2 ){ |
drh | ea063f5 | 2006-05-25 11:52:37 +0000 | [diff] [blame] | 259 | sqlite3_snprintf(sizeof(zErr),zErr, "cannot detach database %s", zName); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 260 | goto detach_error; |
drh | c11d4f9 | 2003-04-06 21:08:24 +0000 | [diff] [blame] | 261 | } |
danielk1977 | 92f9a1b | 2004-06-19 09:08:16 +0000 | [diff] [blame] | 262 | if( !db->autoCommit ){ |
drh | 5bb3eb9 | 2007-05-04 13:15:55 +0000 | [diff] [blame] | 263 | sqlite3_snprintf(sizeof(zErr), zErr, |
| 264 | "cannot DETACH database within transaction"); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 265 | goto detach_error; |
danielk1977 | 92f9a1b | 2004-06-19 09:08:16 +0000 | [diff] [blame] | 266 | } |
danielk1977 | 0410302 | 2009-02-03 16:51:24 +0000 | [diff] [blame] | 267 | if( sqlite3BtreeIsInReadTrans(pDb->pBt) || sqlite3BtreeIsInBackup(pDb->pBt) ){ |
danielk1977 | 2372c2b | 2006-06-27 16:34:56 +0000 | [diff] [blame] | 268 | sqlite3_snprintf(sizeof(zErr),zErr, "database %s is locked", zName); |
| 269 | goto detach_error; |
| 270 | } |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 271 | |
drh | 124b27e | 2004-06-19 16:06:10 +0000 | [diff] [blame] | 272 | sqlite3BtreeClose(pDb->pBt); |
| 273 | pDb->pBt = 0; |
danielk1977 | 311019b | 2006-01-10 07:14:23 +0000 | [diff] [blame] | 274 | pDb->pSchema = 0; |
drh | db2d9a0 | 2004-08-01 03:52:17 +0000 | [diff] [blame] | 275 | sqlite3ResetInternalSchema(db, 0); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 276 | return; |
| 277 | |
| 278 | detach_error: |
| 279 | sqlite3_result_error(context, zErr, -1); |
| 280 | } |
| 281 | |
| 282 | /* |
| 283 | ** This procedure generates VDBE code for a single invocation of either the |
| 284 | ** sqlite_detach() or sqlite_attach() SQL user functions. |
| 285 | */ |
| 286 | static void codeAttach( |
| 287 | Parse *pParse, /* The parser context */ |
| 288 | int type, /* Either SQLITE_ATTACH or SQLITE_DETACH */ |
dan | 558814f | 2010-06-02 05:53:53 +0000 | [diff] [blame] | 289 | FuncDef const *pFunc,/* FuncDef wrapper for detachFunc() or attachFunc() */ |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 290 | Expr *pAuthArg, /* Expression to pass to authorization callback */ |
| 291 | Expr *pFilename, /* Name of database file */ |
| 292 | Expr *pDbname, /* Name of the database to use internally */ |
| 293 | Expr *pKey /* Database key for encryption extension */ |
| 294 | ){ |
| 295 | int rc; |
| 296 | NameContext sName; |
| 297 | Vdbe *v; |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 298 | sqlite3* db = pParse->db; |
drh | 2dcef11 | 2008-01-12 19:03:48 +0000 | [diff] [blame] | 299 | int regArgs; |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 300 | |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 301 | memset(&sName, 0, sizeof(NameContext)); |
| 302 | sName.pParse = pParse; |
| 303 | |
| 304 | if( |
| 305 | SQLITE_OK!=(rc = resolveAttachExpr(&sName, pFilename)) || |
| 306 | SQLITE_OK!=(rc = resolveAttachExpr(&sName, pDbname)) || |
| 307 | SQLITE_OK!=(rc = resolveAttachExpr(&sName, pKey)) |
| 308 | ){ |
| 309 | pParse->nErr++; |
| 310 | goto attach_end; |
| 311 | } |
| 312 | |
drh | b7916a7 | 2009-05-27 10:31:29 +0000 | [diff] [blame] | 313 | #ifndef SQLITE_OMIT_AUTHORIZATION |
| 314 | if( pAuthArg ){ |
drh | 0097eb3 | 2011-02-04 00:51:16 +0000 | [diff] [blame] | 315 | char *zAuthArg; |
| 316 | if( pAuthArg->op==TK_STRING ){ |
| 317 | zAuthArg = pAuthArg->u.zToken; |
| 318 | }else{ |
| 319 | zAuthArg = 0; |
drh | b7916a7 | 2009-05-27 10:31:29 +0000 | [diff] [blame] | 320 | } |
| 321 | rc = sqlite3AuthCheck(pParse, type, zAuthArg, 0, 0); |
| 322 | if(rc!=SQLITE_OK ){ |
| 323 | goto attach_end; |
| 324 | } |
| 325 | } |
| 326 | #endif /* SQLITE_OMIT_AUTHORIZATION */ |
| 327 | |
| 328 | |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 329 | v = sqlite3GetVdbe(pParse); |
danielk1977 | a7a8e14 | 2008-02-13 18:25:27 +0000 | [diff] [blame] | 330 | regArgs = sqlite3GetTempRange(pParse, 4); |
drh | 2dcef11 | 2008-01-12 19:03:48 +0000 | [diff] [blame] | 331 | sqlite3ExprCode(pParse, pFilename, regArgs); |
| 332 | sqlite3ExprCode(pParse, pDbname, regArgs+1); |
| 333 | sqlite3ExprCode(pParse, pKey, regArgs+2); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 334 | |
drh | 1743575 | 2007-08-16 04:30:38 +0000 | [diff] [blame] | 335 | assert( v || db->mallocFailed ); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 336 | if( v ){ |
danielk1977 | 0f3f072 | 2008-10-28 17:52:39 +0000 | [diff] [blame] | 337 | sqlite3VdbeAddOp3(v, OP_Function, 0, regArgs+3-pFunc->nArg, regArgs+3); |
drh | f49661a | 2008-12-10 16:45:50 +0000 | [diff] [blame] | 338 | assert( pFunc->nArg==-1 || (pFunc->nArg&0xff)==pFunc->nArg ); |
| 339 | sqlite3VdbeChangeP5(v, (u8)(pFunc->nArg)); |
drh | 66a5167 | 2008-01-03 00:01:23 +0000 | [diff] [blame] | 340 | sqlite3VdbeChangeP4(v, -1, (char *)pFunc, P4_FUNCDEF); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 341 | |
| 342 | /* Code an OP_Expire. For an ATTACH statement, set P1 to true (expire this |
| 343 | ** statement only). For DETACH, set it to false (expire all existing |
| 344 | ** statements). |
| 345 | */ |
drh | 66a5167 | 2008-01-03 00:01:23 +0000 | [diff] [blame] | 346 | sqlite3VdbeAddOp1(v, OP_Expire, (type==SQLITE_ATTACH)); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 347 | } |
| 348 | |
| 349 | attach_end: |
drh | 633e6d5 | 2008-07-28 19:34:53 +0000 | [diff] [blame] | 350 | sqlite3ExprDelete(db, pFilename); |
| 351 | sqlite3ExprDelete(db, pDbname); |
| 352 | sqlite3ExprDelete(db, pKey); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 353 | } |
| 354 | |
| 355 | /* |
| 356 | ** Called by the parser to compile a DETACH statement. |
| 357 | ** |
| 358 | ** DETACH pDbname |
| 359 | */ |
| 360 | void sqlite3Detach(Parse *pParse, Expr *pDbname){ |
dan | 558814f | 2010-06-02 05:53:53 +0000 | [diff] [blame] | 361 | static const FuncDef detach_func = { |
danielk1977 | 0f3f072 | 2008-10-28 17:52:39 +0000 | [diff] [blame] | 362 | 1, /* nArg */ |
| 363 | SQLITE_UTF8, /* iPrefEnc */ |
| 364 | 0, /* flags */ |
| 365 | 0, /* pUserData */ |
| 366 | 0, /* pNext */ |
| 367 | detachFunc, /* xFunc */ |
| 368 | 0, /* xStep */ |
| 369 | 0, /* xFinalize */ |
| 370 | "sqlite_detach", /* zName */ |
drh | 6ac78a0 | 2010-09-28 14:26:36 +0000 | [diff] [blame] | 371 | 0, /* pHash */ |
| 372 | 0 /* pDestructor */ |
danielk1977 | 0f3f072 | 2008-10-28 17:52:39 +0000 | [diff] [blame] | 373 | }; |
| 374 | codeAttach(pParse, SQLITE_DETACH, &detach_func, pDbname, 0, 0, pDbname); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 375 | } |
| 376 | |
| 377 | /* |
| 378 | ** Called by the parser to compile an ATTACH statement. |
| 379 | ** |
| 380 | ** ATTACH p AS pDbname KEY pKey |
| 381 | */ |
| 382 | void sqlite3Attach(Parse *pParse, Expr *p, Expr *pDbname, Expr *pKey){ |
dan | 558814f | 2010-06-02 05:53:53 +0000 | [diff] [blame] | 383 | static const FuncDef attach_func = { |
danielk1977 | 0f3f072 | 2008-10-28 17:52:39 +0000 | [diff] [blame] | 384 | 3, /* nArg */ |
| 385 | SQLITE_UTF8, /* iPrefEnc */ |
| 386 | 0, /* flags */ |
| 387 | 0, /* pUserData */ |
| 388 | 0, /* pNext */ |
| 389 | attachFunc, /* xFunc */ |
| 390 | 0, /* xStep */ |
| 391 | 0, /* xFinalize */ |
| 392 | "sqlite_attach", /* zName */ |
drh | 6ac78a0 | 2010-09-28 14:26:36 +0000 | [diff] [blame] | 393 | 0, /* pHash */ |
| 394 | 0 /* pDestructor */ |
danielk1977 | 0f3f072 | 2008-10-28 17:52:39 +0000 | [diff] [blame] | 395 | }; |
| 396 | codeAttach(pParse, SQLITE_ATTACH, &attach_func, p, p, pDbname, pKey); |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 397 | } |
drh | fdbcdee | 2007-03-27 14:44:50 +0000 | [diff] [blame] | 398 | #endif /* SQLITE_OMIT_ATTACH */ |
danielk1977 | f744bb5 | 2005-12-06 17:19:11 +0000 | [diff] [blame] | 399 | |
drh | 198bf39 | 2006-01-06 21:52:49 +0000 | [diff] [blame] | 400 | /* |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 401 | ** Initialize a DbFixer structure. This routine must be called prior |
| 402 | ** to passing the structure to one of the sqliteFixAAAA() routines below. |
| 403 | ** |
| 404 | ** The return value indicates whether or not fixation is required. TRUE |
| 405 | ** means we do need to fix the database references, FALSE means we do not. |
| 406 | */ |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 407 | int sqlite3FixInit( |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 408 | DbFixer *pFix, /* The fixer to be initialized */ |
| 409 | Parse *pParse, /* Error messages will be written here */ |
drh | 873cdcb | 2004-09-05 23:23:41 +0000 | [diff] [blame] | 410 | int iDb, /* This is the database that must be used */ |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 411 | const char *zType, /* "view", "trigger", or "index" */ |
| 412 | const Token *pName /* Name of the view, trigger, or index */ |
| 413 | ){ |
drh | 9bb575f | 2004-09-06 17:24:11 +0000 | [diff] [blame] | 414 | sqlite3 *db; |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 415 | |
drh | 9ae7a74 | 2009-04-30 05:19:04 +0000 | [diff] [blame] | 416 | if( NEVER(iDb<0) || iDb==1 ) return 0; |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 417 | db = pParse->db; |
| 418 | assert( db->nDb>iDb ); |
drh | 4312db5 | 2003-06-03 01:47:11 +0000 | [diff] [blame] | 419 | pFix->pParse = pParse; |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 420 | pFix->zDb = db->aDb[iDb].zName; |
| 421 | pFix->zType = zType; |
| 422 | pFix->pName = pName; |
| 423 | return 1; |
| 424 | } |
| 425 | |
| 426 | /* |
| 427 | ** The following set of routines walk through the parse tree and assign |
| 428 | ** a specific database to all table references where the database name |
| 429 | ** was left unspecified in the original SQL statement. The pFix structure |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 430 | ** must have been initialized by a prior call to sqlite3FixInit(). |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 431 | ** |
| 432 | ** These routines are used to make sure that an index, trigger, or |
| 433 | ** view in one database does not refer to objects in a different database. |
| 434 | ** (Exception: indices, triggers, and views in the TEMP database are |
| 435 | ** allowed to refer to anything.) If a reference is explicitly made |
| 436 | ** to an object in a different database, an error message is added to |
| 437 | ** pParse->zErrMsg and these routines return non-zero. If everything |
| 438 | ** checks out, these routines return 0. |
| 439 | */ |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 440 | int sqlite3FixSrcList( |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 441 | DbFixer *pFix, /* Context of the fixation */ |
| 442 | SrcList *pList /* The Source list to check and modify */ |
| 443 | ){ |
| 444 | int i; |
| 445 | const char *zDb; |
drh | 873cdcb | 2004-09-05 23:23:41 +0000 | [diff] [blame] | 446 | struct SrcList_item *pItem; |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 447 | |
drh | 9ae7a74 | 2009-04-30 05:19:04 +0000 | [diff] [blame] | 448 | if( NEVER(pList==0) ) return 0; |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 449 | zDb = pFix->zDb; |
drh | 873cdcb | 2004-09-05 23:23:41 +0000 | [diff] [blame] | 450 | for(i=0, pItem=pList->a; i<pList->nSrc; i++, pItem++){ |
| 451 | if( pItem->zDatabase==0 ){ |
drh | 1743575 | 2007-08-16 04:30:38 +0000 | [diff] [blame] | 452 | pItem->zDatabase = sqlite3DbStrDup(pFix->pParse->db, zDb); |
drh | 873cdcb | 2004-09-05 23:23:41 +0000 | [diff] [blame] | 453 | }else if( sqlite3StrICmp(pItem->zDatabase,zDb)!=0 ){ |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 454 | sqlite3ErrorMsg(pFix->pParse, |
drh | 873cdcb | 2004-09-05 23:23:41 +0000 | [diff] [blame] | 455 | "%s %T cannot reference objects in database %s", |
| 456 | pFix->zType, pFix->pName, pItem->zDatabase); |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 457 | return 1; |
| 458 | } |
danielk1977 | b84f96f | 2005-01-20 11:32:23 +0000 | [diff] [blame] | 459 | #if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER) |
drh | 873cdcb | 2004-09-05 23:23:41 +0000 | [diff] [blame] | 460 | if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1; |
| 461 | if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1; |
danielk1977 | b84f96f | 2005-01-20 11:32:23 +0000 | [diff] [blame] | 462 | #endif |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 463 | } |
| 464 | return 0; |
| 465 | } |
danielk1977 | b84f96f | 2005-01-20 11:32:23 +0000 | [diff] [blame] | 466 | #if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER) |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 467 | int sqlite3FixSelect( |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 468 | DbFixer *pFix, /* Context of the fixation */ |
| 469 | Select *pSelect /* The SELECT statement to be fixed to one database */ |
| 470 | ){ |
| 471 | while( pSelect ){ |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 472 | if( sqlite3FixExprList(pFix, pSelect->pEList) ){ |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 473 | return 1; |
| 474 | } |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 475 | if( sqlite3FixSrcList(pFix, pSelect->pSrc) ){ |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 476 | return 1; |
| 477 | } |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 478 | if( sqlite3FixExpr(pFix, pSelect->pWhere) ){ |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 479 | return 1; |
| 480 | } |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 481 | if( sqlite3FixExpr(pFix, pSelect->pHaving) ){ |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 482 | return 1; |
| 483 | } |
| 484 | pSelect = pSelect->pPrior; |
| 485 | } |
| 486 | return 0; |
| 487 | } |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 488 | int sqlite3FixExpr( |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 489 | DbFixer *pFix, /* Context of the fixation */ |
| 490 | Expr *pExpr /* The expression to be fixed to one database */ |
| 491 | ){ |
| 492 | while( pExpr ){ |
drh | b7916a7 | 2009-05-27 10:31:29 +0000 | [diff] [blame] | 493 | if( ExprHasAnyProperty(pExpr, EP_TokenOnly) ) break; |
danielk1977 | 6ab3a2e | 2009-02-19 14:39:25 +0000 | [diff] [blame] | 494 | if( ExprHasProperty(pExpr, EP_xIsSelect) ){ |
| 495 | if( sqlite3FixSelect(pFix, pExpr->x.pSelect) ) return 1; |
| 496 | }else{ |
| 497 | if( sqlite3FixExprList(pFix, pExpr->x.pList) ) return 1; |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 498 | } |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 499 | if( sqlite3FixExpr(pFix, pExpr->pRight) ){ |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 500 | return 1; |
| 501 | } |
| 502 | pExpr = pExpr->pLeft; |
| 503 | } |
| 504 | return 0; |
| 505 | } |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 506 | int sqlite3FixExprList( |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 507 | DbFixer *pFix, /* Context of the fixation */ |
| 508 | ExprList *pList /* The expression to be fixed to one database */ |
| 509 | ){ |
| 510 | int i; |
drh | 873cdcb | 2004-09-05 23:23:41 +0000 | [diff] [blame] | 511 | struct ExprList_item *pItem; |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 512 | if( pList==0 ) return 0; |
drh | 873cdcb | 2004-09-05 23:23:41 +0000 | [diff] [blame] | 513 | for(i=0, pItem=pList->a; i<pList->nExpr; i++, pItem++){ |
| 514 | if( sqlite3FixExpr(pFix, pItem->pExpr) ){ |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 515 | return 1; |
| 516 | } |
| 517 | } |
| 518 | return 0; |
| 519 | } |
danielk1977 | b84f96f | 2005-01-20 11:32:23 +0000 | [diff] [blame] | 520 | #endif |
| 521 | |
| 522 | #ifndef SQLITE_OMIT_TRIGGER |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 523 | int sqlite3FixTriggerStep( |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 524 | DbFixer *pFix, /* Context of the fixation */ |
| 525 | TriggerStep *pStep /* The trigger step be fixed to one database */ |
| 526 | ){ |
| 527 | while( pStep ){ |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 528 | if( sqlite3FixSelect(pFix, pStep->pSelect) ){ |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 529 | return 1; |
| 530 | } |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 531 | if( sqlite3FixExpr(pFix, pStep->pWhere) ){ |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 532 | return 1; |
| 533 | } |
danielk1977 | 4adee20 | 2004-05-08 08:23:19 +0000 | [diff] [blame] | 534 | if( sqlite3FixExprList(pFix, pStep->pExprList) ){ |
drh | f26e09c | 2003-05-31 16:21:12 +0000 | [diff] [blame] | 535 | return 1; |
| 536 | } |
| 537 | pStep = pStep->pNext; |
| 538 | } |
| 539 | return 0; |
| 540 | } |
danielk1977 | b84f96f | 2005-01-20 11:32:23 +0000 | [diff] [blame] | 541 | #endif |