Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 386368 - Use getters and setters for database schema version. r=sspitzer

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@229168 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sdwilsh%shawnwilsher.com 2007-07-02 17:25:41 +00:00
parent 75e1f01089
commit 5926822818
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/toolkit/components/places/src/nsNavHistory.cpp
View File

@ -521,18 +521,8 @@ nsNavHistory::InitDB(PRBool *aDoImport)
// Get the places schema version, which we store in the user_version PRAGMA
PRInt32 DBSchemaVersion;
{
nsCOMPtr<mozIStorageStatement> statement;
rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING("PRAGMA user_version"),
getter_AddRefs(statement));
NS_ENSURE_SUCCESS(rv, rv);
PRBool hasResult;
rv = statement->ExecuteStep(&hasResult);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_TRUE(hasResult, NS_ERROR_FAILURE);
DBSchemaVersion = statement->AsInt32(0);
}
rv = mDBConn->GetSchemaVersion(&DBSchemaVersion);
NS_ENSURE_SUCCESS(rv, rv);
if (PLACES_SCHEMA_VERSION != DBSchemaVersion) {
// Migration How-to:
@ -711,9 +701,7 @@ nsNavHistory::InitDB(PRBool *aDoImport)
nsresult
nsNavHistory::UpdateSchemaVersion()
{
nsCAutoString schemaVersionPragma("PRAGMA user_version=");
schemaVersionPragma.AppendInt(PLACES_SCHEMA_VERSION);
return mDBConn->ExecuteSimpleSQL(schemaVersionPragma);
return mDBConn->SetSchemaVersion(PLACES_SCHEMA_VERSION);
}
// nsNavHistory::InitStatements