Merge pull request #13 from OutSystems/feat/RNMT-6247/update-sqlite

RNMT-6247 Update SQLite to version 3.40.0

Author: EiyuuZack

AUTHORS.md

@@ -16,6 +16,7 @@
 
 - Extracted from DroidGap by @brodybits (Chris Brody)
 - Transaction batch processing of Android version by @marcucio
+- Complex NDK response type enhancements to android-sqlite-native-ndk-connector and android-sqlite-ndk-native-driver by @luissilvaos (Luis Silva) of OutSystems
 - Maintained by @brodybits (Chris Brody)
 - Fixes to support old Android versions by @nolanlawson
 - Thanks to Mark Oppenheim <mark.oppenheim@mnetics.co.uk> for fixes to open/close callbacks and repeated open/close/delete operations

CHANGES.md

@@ -12,9 +12,13 @@
 ### cordova-sqlite-storage 3.2.0-OS
 - Added support for multiple connections to the same database (enable some concurrency)
 
+#### cordova-sqlite-storage 6.1.0
+
+- SQLite 3.40.0 update from cordova-sqlite-storage-dependencies@4.1.0
+
 #### cordova-sqlite-storage 6.0.0
 
-- use cordova-sqlite-storage-dependencies@4.0.0 with Android JARs built from android-sqlite-native-ndk-connector and android-sqlite-ndk-native-driver, with enhancements by Luis Silva of OutSystems needed for some Android 11 devices
+- use cordova-sqlite-storage-dependencies@4.0.0 with Android JARs built from android-sqlite-native-ndk-connector and android-sqlite-ndk-native-driver, with enhancements by Luis Silva of OutSystems needed for some Android 11 devices, drops support for Android pre-5.1
 
 ### cordova-sqlite-storage-commoncore 2.0.0
 

README.md

