# # # patch "ChangeLog" # from [6b18ab22740f654a32c09059c702c43a9cb79f10] # to [9c55a6235a251a970a27347bcb5d2039b4975ff0] # # patch "database.cc" # from [fdb796a995bc65c58b7ed67113627c9dc12a7751] # to [3bc4262aa2cf230fa35529ceb8d0987492b1e332] # ============================================================ --- ChangeLog 6b18ab22740f654a32c09059c702c43a9cb79f10 +++ ChangeLog 9c55a6235a251a970a27347bcb5d2039b4975ff0 @@ -1,3 +1,7 @@ +2006-04-04 Matt Johnston + + * database.cc (database::dump): don't check schema of the db. + 2006-04-01 Lapo Luchini * po/it.po: Translated a few more strings to Italian (170 to go). ============================================================ --- database.cc fdb796a995bc65c58b7ed67113627c9dc12a7751 +++ database.cc 3bc4262aa2cf230fa35529ceb8d0987492b1e332 @@ -431,27 +431,34 @@ void database::dump(ostream & out) { - transaction_guard guard(*this); - dump_request req; - req.out = &out; - req.sql = sql(); - out << "BEGIN EXCLUSIVE;\n"; - int res; - res = sqlite3_exec(req.sql, - "SELECT name, type, sql FROM sqlite_master " - "WHERE type='table' AND sql NOT NULL " - "AND name not like 'sqlite_stat%' " - "ORDER BY name", - dump_table_cb, &req, NULL); - assert_sqlite3_ok(req.sql); - res = sqlite3_exec(req.sql, - "SELECT name, type, sql FROM sqlite_master " - "WHERE type='index' AND sql NOT NULL " - "ORDER BY name", - dump_index_cb, &req, NULL); - assert_sqlite3_ok(req.sql); - out << "COMMIT;\n"; - guard.commit(); + // don't care about schema checking etc. + check_filename(); + check_db_exists(); + open(); + { + transaction_guard guard(*this); + dump_request req; + req.out = &out; + req.sql = sql(); + out << "BEGIN EXCLUSIVE;\n"; + int res; + res = sqlite3_exec(req.sql, + "SELECT name, type, sql FROM sqlite_master " + "WHERE type='table' AND sql NOT NULL " + "AND name not like 'sqlite_stat%' " + "ORDER BY name", + dump_table_cb, &req, NULL); + assert_sqlite3_ok(req.sql); + res = sqlite3_exec(req.sql, + "SELECT name, type, sql FROM sqlite_master " + "WHERE type='index' AND sql NOT NULL " + "ORDER BY name", + dump_index_cb, &req, NULL); + assert_sqlite3_ok(req.sql); + out << "COMMIT;\n"; + guard.commit(); + } + close(); } void