LumeWeb
/
filer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix WebSQL provider to properly deal with typed arrays, 100% of tests passing now on WebKit with WebSQL

This commit is contained in:
David Humphrey (:humph) david.humphrey@senecacollege.ca 2014-03-04 13:37:37 -05:00
parent 6552683b15
commit da5e1b2b57
1 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/providers/websql.js
View File

@ -27,7 +27,7 @@ define(function(require) {
callback(null); callback(null);
} }
this.getTransaction(function(transaction) { this.getTransaction(function(transaction) {
transaction.executeSql("DELETE FROM " + FILE_STORE_NAME, transaction.executeSql("DELETE FROM " + FILE_STORE_NAME + ";",
[], onSuccess, onError); [], onSuccess, onError);
}); });
}; };
@ -35,17 +35,44 @@ define(function(require) {
function onSuccess(transaction, result) { function onSuccess(transaction, result) {
// If the key isn't found, return null // If the key isn't found, return null
var value = result.rows.length === 0 ? null : result.rows.item(0).data; var value = result.rows.length === 0 ? null : result.rows.item(0).data;
callback(null, value); try {
if(value) {
value = JSON.parse(value);
// Deal with special-cased flattened typed arrays in WebSQL (see put() below)
if(value.__isUint8Array) {
value = new Uint8Array(value.__array);
}
}
callback(null, value);
} catch(e) {
callback(e);
}
} }
function onError(transaction, error) { function onError(transaction, error) {
callback(error); callback(error);
} }
this.getTransaction(function(transaction) { this.getTransaction(function(transaction) {
transaction.executeSql("SELECT data FROM " + FILE_STORE_NAME + " WHERE id = ?", transaction.executeSql("SELECT data FROM " + FILE_STORE_NAME + " WHERE id = ?;",
[key], onSuccess, onError); [key], onSuccess, onError);
}); });
}; };
WebSQLContext.prototype.put = function(key, value, callback) { WebSQLContext.prototype.put = function(key, value, callback) {
// We do extra work to make sure typed arrays survive
// being stored in the db and still get the right prototype later.
if(Object.prototype.toString.call(value) === "[object Uint8Array]") {
value = {
__isUint8Array: true,
__array: (function() {
var array = [];
var vlen = value.length;
for(var i = 0; i < vlen; i++) {
array[i] = value[i];
}
return array;
}())
};
}
value = JSON.stringify(value);
function onSuccess(transaction, result) { function onSuccess(transaction, result) {
callback(null); callback(null);
} }
@ -53,7 +80,7 @@ define(function(require) {
callback(error); callback(error);
} }
this.getTransaction(function(transaction) { this.getTransaction(function(transaction) {
transaction.executeSql("INSERT OR REPLACE INTO " + FILE_STORE_NAME + " (id, data) VALUES (?, ?)", transaction.executeSql("INSERT OR REPLACE INTO " + FILE_STORE_NAME + " (id, data) VALUES (?, ?);",
[key, value], onSuccess, onError); [key, value], onSuccess, onError);
}); });
}; };
@ -65,7 +92,7 @@ define(function(require) {
callback(error); callback(error);
} }
this.getTransaction(function(transaction) { this.getTransaction(function(transaction) {
transaction.executeSql("DELETE FROM " + FILE_STORE_NAME + " WHERE id = ?", transaction.executeSql("DELETE FROM " + FILE_STORE_NAME + " WHERE id = ?;",
[key], onSuccess, onError); [key], onSuccess, onError);
}); });
}; };
@ -113,9 +140,15 @@ define(function(require) {
[], gotCount, onError); [], gotCount, onError);
} }
// Create the table and index we'll need to store the fs data.
db.transaction(function(transaction) { db.transaction(function(transaction) {
transaction.executeSql("CREATE TABLE IF NOT EXISTS " + FILE_STORE_NAME + " (id unique, data)", function createIndex(transaction) {
[], onSuccess, onError); transaction.executeSql("CREATE INDEX IF NOT EXISTS idx_" + FILE_STORE_NAME + "_id" +
" on " + FILE_STORE_NAME + " (id);",
[], onSuccess, onError);
}
transaction.executeSql("CREATE TABLE IF NOT EXISTS " + FILE_STORE_NAME + " (id unique, data TEXT);",
[], createIndex, onError);
}); });
}; };
WebSQL.prototype.getReadOnlyContext = function() { WebSQL.prototype.getReadOnlyContext = function() {