@@ -15,6 +15,9 @@ Native SQLite component with API based on HTML5/[Web SQL (DRAFT) API](http://www
 - browser
 - Android
 - iOS
+
+and *deprecated* desktop platforms:
+
 - macOS ("osx" platform)
 - Windows 10 (UWP) DESKTOP ~~and MOBILE~~ (see below for major limitations)
 
@@ -51,7 +54,6 @@ in an upcoming major release - see [`storesafe/cordova-sqlite-storage#922`](http
 
 some highlights:
 
-- drop support for Android pre-5.1, which will also be dropped by `cordova-android`, including deprecated `armeabi` target (superseded by `armeabi-v7a`, seems to be not supported by Android 5.0) - more info in [`storesafe/cordova-sqlite-storage#922`](https://github.com/storesafe/cordova-sqlite-storage/issues/922)
 - error `code` will always be `0` (which is already the case on browser and Windows); actual SQLite3 error code will be part of the error `message` member whenever possible (see [`storesafe/cordova-sqlite-storage#821`](https://github.com/storesafe/cordova-sqlite-storage/issues/821))
 - drop support for location: 0-2 values in openDatabase call (please use `location: 'default'` or `iosDatabaseLocation` setting in openDatabase as documented below)
 - throw an exception in case of `androidDatabaseImplementation: 2` setting which is now superseded by `androidDatabaseProvider: 'system'` setting
@@ -211,7 +213,7 @@ See the [**Sample**](#sample) section below for a sample with a more detailed ex
 - A recent version of the Cordova CLI is recommended.
 - This plugin version uses a `before_plugin_install` hook to install sqlite3 library dependencies from [`cordova-sqlite-storage-dependencies`](https://www.npmjs.com/package/cordova-sqlite-storage-dependencies) via npm.
 - Use of other systems such as Cordova Plugman, PhoneGap CLI, PhoneGap Build, and Intel XDK is no longer supported by this plugin version since they do not honor the `before_plugin_install` hook. The supported solution is to use [`storesafe/cordova-sqlite-evcore-extbuild-free`](https://github.com/storesafe/cordova-sqlite-evcore-extbuild-free) (GPL v3 or commercial license terms); deprecated alternative with permissive license terms is available at: [`brodybits/cordova-sqlite-legacy-build-support`](https://github.com/brodybits/cordova-sqlite-legacy-build-support) (very limited testing, very limited updates).
-- SQLite `3.32.3` included when building (all platforms), with the following compile-time definitions:
+- SQLite `3.40.0` included when building (all platforms), with the following compile-time definitions:
   - `SQLITE_THREADSAFE=1` (`SQLITE_THREADSAFE=0` for sql.js on browser platform)
   - `SQLITE_DEFAULT_SYNCHRONOUS=3` (EXTRA DURABLE build setting) ref: [`storesafe/cordova-sqlite-storage#736`](https://github.com/storesafe/cordova-sqlite-storage/issues/736) (except for sql.js on browser platform)
   - `SQLITE_DEFAULT_MEMSTATUS=0` (except for sql.js on browser platform)
@@ -235,7 +237,7 @@ See the [**Sample**](#sample) section below for a sample with a more detailed ex
   - <https://www.sqlite.org/releaselog/3_26_0.html>
 - The iOS database location is now mandatory, as documented below.
 - This version branch supports the use of two (2) possible Android sqlite database implementations:
-  - default: lightweight [`android-sqlite-native-ndk-connector`](https://github.com/brodybits/android-sqlite-native-ndk-connector), using SQLite3 NDK component built from [`android-sqlite-ndk-native-driver`](https://github.com/brodybits/android-sqlite-ndk-native-driver)
+  - default: lightweight [`android-sqlite-native-ndk-connector`](https://github.com/brodybits/android-sqlite-native-ndk-connector), using SQLite3 NDK component built from [`github:brodybits/android-sqlite-ndk-native-driver` - `sqlite-storage-ndk-native-driver` branch](https://github.com/brodybits/android-sqlite-ndk-native-driver/tree/sqlite-storage-ndk-native-driver) and [`brodybits/android-sqlite-native-ndk-connector`](https://github.com/brodybits/android-sqlite-native-ndk-connector)
   - optional: Android system database implementation, using the `androidDatabaseProvider: 'system'` setting in `sqlitePlugin.openDatabase()` call as described in the [**Android database provider**](#android-database-provider) section below.
 - Support for WP8 along with Windows 8.1/Windows Phone 8.1/Windows 10 using Visual Studio 2015 is available in: [`brodybits/cordova-sqlite-legacy-build-support`](https://github.com/brodybits/cordova-sqlite-legacy-build-support)
 - The following features are available in [`brodybits/cordova-sqlite-ext`](https://github.com/brodybits/cordova-sqlite-ext):
@@ -262,13 +264,15 @@ See the [**Sample**](#sample) section below for a sample with a more detailed ex
   - Truncation issue with UNICODE `\u0000` character (same as `\0`)
   - INCONSISTENT error code (0) and INCORRECT error message (missing actual error info) in error callbacks ref: [`storesafe/cordova-sqlite-storage#539`](https://github.com/storesafe/cordova-sqlite-storage/issues/539)
   - Not possible to SELECT BLOB column values directly. It is recommended to use built-in HEX function to retrieve BLOB column values, which should work consistently across all platform implementations as well as (WebKit) Web SQL. Non-standard BASE64 function to SELECT BLOB column values in Base64 format is supported by [`brodybits/cordova-sqlite-ext`](https://github.com/brodybits/cordova-sqlite-ext) (permissive license terms) and [`storesafe/cordova-sqlite-evcore-extbuild-free`](https://github.com/storesafe/cordova-sqlite-evcore-extbuild-free) (GPL v3 or commercial license terms).
+  - now deprecated ref: <https://github.com/apache/cordova-docs/pull/1118>; <https://lists.apache.org/thread/lqq2xoy3pjqcyl052gv0qom2f31zgg8k>
   - Windows platform version uses `UTF-16le` internal database encoding while the other platform versions use `UTF-8` internal encoding. (`UTF-8` internal encoding is preferred ref: [`storesafe/cordova-sqlite-storage#652`](https://github.com/storesafe/cordova-sqlite-storage/issues/652))
   - Known issue with database names that contain certain US-ASCII punctuation and control characters (see below)
-- The **macOS** platform version (**"osx" platform**) is not tested in a release build and should be considered pre-alpha with known issues:
+- The **macOS** platform version (**"osx" platform**) is supported with the following known limitations and issues:
+  - now deprecated ref: <https://github.com/apache/cordova-docs/pull/1117>; <https://lists.apache.org/thread/lqq2xoy3pjqcyl052gv0qom2f31zgg8k>
   - `cordova prepare osx` is needed before building and running from Xcode
-  - known issue between `cordova-osx` and Cordova CLI `10.0.0`: <https://github.com/apache/cordova-osx/issues/106>
-- Android platform versions supported: minimum: 4.0 (deprecated), recommended minimum: 5.1, see also: ref: <https://cordova.apache.org/docs/en/latest/guide/platforms/android/>
-- iOS platform versions supported: minimum 9.0 (see <https://cordova.apache.org/docs/en/latest/guide/platforms/ios/index.html>); see also [**deviations section**](#deviations) below for differences between WKWebView (cordova-ios 6.0(+)) and UIWebView (cordova-ios pre-6.0)
+  - known issue between `cordova-osx` and Cordova CLI 10.0.0(+): <https://github.com/apache/cordova-osx/issues/106>
+- Android platform versions supported: minimum: 5.1; see also: <https://cordova.apache.org/docs/en/latest/guide/platforms/android/>
+- iOS platform versions supported: see <https://cordova.apache.org/docs/en/latest/guide/platforms/ios/index.html>; see also [**deviations section**](#deviations) below for differences between WKWebView (cordova-ios 6.0(+)) and UIWebView (cordova-ios pre-6.0)
 - FTS3, FTS4, and R-Tree features are tested and supported on all target platforms in this plugin version branch.
 - Default `PRAGMA journal_mode` setting (*tested*):
   - Android use of the `androidDatabaseProvider: 'system'` setting: `persist` (pre-8.0) / `truncate` (Android 8.0, 8.1, 10(+)) / `wal` (Android 9.0 Pie)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-sqlite-storage",
-  "version": "6.0.0+1.0.0",
+  "version": "6.1.0+1.0.0",
   "description": "Native interface to SQLite for PhoneGap / Cordova - cordova-sqlite-storage plugin version",
   "cordova": {
     "id": "cordova-sqlite-storage",
@@ -32,16 +32,17 @@
   },
   "homepage": "https://github.com/xpbrew/cordova-sqlite-storage",
   "dependencies": {
-    "cordova-sqlite-storage-dependencies": "4.0.0"
+    "cordova-sqlite-storage-dependencies": "4.1.0"
   },
   "scripts": {
-    "clean-spec": "rm -rf spec/[mnp]* && git cl spec/config.xml spec/package.json && git status --ignored",
+    "clean-spec": "rimraf spec/[mnp]* && git checkout -- spec/config.xml spec/package.json && git status --ignored",
     "prepare-js": "coffee -p SQLitePlugin.coffee.md > www/SQLitePlugin.js",
     "prepare-spec": "node scripts/prepareSpec.js"
   },
   "devDependencies": {
     "coffeescript": "1",
     "cross-spawn": "^6.0.5",
-    "fs-extra": "^8.1.0"
+    "fs-extra": "^8.1.0",
+    "rimraf": "^3.0.2"
   }
 }

plugin.xml

@@ -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-storage"
-    version="6.0.0+1.0.0">
+    version="6.1.0+1.0.0">
 
     <name>Cordova SQLite storage plugin - cordova-sqlite-storage plugin version</name>
 

spec/www/index.html

@@ -32,11 +32,11 @@
   <script src="spec/db-simultaneous-tx-access-test.js"></script>
   <script src="spec/db-tx-multiple-update-test.js"></script>
   <script src="spec/tx-semantics-test.js"></script>
+  <script src="spec/db-tx-value-bindings-test.js"></script> <!-- stored [INSERT] value binding tests -->
   <script src="spec/db-tx-error-handling-test.js"></script>
-  <script src="spec/db-tx-value-bindings-test.js"></script>
   <script src="spec/db-tx-error-mapping-test.js"></script>
-  <script src="spec/db-open-close-delete-test.js"></script>
-  <script src="spec/ext-tx-blob-test.js"></script>
+  <script src="spec/ext-tx-blob-test.js"></script> <!-- Blob object value test(s) -->
+  <script src="spec/db-open-close-delete-test.js"></script> <!-- extended db open/close/delete testing -->
 
 </head>
 

spec/www/spec/browser-check-startup.js

@@ -15,7 +15,7 @@ var isAppleMobileOS = /iPhone/.test(navigator.userAgent) ||
 var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;
 
 window.hasBrowser = true;
-window.hasWebKitWebSQL = isAndroid || (isAppleMobileOS && !hasMobileWKWebView) || isChromeBrowser;
+window.hasWebKitWebSQL = isAndroid || isChromeBrowser;
 
 describe('Check startup for navigator.userAgent: ' + navigator.userAgent, function() {
   it('receives deviceready event', function(done) {

spec/www/spec/db-sql-operations-test.js

@@ -1545,6 +1545,9 @@ var mytests = function() {
               var resultRow3 = resultSet.rows.item(2);
               expect(resultRow3).toBeDefined();
               expect(resultRow3.name).toBe('data_num');
+
+              // (in case this transaction runs last)
+              if (checkCount === expectedCheckCount) done();
             });
           });