Backed out changeset 562c3fe054e5 (
bug 702559)
--- a/services/metrics/storage.jsm
+++ b/services/metrics/storage.jsm
@@ -1158,26 +1158,26 @@ MetricsStorageSqliteBackend.prototype =
// loss.
yield self._connection.execute("PRAGMA synchronous=FULL");
}
let doCheckpoint = false;
// 1. Create the schema.
yield self._connection.executeTransaction(function ensureSchema(conn) {
- let schema = yield conn.getSchemaVersion();
+ let schema = conn.schemaVersion;
if (schema == 0) {
self._log.info("Creating database schema.");
for (let k of self._SCHEMA_STATEMENTS) {
yield self._connection.execute(SQL[k]);
}
- yield self._connection.setSchemaVersion(1);
+ self._connection.schemaVersion = 1;
doCheckpoint = true;
} else if (schema != 1) {
throw new Error("Unknown database schema: " + schema);
} else {
self._log.debug("Database schema up to date.");
}
});
--- a/services/metrics/tests/xpcshell/test_metrics_storage.js
+++ b/services/metrics/tests/xpcshell/test_metrics_storage.js
@@ -75,17 +75,17 @@ add_task(function test_reconnect() {
yield backend.close();
let backend2 = yield Metrics.Storage("reconnect");
yield backend2.close();
});
add_task(function test_future_schema_errors() {
let backend = yield Metrics.Storage("future_schema_errors");
- yield backend._connection.setSchemaVersion(2);
+ backend._connection.schemaVersion = 2;
yield backend.close();
let backend2;
let failed = false;
try {
backend2 = yield Metrics.Storage("future_schema_errors");
} catch (ex) {
failed = true;