# # # patch "ChangeLog" # from [65ed20b61dbbcf7cb783764fddde4c8490b34952] # to [1ba3755df449b5d24ce976b8e0aba397c87a1ca4] # # patch "database.cc" # from [2d10672483bebf2fffbd7c1ac0edf6ddbe322f98] # to [b682d2155d6293546402decc6f96e723bd18d7dc] # ============================================================ --- ChangeLog 65ed20b61dbbcf7cb783764fddde4c8490b34952 +++ ChangeLog 1ba3755df449b5d24ce976b8e0aba397c87a1ca4 @@ -1,5 +1,6 @@ 2007-01-09 Matthew Gregan + * database.cc: Migrate to new sqlite3_prepare_v2 API. * sqlite/*: Import SQLite 3.3.9. 2007-01-08 Richard Levitte ============================================================ --- database.cc 2d10672483bebf2fffbd7c1ac0edf6ddbe322f98 +++ database.cc b682d2155d6293546402decc6f96e723bd18d7dc @@ -418,7 +418,7 @@ dump_table_cb(void *data, int n, char ** string table_name(vals[0]); string query = "SELECT * FROM " + table_name; sqlite3_stmt *stmt = 0; - sqlite3_prepare(dump->sql, query.c_str(), -1, &stmt, NULL); + sqlite3_prepare_v2(dump->sql, query.c_str(), -1, &stmt, NULL); assert_sqlite3_ok(dump->sql); int stepresult = SQLITE_DONE; @@ -706,7 +706,7 @@ database::fetch(results & res, I(i != statement_cache.end()); const char * tail; - sqlite3_prepare(sql(), query.sql_cmd.c_str(), -1, i->second.stmt.paddr(), &tail); + sqlite3_prepare_v2(sql(), query.sql_cmd.c_str(), -1, i->second.stmt.paddr(), &tail); assert_sqlite3_ok(sql()); L(FL("prepared statement %s") % query.sql_cmd);