Skip to content

Added 5 try-catch blocks around tx.executeSql calls. #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MarkMYoung wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added 5 try-catch blocks around tx.executeSql calls. #85

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2212851
Added 5 try-catch blocks around tx.executeSql calls.
MarkMYoung Mar 16, 2012
8295a54
Modified code formatting to match the rest of the project. My apolog…
MarkMYoung Mar 22, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 38 additions & 6 deletions lib/persistence.store.sql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,16 +399,25 @@ function config(persistence, dialect) {
return;
}
obj._dirtyProperties = {};
var sql;
if (obj._new) {
properties.push('id');
values.push(tm.entityIdToDbId(obj.id));
qs.push(tm.outIdVar('?'));
var sql = "INSERT INTO `" + obj._type + "` (" + properties.join(", ") + ") VALUES (" + qs.join(', ') + ")";
sql = "INSERT INTO `" + obj._type + "` (" + properties.join(", ") + ") VALUES (" + qs.join(', ') + ")";
obj._new = false;
tx.executeSql(sql, values, callback, callback);
} else {
var sql = "UPDATE `" + obj._type + "` SET " + propertyPairs.join(',') + " WHERE id = " + tm.outId(obj.id);
sql = "UPDATE `" + obj._type + "` SET " + propertyPairs.join(',') + " WHERE id = " + tm.outId(obj.id);
}
try{
tx.executeSql(sql, values, callback, callback);
} catch(exc) {
if(window.console && typeof(console.warn) === 'function') {
console.warn(exc.message, sql, values);
}
if(typeof(callback) === 'function') {
callback();
}
}
});
}
Expand Down Expand Up @@ -686,6 +695,7 @@ function config(persistence, dialect) {
sql += " OFFSET " + this._skip;
}
session.flush(tx, function () {
try{
tx.executeSql(sql, args, function (rows) {
var results = [];
if(that._reverse) {
Expand All @@ -706,7 +716,13 @@ function config(persistence, dialect) {
callback(results);
that.triggerEvent('list', that, results);
});
});
} catch(exc) {
if(window.console && typeof(console.warn) === 'function') {
console.warn(exc.message, sql, args);
}
callback([]);
}
});
};

/**
Expand Down Expand Up @@ -765,6 +781,7 @@ function config(persistence, dialect) {
var args2 = args.slice(0);

session.flush(tx, function () {
try{
tx.executeSql(selectSql, args, function(results) {
for(var i = 0; i < results.length; i++) {
delete session.trackedObjects[results[i].id];
Expand All @@ -773,7 +790,15 @@ function config(persistence, dialect) {
that.triggerEvent('change', that);
tx.executeSql(deleteSql, args2, callback, callback);
}, callback);
});
} catch(exc) {
if(window.console && typeof(console.warn) === 'function') {
console.warn(exc.message, selectSql, args);
}
if(typeof(callback) === 'function') {
callback();
}
}
});
};

/**
Expand Down Expand Up @@ -836,10 +861,17 @@ function config(persistence, dialect) {
var sql = "SELECT COUNT(*) AS cnt FROM `" + entityName + "` AS `root` " + joinSql + " " + whereSql;

session.flush(tx, function () {
try{
tx.executeSql(sql, args, function(results) {
callback(parseInt(results[0].cnt, 10));
});
});
} catch(exc) {
if(window.console && typeof(console.warn) === 'function') {
console.warn(exc.message, sql, args);
}
callback(0);
}
});
};

persistence.ManyToManyDbQueryCollection.prototype.persistQueries = function() {
Expand Down