Skip to content

Commit

Permalink
Fix log in case of transaction waiting for open to finish; test/doc f…
Browse files Browse the repository at this point in the history
…ixes
  • Loading branch information
Christopher J. Brody committed Nov 5, 2017
1 parent ece0c61 commit 8ac39fa
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 35 deletions.
3 changes: 2 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Changes

##### cordova-sqlite-legacy-core 1.0.1
##### cordova-sqlite-legacy-core 1.0.2

- Fix log in case of transaction waiting for open to finish; doc fixes
- SQLite 3.15.2 build with SQLITE_THREADSAFE=2 on iOS/macOS (SQLITE_THREADSAFE=1 on Android/Windows) and other flag fixes in this version branch to avoid possible malformed database due to multithreaded access ref: litehelpers/Cordova-sqlite-storage#703
- Windows 10 (UWP) build with /SAFESEH flag on Win32 (x86) target

Expand Down
53 changes: 27 additions & 26 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion SQLitePlugin.coffee.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@

else
if @dbname of @openDBs
console.log 'new transaction is waiting for open operation'
console.log 'new transaction is queued, waiting for open operation to finish'
else
# XXX SHOULD NOT GET HERE.
# FUTURE TBD TODO: in this exceptional case abort and discard the transaction.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-sqlite-legacy-core",
"version": "1.0.1",
"version": "1.0.2",
"description": "Native interface to SQLite for PhoneGap/Cordova (legacy core version branch)",
"cordova": {
"id": "cordova-sqlite-legacy-core",
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-sqlite-legacy-core"
version="1.0.1">
version="1.0.2">

<name>Cordova sqlite storage plugin - legacy core version branch</name>

Expand Down
4 changes: 3 additions & 1 deletion spec/www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
<!-- [Cordova] source file(s): -->
<script src="cordova.js"></script>

<!-- spec file(s): -->
<!-- browser startup test: -->
<script src="spec/browser-check-startup.js"></script>

<!-- other spec file(s): -->
<script src="spec/self-test.js"></script>
<script src="spec/db-tx-string-test.js"></script>
<script src="spec/db-tx-sql-results.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions spec/www/spec/regexp-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ var mytests = function() {

it(suiteName + 'Simple REGEXP test',
function(done) {
if (isWP8) pending('NOT IMPLEMENTED for WP8');
if (isWindows) pending('NOT IMPLEMENTED for Windows');
if (isWP8) pending('NOT IMPLEMENTED for WP8 (plugin)');
if (isWindows) pending('NOT IMPLEMENTED for Windows (plugin)');
if (!isWebSql && !isWindows && isAndroid) pending('SKIP for Android plugin'); // TBD SKIP for Android plugin (for now)
if (isWebSql && !isAndroid && !isWindows && !isWP8) pending('SKIP for iOS (WebKit) Web SQL');
if (!isWebSql && !isAndroid && !isWindows && !isWP8) pending('NOT IMPLEMENTED for iOS/macOS');
if (!isWebSql && !isAndroid && !isWindows && !isWP8) pending('NOT IMPLEMENTED for iOS/macOS plugin');

var db = openDatabase('simple-regexp-test.db', '1.0', 'test', DEFAULT_SIZE);

Expand Down
2 changes: 1 addition & 1 deletion www/SQLitePlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
this.startNextTransaction();
} else {
if (this.dbname in this.openDBs) {
console.log('new transaction is waiting for open operation');
console.log('new transaction is queued, waiting for open operation to finish');
} else {
console.log('database is closed, new transaction is [stuck] waiting until db is opened again!');
}
Expand Down

0 comments on commit 8ac39fa

Please sign in to comment.