From 760dec7f5340f953a91689840fbdc44df16d983f Mon Sep 17 00:00:00 2001 From: "Christopher J. Brody" Date: Mon, 1 Jan 2018 20:25:46 -0500 Subject: [PATCH] Signal INTERNAL ERROR in case of attempt to reuse db on Windows Should never happen due to workaround solution to litehelpers/Cordova-sqlite-storage#666 --- CHANGES.md | 3 ++- package.json | 2 +- plugin.xml | 2 +- src/windows/sqlite-proxy.js | 6 +++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8b5341f7e..da4c38954 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,8 @@ # Changes -##### cordova-sqlite-legacy-core 1.0.7-pre4 +##### cordova-sqlite-legacy-core 1.0.7-pre5 +- Signal INTERNAL ERROR in case of attempt to reuse db on Windows (should never happen due to workaround solution to BUG 666) - SQLITE_DEFAULT_CACHE_SIZE build flag fix for macOS ("osx") and Windows ###### cordova-sqlite-legacy-express-core 1.0.5 diff --git a/package.json b/package.json index 428c09ef1..e6853d8b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-sqlite-legacy-core", - "version": "1.0.7-pre4", + "version": "1.0.7-pre5", "description": "Native interface to SQLite for PhoneGap/Cordova (legacy core version branch)", "cordova": { "id": "cordova-sqlite-legacy-core", diff --git a/plugin.xml b/plugin.xml index 141e4fd7f..a06e29074 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="1.0.7-pre5"> Cordova sqlite storage plugin - legacy core version branch diff --git a/src/windows/sqlite-proxy.js b/src/windows/sqlite-proxy.js index 2eb3af3ae..6065fab1e 100644 --- a/src/windows/sqlite-proxy.js +++ b/src/windows/sqlite-proxy.js @@ -29,7 +29,11 @@ module.exports = { var res; function openImmediate(dbname) { - //var dbname = options.name; + if (!!dbmap[dbname]) { + // NO LONGER EXPECTED due to BUG 666 workaround solution: + fail("INTERNAL ERROR: database already open for dbname: " + dbname); + } + // from @EionRobb / phonegap-win8-sqlite: var opendbname = Windows.Storage.ApplicationData.current.localFolder.path + "\\" + dbname; console.log("open db name: " + dbname + " at full path: " + opendbname);