From de55b95fd6b88cfdaa9602489edbb89e25724d63 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Wed, 18 Nov 2020 10:26:47 +0100 Subject: [PATCH 01/14] add(): electron --- package.json | 2 + plugin.xml | 7 ++ src/electron/SQLiteProxy.js | 154 ++++++++++++++++++++++++++++++++++++ 3 files changed, 163 insertions(+) create mode 100644 src/electron/SQLiteProxy.js diff --git a/package.json b/package.json index 36aacbfa0..ca5b52264 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "platforms": [ "android", "browser", + "electron", "ios", "osx", "windows" @@ -21,6 +22,7 @@ "ecosystem:cordova", "cordova-android", "cordova-browser", + "cordova-electron", "cordova-ios", "cordova-osx", "cordova-windows" diff --git a/plugin.xml b/plugin.xml index 3057ba39c..ebb05c8f0 100644 --- a/plugin.xml +++ b/plugin.xml @@ -31,6 +31,13 @@ + + + + + + + diff --git a/src/electron/SQLiteProxy.js b/src/electron/SQLiteProxy.js new file mode 100644 index 000000000..48bf129c4 --- /dev/null +++ b/src/electron/SQLiteProxy.js @@ -0,0 +1,154 @@ +var dbmap = {}; + +var closed_dbmap = {}; + +function echoStringValue(success, error, options) { + success(options[0].value); +} + +var SQL = window.require('sqlite3').verbose(); + +// window.initSqlJs().then(sql => { SQL = sql }) + +function openDatabase(success, error, options) { + var name = options[0].name; + + if (!!dbmap[name]) + return setTimeout(function () { + error('INTERNAL OPEN ERROR: db already open for ' + name); + }, 0); + + // Support close-and-reopen tests + if (!!closed_dbmap[name]) { + var db = (dbmap[name] = closed_dbmap[name]); + delete closed_dbmap[name]; + try { + db.exec('ROLLBACK'); + } catch (e) {} + return setTimeout(success, 0); + } + + try { + dbmap[name] = new SQL.Database('./' + name + '.db'); + } catch (e) { + // INTERNAL OPEN ERROR + return error(e); + } + + setTimeout(success, 0); +} + +function backgroundExecuteSqlBatch(success, error, options) { + var dbname = options[0].dbargs.dbname; + + if (!dbmap[dbname]) return error('INTERNAL ERROR: database not open'); + + var db = dbmap[dbname]; + + var e = options[0].executes; + + var resultList = []; + + for (var i = 0; i < e.length; ++i) { + var sql = e[i].sql; + var params = e[i].params; + + var rr = []; + + // var prevTotalChanges = db.exec('SELECT total_changes()')[0].values[0][0]; + + // try { + // db.each( + // sql, + // params, + // function (r) { + // rr.push(r); + // }, + // function () { + // var insertId = db.exec('SELECT last_insert_rowid()')[0].values[0][0]; + // var totalChanges = db.exec('SELECT total_changes()')[0].values[0][0]; + // var rowsAffected = totalChanges - prevTotalChanges; + // resultList.push({ + // type: 'success', + // result: + // rowsAffected !== 0 + // ? { + // rows: rr, + // insertId: insertId, + // rowsAffected: rowsAffected, + // } + // : { + // rows: rr, + // rowsAffected: 0, + // }, + // }); + // } + // ); + // } catch (e) { + // // FUTURE TODO: report correct error code according to Web SQL + // resultList.push({ + // type: 'error', + // result: { + // code: 0, + // message: e.toString(), + // }, + // }); + // } + } + + setTimeout(function () { + success(resultList); + }, 0); +} + +function closeDatabase(success, error, options) { + var dbname = options[0].path; + + var db = dbmap[dbname]; + + if (!db) + return setTimeout(function () { + error('INTERNAL CLOSE ERROR: database not open'); + }, 0); + + // Keep in memory to support close-and-reopen tests + closed_dbmap[dbname] = dbmap[dbname]; + + delete dbmap[dbname]; + + setTimeout(success, 0); +} + +function deleteDatabase(success, error, options) { + var dbname = options[0].path; + + if (!!closed_dbmap[dbname]) { + // XXX TBD causes test timeouts: + // closed_dbmap[name].close(); + delete closed_dbmap[dbname]; + return setTimeout(success, 0); + } + + var db = dbmap[dbname]; + + if (!db) + return setTimeout(function () { + error('INTERNAL DELETE ERROR'); + }, 0); + + db.close(); + + delete dbmap[dbname]; + + setTimeout(success, 0); +} + +module.exports = { + echoStringValue: echoStringValue, + open: openDatabase, + backgroundExecuteSqlBatch: backgroundExecuteSqlBatch, + close: closeDatabase, + delete: deleteDatabase, +}; + +require('cordova/exec/proxy').add('SQLitePlugin', module.exports); From 5c98b5283dbf29996b5850164e383852535c3b18 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Wed, 18 Nov 2020 11:04:04 +0100 Subject: [PATCH 02/14] add(): electron --- plugin.xml | 7 -- src/browser/SQLiteProxy.js | 74 ++++++++++------- src/electron/SQLiteProxy.js | 154 ------------------------------------ 3 files changed, 46 insertions(+), 189 deletions(-) delete mode 100644 src/electron/SQLiteProxy.js diff --git a/plugin.xml b/plugin.xml index ebb05c8f0..3057ba39c 100644 --- a/plugin.xml +++ b/plugin.xml @@ -31,13 +31,6 @@ - - - - - - - diff --git a/src/browser/SQLiteProxy.js b/src/browser/SQLiteProxy.js index 1a6821f76..2e389420c 100644 --- a/src/browser/SQLiteProxy.js +++ b/src/browser/SQLiteProxy.js @@ -8,7 +8,21 @@ function echoStringValue(success, error, options) { var SQL = null; -window.initSqlJs().then(sql => { SQL = sql }) +var isSqlite3 = false; + +if (window.require) { + var sqlite3 = window.require('sqlite3'); + if (sqlite3) { + SQL = sqlite3.verbose(); + isSqlite3 = true; + } else { + return error('INTERNAL ERROR: sqlite3 not installed'); + } +} else { + window.initSqlJs().then((sql) => { + SQL = sql; + }); +} function openDatabase(success, error, options) { var name = options[0].name; @@ -54,36 +68,40 @@ function backgroundExecuteSqlBatch(success, error, options) { var rr = [] - var prevTotalChanges = (db.exec('SELECT total_changes()'))[0].values[0][0]; - - try { - db.each(sql, params, function(r) { - rr.push(r); - }, function() { - var insertId = (db.exec('SELECT last_insert_rowid()'))[0].values[0][0]; - var totalChanges = (db.exec('SELECT total_changes()'))[0].values[0][0]; - var rowsAffected = totalChanges - prevTotalChanges; + if (isSqlite3) { + console.log('sqlite3', 'backgroundExecuteSqlBatch', success, error, options); + } else { + var prevTotalChanges = (db.exec('SELECT total_changes()'))[0].values[0][0]; + + try { + db.each(sql, params, function(r) { + rr.push(r); + }, function() { + var insertId = (db.exec('SELECT last_insert_rowid()'))[0].values[0][0]; + var totalChanges = (db.exec('SELECT total_changes()'))[0].values[0][0]; + var rowsAffected = totalChanges - prevTotalChanges; + resultList.push({ + type: 'success', + result: (rowsAffected !== 0) ? { + rows: rr, + insertId: insertId, + rowsAffected: rowsAffected + } : { + rows: rr, + rowsAffected: 0 + } + }); + }); + } catch(e) { + // FUTURE TODO: report correct error code according to Web SQL resultList.push({ - type: 'success', - result: (rowsAffected !== 0) ? { - rows: rr, - insertId: insertId, - rowsAffected: rowsAffected - } : { - rows: rr, - rowsAffected: 0 + type: 'error', + result: { + code: 0, + message: e.toString() } }); - }); - } catch(e) { - // FUTURE TODO: report correct error code according to Web SQL - resultList.push({ - type: 'error', - result: { - code: 0, - message: e.toString() - } - }); + } } } diff --git a/src/electron/SQLiteProxy.js b/src/electron/SQLiteProxy.js deleted file mode 100644 index 48bf129c4..000000000 --- a/src/electron/SQLiteProxy.js +++ /dev/null @@ -1,154 +0,0 @@ -var dbmap = {}; - -var closed_dbmap = {}; - -function echoStringValue(success, error, options) { - success(options[0].value); -} - -var SQL = window.require('sqlite3').verbose(); - -// window.initSqlJs().then(sql => { SQL = sql }) - -function openDatabase(success, error, options) { - var name = options[0].name; - - if (!!dbmap[name]) - return setTimeout(function () { - error('INTERNAL OPEN ERROR: db already open for ' + name); - }, 0); - - // Support close-and-reopen tests - if (!!closed_dbmap[name]) { - var db = (dbmap[name] = closed_dbmap[name]); - delete closed_dbmap[name]; - try { - db.exec('ROLLBACK'); - } catch (e) {} - return setTimeout(success, 0); - } - - try { - dbmap[name] = new SQL.Database('./' + name + '.db'); - } catch (e) { - // INTERNAL OPEN ERROR - return error(e); - } - - setTimeout(success, 0); -} - -function backgroundExecuteSqlBatch(success, error, options) { - var dbname = options[0].dbargs.dbname; - - if (!dbmap[dbname]) return error('INTERNAL ERROR: database not open'); - - var db = dbmap[dbname]; - - var e = options[0].executes; - - var resultList = []; - - for (var i = 0; i < e.length; ++i) { - var sql = e[i].sql; - var params = e[i].params; - - var rr = []; - - // var prevTotalChanges = db.exec('SELECT total_changes()')[0].values[0][0]; - - // try { - // db.each( - // sql, - // params, - // function (r) { - // rr.push(r); - // }, - // function () { - // var insertId = db.exec('SELECT last_insert_rowid()')[0].values[0][0]; - // var totalChanges = db.exec('SELECT total_changes()')[0].values[0][0]; - // var rowsAffected = totalChanges - prevTotalChanges; - // resultList.push({ - // type: 'success', - // result: - // rowsAffected !== 0 - // ? { - // rows: rr, - // insertId: insertId, - // rowsAffected: rowsAffected, - // } - // : { - // rows: rr, - // rowsAffected: 0, - // }, - // }); - // } - // ); - // } catch (e) { - // // FUTURE TODO: report correct error code according to Web SQL - // resultList.push({ - // type: 'error', - // result: { - // code: 0, - // message: e.toString(), - // }, - // }); - // } - } - - setTimeout(function () { - success(resultList); - }, 0); -} - -function closeDatabase(success, error, options) { - var dbname = options[0].path; - - var db = dbmap[dbname]; - - if (!db) - return setTimeout(function () { - error('INTERNAL CLOSE ERROR: database not open'); - }, 0); - - // Keep in memory to support close-and-reopen tests - closed_dbmap[dbname] = dbmap[dbname]; - - delete dbmap[dbname]; - - setTimeout(success, 0); -} - -function deleteDatabase(success, error, options) { - var dbname = options[0].path; - - if (!!closed_dbmap[dbname]) { - // XXX TBD causes test timeouts: - // closed_dbmap[name].close(); - delete closed_dbmap[dbname]; - return setTimeout(success, 0); - } - - var db = dbmap[dbname]; - - if (!db) - return setTimeout(function () { - error('INTERNAL DELETE ERROR'); - }, 0); - - db.close(); - - delete dbmap[dbname]; - - setTimeout(success, 0); -} - -module.exports = { - echoStringValue: echoStringValue, - open: openDatabase, - backgroundExecuteSqlBatch: backgroundExecuteSqlBatch, - close: closeDatabase, - delete: deleteDatabase, -}; - -require('cordova/exec/proxy').add('SQLitePlugin', module.exports); From cc573a8bb9e7be3929a2f2866079d07170b5b5fd Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Wed, 18 Nov 2020 13:30:47 +0100 Subject: [PATCH 03/14] fix(): electron db name --- src/browser/SQLiteProxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/SQLiteProxy.js b/src/browser/SQLiteProxy.js index 2e389420c..5f02386cd 100644 --- a/src/browser/SQLiteProxy.js +++ b/src/browser/SQLiteProxy.js @@ -42,7 +42,7 @@ function openDatabase(success, error, options) { } try { - dbmap[name] = new SQL.Database(); + dbmap[name] = new SQL.Database(isSqlite3 ? './' + name + '.db' : undefined); } catch(e) { // INTERNAL OPEN ERROR return error(e); From f21b6e8eced8441e48b8ed4fcb8304a22116e550 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Wed, 18 Nov 2020 14:40:50 +0100 Subject: [PATCH 04/14] fix(): electron --- src/browser/SQLiteProxy.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/browser/SQLiteProxy.js b/src/browser/SQLiteProxy.js index 5f02386cd..1e5ba1c7d 100644 --- a/src/browser/SQLiteProxy.js +++ b/src/browser/SQLiteProxy.js @@ -69,7 +69,16 @@ function backgroundExecuteSqlBatch(success, error, options) { var rr = [] if (isSqlite3) { - console.log('sqlite3', 'backgroundExecuteSqlBatch', success, error, options); + var isInsertQuery = sql.substr(0, 11) === 'INSERT INTO'; + if (isInsertQuery) { + db.run(sql, params, function (e, r) { + console.log('db.run', e, r); + }); + } else { + db.all(sql, params, function (e, r) { + console.log('db.all', e, r); + }); + } } else { var prevTotalChanges = (db.exec('SELECT total_changes()'))[0].values[0][0]; From d1e441c614f12e00c5c746b58db949ecdc77890d Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Wed, 18 Nov 2020 15:00:15 +0100 Subject: [PATCH 05/14] fix(): electron --- src/browser/SQLiteProxy.js | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/src/browser/SQLiteProxy.js b/src/browser/SQLiteProxy.js index 1e5ba1c7d..0c6a87022 100644 --- a/src/browser/SQLiteProxy.js +++ b/src/browser/SQLiteProxy.js @@ -69,15 +69,37 @@ function backgroundExecuteSqlBatch(success, error, options) { var rr = [] if (isSqlite3) { - var isInsertQuery = sql.substr(0, 11) === 'INSERT INTO'; - if (isInsertQuery) { - db.run(sql, params, function (e, r) { - console.log('db.run', e, r); - }); + var handler = function (e, r) { + console.log('db.run', e, r, this); + if (e) { + resultList.push({ + type: 'error', + result: { + code: 0, + message: e.toString(), + }, + }); + } else { + resultList.push({ + type: 'success', + result: + this['changes'] !== 0 + ? { + rows: r, + insertId: this['lastID'], + rowsAffected: this['changes'], + } + : { + rows: r, + rowsAffected: 0, + }, + }); + } + }; + if (sql.substr(0, 11) === 'INSERT INTO') { + db.run(sql, params, handler); } else { - db.all(sql, params, function (e, r) { - console.log('db.all', e, r); - }); + db.all(sql, params, handler); } } else { var prevTotalChanges = (db.exec('SELECT total_changes()'))[0].values[0][0]; From 19d2802b21c7aafc4a45f60da4cc3e776ba94cb3 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Wed, 18 Nov 2020 15:14:50 +0100 Subject: [PATCH 06/14] fix(): electron --- src/browser/SQLiteProxy.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/browser/SQLiteProxy.js b/src/browser/SQLiteProxy.js index 0c6a87022..7e39a3999 100644 --- a/src/browser/SQLiteProxy.js +++ b/src/browser/SQLiteProxy.js @@ -66,8 +66,6 @@ function backgroundExecuteSqlBatch(success, error, options) { var sql = e[i].sql; var params = e[i].params; - var rr = [] - if (isSqlite3) { var handler = function (e, r) { console.log('db.run', e, r, this); @@ -95,6 +93,10 @@ function backgroundExecuteSqlBatch(success, error, options) { }, }); } + + setTimeout(function () { + success(resultList); + }, 0); }; if (sql.substr(0, 11) === 'INSERT INTO') { db.run(sql, params, handler); @@ -102,6 +104,8 @@ function backgroundExecuteSqlBatch(success, error, options) { db.all(sql, params, handler); } } else { + var rr = [] + var prevTotalChanges = (db.exec('SELECT total_changes()'))[0].values[0][0]; try { @@ -134,11 +138,11 @@ function backgroundExecuteSqlBatch(success, error, options) { }); } } - } - setTimeout(function() { - success(resultList); - }, 0); + setTimeout(function() { + success(resultList); + }, 0); + } } function closeDatabase(success, error, options) { From 1370f6ec41e08d782c313defa33487ad992ea55c Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Wed, 18 Nov 2020 15:15:59 +0100 Subject: [PATCH 07/14] fix(): electron --- src/browser/SQLiteProxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/SQLiteProxy.js b/src/browser/SQLiteProxy.js index 7e39a3999..95332af76 100644 --- a/src/browser/SQLiteProxy.js +++ b/src/browser/SQLiteProxy.js @@ -81,7 +81,7 @@ function backgroundExecuteSqlBatch(success, error, options) { resultList.push({ type: 'success', result: - this['changes'] !== 0 + this['changes'] && this['changes'] !== 0 ? { rows: r, insertId: this['lastID'], From e3a15ed75b4f2e0e0c21ee61a7a728bf495f5170 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Thu, 19 Nov 2020 08:40:15 +0100 Subject: [PATCH 08/14] fix(): electron --- src/browser/SQLiteProxy.js | 81 ++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/src/browser/SQLiteProxy.js b/src/browser/SQLiteProxy.js index 95332af76..f295994b5 100644 --- a/src/browser/SQLiteProxy.js +++ b/src/browser/SQLiteProxy.js @@ -67,42 +67,7 @@ function backgroundExecuteSqlBatch(success, error, options) { var params = e[i].params; if (isSqlite3) { - var handler = function (e, r) { - console.log('db.run', e, r, this); - if (e) { - resultList.push({ - type: 'error', - result: { - code: 0, - message: e.toString(), - }, - }); - } else { - resultList.push({ - type: 'success', - result: - this['changes'] && this['changes'] !== 0 - ? { - rows: r, - insertId: this['lastID'], - rowsAffected: this['changes'], - } - : { - rows: r, - rowsAffected: 0, - }, - }); - } - - setTimeout(function () { - success(resultList); - }, 0); - }; - if (sql.substr(0, 11) === 'INSERT INTO') { - db.run(sql, params, handler); - } else { - db.all(sql, params, handler); - } + resultList.push(_sqlite3ExecuteSql(db, sql, params)); } else { var rr = [] @@ -139,10 +104,48 @@ function backgroundExecuteSqlBatch(success, error, options) { } } - setTimeout(function() { - success(resultList); - }, 0); } + + setTimeout(function() { + success(resultList); + }, 0); +} + +async function _sqlite3ExecuteSql(db, sql, params) { + return await new Promise((resolve) => { + var _sqlite3Handler = function (e, r) { + console.log('db.run', e, r, this); + if (e) { + resolve({ + type: 'error', + result: { + code: 0, + message: e.toString(), + }, + }); + } else { + resolve({ + type: 'success', + result: + this['changes'] && this['changes'] !== 0 + ? { + rows: r, + insertId: this['lastID'], + rowsAffected: this['changes'], + } + : { + rows: r, + rowsAffected: 0, + }, + }); + } + }; + if (sql.substr(0, 11) === 'INSERT INTO') { + db.run(sql, params, _sqlite3Handler); + } else { + db.all(sql, params, _sqlite3Handler); + } + }); } function closeDatabase(success, error, options) { From 8b25c866ee7087fff02f66f4d6872a5967da66ef Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Thu, 19 Nov 2020 08:49:06 +0100 Subject: [PATCH 09/14] fix(): electron --- src/browser/SQLiteProxy.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/browser/SQLiteProxy.js b/src/browser/SQLiteProxy.js index f295994b5..e385d6628 100644 --- a/src/browser/SQLiteProxy.js +++ b/src/browser/SQLiteProxy.js @@ -8,13 +8,12 @@ function echoStringValue(success, error, options) { var SQL = null; -var isSqlite3 = false; +var sqlite3 = null; -if (window.require) { +if (!!window.require) { var sqlite3 = window.require('sqlite3'); - if (sqlite3) { + if (!!sqlite3) { SQL = sqlite3.verbose(); - isSqlite3 = true; } else { return error('INTERNAL ERROR: sqlite3 not installed'); } @@ -42,7 +41,7 @@ function openDatabase(success, error, options) { } try { - dbmap[name] = new SQL.Database(isSqlite3 ? './' + name + '.db' : undefined); + dbmap[name] = new SQL.Database(!!sqlite3 ? './' + name + '.db' : undefined); } catch(e) { // INTERNAL OPEN ERROR return error(e); @@ -66,8 +65,10 @@ function backgroundExecuteSqlBatch(success, error, options) { var sql = e[i].sql; var params = e[i].params; - if (isSqlite3) { - resultList.push(_sqlite3ExecuteSql(db, sql, params)); + if (!!sqlite3) { + _sqlite3ExecuteSql(db, sql, params).then(function(r) { + resultList.push(r); + }); } else { var rr = [] @@ -111,8 +112,8 @@ function backgroundExecuteSqlBatch(success, error, options) { }, 0); } -async function _sqlite3ExecuteSql(db, sql, params) { - return await new Promise((resolve) => { +function _sqlite3ExecuteSql(db, sql, params) { + return new Promise(function(resolve) { var _sqlite3Handler = function (e, r) { console.log('db.run', e, r, this); if (e) { From de340ac7c5a3ee8d3dd401a74d67ec45ba048bf4 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Thu, 19 Nov 2020 08:58:06 +0100 Subject: [PATCH 10/14] fix(): electron --- src/browser/SQLiteProxy.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/browser/SQLiteProxy.js b/src/browser/SQLiteProxy.js index e385d6628..f99fdb053 100644 --- a/src/browser/SQLiteProxy.js +++ b/src/browser/SQLiteProxy.js @@ -50,7 +50,7 @@ function openDatabase(success, error, options) { setTimeout(success, 0); } -function backgroundExecuteSqlBatch(success, error, options) { +async function backgroundExecuteSqlBatch(success, error, options) { var dbname = options[0].dbargs.dbname; if (!dbmap[dbname]) return error('INTERNAL ERROR: database not open'); @@ -66,9 +66,7 @@ function backgroundExecuteSqlBatch(success, error, options) { var params = e[i].params; if (!!sqlite3) { - _sqlite3ExecuteSql(db, sql, params).then(function(r) { - resultList.push(r); - }); + resultList.push(await _sqlite3ExecuteSql(db, sql, params)); } else { var rr = [] @@ -113,7 +111,7 @@ function backgroundExecuteSqlBatch(success, error, options) { } function _sqlite3ExecuteSql(db, sql, params) { - return new Promise(function(resolve) { + return new Promise(function (resolve) { var _sqlite3Handler = function (e, r) { console.log('db.run', e, r, this); if (e) { From ea136146393e2d2809b8199eca590d05a18cb2da Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Thu, 19 Nov 2020 08:59:19 +0100 Subject: [PATCH 11/14] fix(): electron --- src/browser/SQLiteProxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/SQLiteProxy.js b/src/browser/SQLiteProxy.js index f99fdb053..a3a284aed 100644 --- a/src/browser/SQLiteProxy.js +++ b/src/browser/SQLiteProxy.js @@ -11,7 +11,7 @@ var SQL = null; var sqlite3 = null; if (!!window.require) { - var sqlite3 = window.require('sqlite3'); + sqlite3 = window.require('sqlite3'); if (!!sqlite3) { SQL = sqlite3.verbose(); } else { From 71fa072c0a747edbfd423db572bfba0d413f460f Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Thu, 19 Nov 2020 08:59:49 +0100 Subject: [PATCH 12/14] fix(): electron --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index ca5b52264..36aacbfa0 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "platforms": [ "android", "browser", - "electron", "ios", "osx", "windows" @@ -22,7 +21,6 @@ "ecosystem:cordova", "cordova-android", "cordova-browser", - "cordova-electron", "cordova-ios", "cordova-osx", "cordova-windows" From 5a8b489dbc638b4fabc98e71eb132ce4913943f5 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Thu, 19 Nov 2020 09:13:23 +0100 Subject: [PATCH 13/14] fix(): electron --- src/browser/SQLiteProxy.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/browser/SQLiteProxy.js b/src/browser/SQLiteProxy.js index a3a284aed..45629b792 100644 --- a/src/browser/SQLiteProxy.js +++ b/src/browser/SQLiteProxy.js @@ -41,6 +41,7 @@ function openDatabase(success, error, options) { } try { + console.log('new Database', name); dbmap[name] = new SQL.Database(!!sqlite3 ? './' + name + '.db' : undefined); } catch(e) { // INTERNAL OPEN ERROR @@ -113,8 +114,8 @@ async function backgroundExecuteSqlBatch(success, error, options) { function _sqlite3ExecuteSql(db, sql, params) { return new Promise(function (resolve) { var _sqlite3Handler = function (e, r) { - console.log('db.run', e, r, this); if (e) { + // FUTURE TODO: report correct error code according to SQLite3 resolve({ type: 'error', result: { From cd486c0679da1c4e8a06305cea903a5dd836d827 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsanakas Date: Thu, 19 Nov 2020 09:39:50 +0100 Subject: [PATCH 14/14] fix(): electron --- src/browser/SQLiteProxy.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/browser/SQLiteProxy.js b/src/browser/SQLiteProxy.js index 45629b792..d0a8b3223 100644 --- a/src/browser/SQLiteProxy.js +++ b/src/browser/SQLiteProxy.js @@ -41,8 +41,7 @@ function openDatabase(success, error, options) { } try { - console.log('new Database', name); - dbmap[name] = new SQL.Database(!!sqlite3 ? './' + name + '.db' : undefined); + dbmap[name] = new SQL.Database(!!sqlite3 ? name : undefined); } catch(e) { // INTERNAL OPEN ERROR return error(e);