Attach new codec before btree copy

This commit is contained in:
Nick Parker 2013-07-29 11:04:29 -05:00
parent 9b415f6401
commit f844a5dfc3
1 changed files with 2 additions and 2 deletions

View File

@ -979,8 +979,9 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
assert( 1==sqlite3BtreeIsInTrans(pDest) );
assert( 1==sqlite3BtreeIsInTrans(pSrc) );
sqlite3CodecGetKey(db, db->nDb - 1, (void**)&key, &password_sz);
sqlcipher_codec_ctx_set_pass(ctx, key, password_sz, 2);
sqlite3CodecAttach(db, 0, key, password_sz);
int i = 0;
for(i=0; i<ArraySize(aCopy); i+=2){
@ -997,7 +998,6 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
db->nChange = saved_nChange;
db->nTotalChange = saved_nTotalChange;
db->xTrace = saved_xTrace;
sqlite3BtreeSetPageSize(pDest, -1, -1, 1);
db->autoCommit = 1;
if( pDb ){
sqlite3BtreeClose(pDb->pBt);