wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 70bccf82bbfa (forgot to add reviewer)

Browse Source
This commit is contained in:
Lucas Rocha 2014-03-04 16:54:32 +00:00
parent d7fa164d02
commit d9f3d4bbac
2 changed files with 10 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/db/HomeProvider.java
View File

@ -25,7 +25,7 @@ public class HomeProvider extends SQLiteBridgeContentProvider {
private static final String LOGTAG = "GeckoHomeProvider";
// This should be kept in sync with the db version in mobile/android/modules/HomeProvider.jsm
private static int DB_VERSION = 2;
private static int DB_VERSION = 1;
private static String DB_FILENAME = "home.sqlite";
private static final String TABLE_ITEMS = "items";

51
mobile/android/modules/HomeProvider.jsm
View File

@ -17,11 +17,12 @@ Cu.import("resource://gre/modules/Task.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
/*
* XXX: Add migration logic to getDatabaseConnection if you ever rev SCHEMA_VERSION.
*
* SCHEMA_VERSION history:
* 1: Create HomeProvider (bug 942288)
* 2: Add filter column to items table (bug 942295/975841)
*/
const SCHEMA_VERSION = 2;
const SCHEMA_VERSION = 1;
XPCOMUtils.defineLazyGetter(this, "DB_PATH", function() {
return OS.Path.join(OS.Constants.Path.profileDir, "home.sqlite");
@ -54,9 +55,6 @@ const SQL = {
"created INTEGER" +
")",
dropItemsTable:
"DROP TABLE items",
insertItem:
"INSERT INTO items (dataset_id, url, title, description, image_url, filter, created) " +
"VALUES (:dataset_id, :url, :title, :description, :image_url, :filter, :created)",
@ -183,33 +181,6 @@ this.HomeProvider = Object.freeze({
var gDatabaseEnsured = false;
/**
* Creates the database schema.
*/
function createDatabase(db) {
return Task.spawn(function create_database_task() {
yield db.execute(SQL.createItemsTable);
});
}
/**
* Migrates the database schema to a new version.
*/
function upgradeDatabase(db, oldVersion, newVersion) {
return Task.spawn(function upgrade_database_task() {
for (let v = oldVersion + 1; v <= newVersion; v++) {
switch(v) {
case 2:
// Recreate the items table discarding any
// existing data.
yield db.execute(SQL.dropItemsTable);
yield db.execute(SQL.createItemsTable);
break;
}
}
});
}
/**
* Opens a database connection and makes sure that the database schema version
* is correct, performing migrations if necessary. Consumers should be sure
@ -227,17 +198,13 @@ function getDatabaseConnection() {
try {
// Check to see if we need to perform any migrations.
let dbVersion = parseInt(yield db.getSchemaVersion());
// getSchemaVersion() returns a 0 int if the schema
// version is undefined.
if (dbVersion === 0) {
yield createDatabase(db);
} else if (dbVersion < SCHEMA_VERSION) {
yield upgradeDatabase(db, dbVersion, SCHEMA_VERSION);
}
// XXX: We will need to add migration logic if we ever rev SCHEMA_VERSION.
let dbVersion = yield db.getSchemaVersion();
if (parseInt(dbVersion) < SCHEMA_VERSION) {
// For schema v1, create the items table and set the schema version.
yield db.execute(SQL.createItemsTable);
yield db.setSchemaVersion(SCHEMA_VERSION);
}
} catch(e) {
// Close the DB connection before passing the exception to the consumer.
yield db.close();