moparisthebest
/
PhoneGap-SQLitePlugin-Android
mirror of https://github.com/moparisthebest/PhoneGap-SQLitePlugin-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

Send full db open arguments object to Java

This commit is contained in:
Chris Brody 2012-12-18 22:21:01 +01:00
parent 73cded6160
commit 810e1f4252
3 changed files with 58 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Android/assets/www/SQLitePlugin-orig.coffee
View File

@ -1,17 +1,23 @@
do ->
root = @
SQLitePlugin = (dbPath, openSuccess, openError) ->
SQLitePlugin = (openargs, openSuccess, openError) ->
console.log "SQLitePlugin"
throw new Error("Cannot create a SQLitePlugin instance without a dbPath") unless dbPath
@dbPath = dbPath
if !(openargs and openargs['name'])
throw new Error("Cannot create a SQLitePlugin instance without a db name")
dbname = openargs.name
@openargs = openargs
@dbname = dbname
@openSuccess = openSuccess
@openError = openError
@openSuccess or
@openSuccess = ->
console.log "DB opened: " + dbPath
console.log "DB opened: " + dbname
@openError or
@openError = (e) ->
@ -23,7 +29,7 @@ do ->
SQLitePlugin::openDBs = {}
SQLitePlugin::transaction = (fn, error, success) ->
t = new SQLitePluginTransaction(@dbPath)
t = new SQLitePluginTransaction(@dbname)
fn t
t.complete success, error
return
@ -31,19 +37,19 @@ do ->
SQLitePlugin::open = (success, error) ->
console.log "SQLitePlugin.prototype.open"
unless @dbPath of @openDBs
@openDBs[@dbPath] = true
cordova.exec success, error, "SQLitePlugin", "open", [ @dbPath ]
unless @dbname of @openDBs
@openDBs[@dbname] = true
cordova.exec success, error, "SQLitePlugin", "open", [ @openargs ]
return
SQLitePlugin::close = (success, error) ->
console.log "SQLitePlugin.prototype.close"
if @dbPath of @openDBs
delete @openDBs[@dbPath]
if @dbname of @openDBs
delete @openDBs[@dbname]
cordova.exec null, null, "SQLitePlugin", "close", [ @dbPath ]
cordova.exec null, null, "SQLitePlugin", "close", [ @dbname ]
return
@ -53,7 +59,7 @@ do ->
console.log "SQLitePlugin::executePragmaStatement"
pcb = success
cordova.exec (-> 1), error, "SQLitePlugin", "executePragmaStatement", [ @dbPath, statement ]
cordova.exec (-> 1), error, "SQLitePlugin", "executePragmaStatement", [ @dbname, statement ]
return
SQLitePluginCallback =
@ -75,8 +81,8 @@ do ->
transaction_queue = []
transaction_callback_queue = {}
SQLitePluginTransaction = (dbPath) ->
@dbPath = dbPath
SQLitePluginTransaction = (dbname) ->
@dbname = dbname
@executes = []
@trans_id = get_unique_id()
@__completed = false
@ -218,7 +224,7 @@ do ->
transaction_callback_queue[@trans_id]["success"] = successcb
transaction_callback_queue[@trans_id]["error"] = errorcb
cordova.exec null, null, "SQLitePlugin", "executeSqlBatch", [ @dbPath, transaction_queue[@trans_id] ]
cordova.exec null, null, "SQLitePlugin", "executeSqlBatch", [ @dbname, transaction_queue[@trans_id] ]
return
SQLiteFactory =
@ -226,30 +232,30 @@ do ->
if arguments.length < 1 then return null
first = arguments[0]
dbname = "DB"
openargs = null
okcb = null
errorcb = null
if first.constructor == String
dbname = first
openargs = {name: first}
if arguments.length >= 5
okcb = arguments[4]
if arguments.length > 5 then errorcb = arguments[5]
else
dbname = first['name']
openargs = first
if arguments.length >= 2
okcb = arguments[1]
if arguments.length > 2 then errorcb = arguments[2]
new SQLitePlugin dbname, okcb, errorcb
new SQLitePlugin openargs, okcb, errorcb
# Required for callbacks:
root.SQLitePluginCallback = SQLitePluginCallback
root.SQLitePluginTransactionCB = SQLitePluginTransactionCB
root.sqlitePlugin =
#openDatabase: (dbPath, version, displayName, estimatedSize, creationCallback, errorCallback) ->
# new SQLitePlugin(dbPath, creationCallback, errorCallback)
openDatabase: SQLiteFactory.opendb

47
Android/assets/www/SQLitePlugin.js
View File

@ -1,16 +1,19 @@
(function() {
var SQLiteFactory, SQLitePlugin, SQLitePluginCallback, SQLitePluginTransaction, SQLitePluginTransactionCB, get_unique_id, pcb, root, transaction_callback_queue, transaction_queue;
root = this;
SQLitePlugin = function(dbPath, openSuccess, openError) {
SQLitePlugin = function(openargs, openSuccess, openError) {
var dbname;
console.log("SQLitePlugin");
if (!dbPath) {
throw new Error("Cannot create a SQLitePlugin instance without a dbPath");
if (!(openargs && openargs['name'])) {
throw new Error("Cannot create a SQLitePlugin instance without a db name");
}
this.dbPath = dbPath;
dbname = openargs.name;
this.openargs = openargs;
this.dbname = dbname;
this.openSuccess = openSuccess;
this.openError = openError;
this.openSuccess || (this.openSuccess = function() {
return console.log("DB opened: " + dbPath);
return console.log("DB opened: " + dbname);
});
this.openError || (this.openError = function(e) {
return console.log(e.message);
@ -20,22 +23,22 @@
SQLitePlugin.prototype.openDBs = {};
SQLitePlugin.prototype.transaction = function(fn, error, success) {
var t;
t = new SQLitePluginTransaction(this.dbPath);
t = new SQLitePluginTransaction(this.dbname);
fn(t);
t.complete(success, error);
};
SQLitePlugin.prototype.open = function(success, error) {
console.log("SQLitePlugin.prototype.open");
if (!(this.dbPath in this.openDBs)) {
this.openDBs[this.dbPath] = true;
cordova.exec(success, error, "SQLitePlugin", "open", [this.dbPath]);
if (!(this.dbname in this.openDBs)) {
this.openDBs[this.dbname] = true;
cordova.exec(success, error, "SQLitePlugin", "open", [this.openargs]);
}
};
SQLitePlugin.prototype.close = function(success, error) {
console.log("SQLitePlugin.prototype.close");
if (this.dbPath in this.openDBs) {
delete this.openDBs[this.dbPath];
cordova.exec(null, null, "SQLitePlugin", "close", [this.dbPath]);
if (this.dbname in this.openDBs) {
delete this.openDBs[this.dbname];
cordova.exec(null, null, "SQLitePlugin", "close", [this.dbname]);
}
};
pcb = function() {
@ -46,7 +49,7 @@
pcb = success;
cordova.exec((function() {
return 1;
}), error, "SQLitePlugin", "executePragmaStatement", [this.dbPath, statement]);
}), error, "SQLitePlugin", "executePragmaStatement", [this.dbname, statement]);
};
SQLitePluginCallback = {
p1: function(id, result) {
@ -70,8 +73,8 @@
};
transaction_queue = [];
transaction_callback_queue = {};
SQLitePluginTransaction = function(dbPath) {
this.dbPath = dbPath;
SQLitePluginTransaction = function(dbname) {
this.dbname = dbname;
this.executes = [];
this.trans_id = get_unique_id();
this.__completed = false;
@ -222,30 +225,32 @@
}
transaction_callback_queue[this.trans_id]["success"] = successcb;
transaction_callback_queue[this.trans_id]["error"] = errorcb;
cordova.exec(null, null, "SQLitePlugin", "executeSqlBatch", [this.dbPath, transaction_queue[this.trans_id]]);
cordova.exec(null, null, "SQLitePlugin", "executeSqlBatch", [this.dbname, transaction_queue[this.trans_id]]);
};
SQLiteFactory = {
opendb: function() {
var dbname, errorcb, first, okcb;
var errorcb, first, okcb, openargs;
if (arguments.length < 1) return null;
first = arguments[0];
dbname = "DB";
openargs = null;
okcb = null;
errorcb = null;
if (first.constructor === String) {
dbname = first;
openargs = {
name: first
};
if (arguments.length >= 5) {
okcb = arguments[4];
if (arguments.length > 5) errorcb = arguments[5];
}
} else {
dbname = first['name'];
openargs = first;
if (arguments.length >= 2) {
okcb = arguments[1];
if (arguments.length > 2) errorcb = arguments[2];
}
}
return new SQLitePlugin(dbname, okcb, errorcb);
return new SQLitePlugin(openargs, okcb, errorcb);
}
};
root.SQLitePluginCallback = SQLitePluginCallback;

6
Android/src/com/phonegap/plugin/sqlitePlugin/SQLitePlugin.java
View File

@ -56,7 +56,11 @@ public class SQLitePlugin extends CordovaPlugin
{
try {
if (action.equals("open")) {
this.openDatabase(args.getString(0));
//this.openDatabase(args.getString(0));
JSONObject o = args.getJSONObject(0);
String dbname = o.getString("name");
this.openDatabase(dbname);
}
else if (action.equals("close")) {
this.closeDatabase(args.getString(0));