Merge tag '6.0.0' into feat/RNMT-5880/update-sqlite

Author: EiyuuZack

AUTHORS.md

@@ -8,6 +8,10 @@
 - API changes by @brodybits (Chris Brody)
 - Transaction timing fixes to support PouchDB by @nolanlawson
 
+## browser platform
+
+- Using sql-asm-memory-growth.js built from sql.js by @kripken (Alon Zakai)
+
 ## Android version
 
 - Extracted from DroidGap by @brodybits (Chris Brody)

CHANGES.md

@@ -12,6 +12,57 @@
 ### cordova-sqlite-storage 3.2.0-OS
 - Added support for multiple connections to the same database (enable some concurrency)
 
+#### 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
+
+### cordova-sqlite-storage-commoncore 2.0.0
+
+- refactor: clean up imports for Android
+- Fix plugin param name for macOS ("osx") - *tested* with Cordova 9 and cordova-osx@5
+- Drop support for Windows on ARM (Windows Mobile)
+
+#### cordova-sqlite-storage 5.1.0
+
+- Add browser platform support using sql-asm-memory-growth.js from sql.js, with some limitations as documented
+
+#### cordova-sqlite-storage 5.0.1
+
+- enable RENAME table with view test - from December 2019 SQLite crash report, fixed in 2020 ref:
+  - http://sqlite.1065341.n5.nabble.com/Crash-Bug-Report-tc109903.html
+  - https://github.com/xpbrew/cordova-sqlite-storage/issues/904
+- SQLite 3.32.3 update from cordova-sqlite-storage-dependencies@2.1.2
+
+#### cordova-sqlite-storage 5.0.0
+
+- avoid incorrect default directory on iOS/macOS - to be extra safe (see <https://github.com/xpbrew/cordova-sqlite-storage/issues/907>)
+  - ensure that default "nosync" directory *always* has resource value set for `NSURLIsExcludedFromBackupKey`
+  - add more checks for missing database directory
+
+#### cordova-sqlite-storage 4.0.0
+
+- rename PSPDFThreadSafeMutableDictionary to CustomPSPDFThreadSafeMutableDictionary and completely remove PSPDFThreadSafeMutableDictionary.h
+
+#### cordova-sqlite-storage 3.4.1
+
+- SQLite 3.30.1 update from cordova-sqlite-storage-dependencies@2.1.1
+
+#### cordova-sqlite-storage 3.4.0
+
+- quick workaround for `SYNTAX_ERR` redefinition
+
+#### cordova-sqlite-storage 3.3.0
+
+- new default page & cache sizes with cordova-sqlite-storage-dependencies@2.1.0
+
+##### cordova-sqlite-storage-commoncore 1.0.0
+
+- additional EU string manipulation test cases
+
+#### cordova-sqlite-storage 3.2.1
+
+- cordova-sqlite-storage-dependencies@2.0.1 with SQLite 3.28.0 update for all supported platforms Android/iOS/macOS/Windows
+
 #### cordova-sqlite-storage 3.2.0
 
 - sqlite3_threadsafe() error handling on iOS/macOS

LICENSE.md

@@ -4,19 +4,35 @@
 
 MIT or Apache 2.0
 
-## Android version
+## for browser platform
 
 MIT or Apache 2.0
 
-## iOS/macOS version
+### sql.js
+
+MIT
+
+## for Android
+
+MIT or Apache 2.0
+
+### android-sqlite-native-ndk-connector
+
+Unlicense (public domain)
+
+### android-sqlite-ndk-native-driver
+
+Unlicense (public domain)
+
+## for iOS & macOS
 
 MIT only
 
 based on Phonegap-SQLitePlugin by @davibe (Davide Bertola <dade@dadeb.it>) and @joenoon (Joe Noon <joenoon@gmail.com>)
 
 includes and uses PSPDFThreadSafeMutableDictionary (PSPDFThreadSafeMutableDictionary.m <https://gist.github.com/steipete/5928916>) MIT license by @steipete (<https://gist.github.com/steipete>)
 
-## Windows version
+## for Windows
 
 MIT or Apache 2.0
 
@@ -26,6 +42,8 @@ by @doo (doo GmbH)
 
 MIT License
 
-## SQLite3
+## Common native code
+
+### SQLite3
 
 Public domain

README.md

@@ -1,11 +1,12 @@
 {
   "name": "cordova-sqlite-storage",
-  "version": "3.2.0-OS3",
-  "description": "Native interface to SQLite for PhoneGap/Cordova - cordova-sqlite-storage plugin version",
+  "version": "6.0.0",
+  "description": "Native interface to SQLite for PhoneGap / Cordova - cordova-sqlite-storage plugin version",
   "cordova": {
     "id": "cordova-sqlite-storage",
     "platforms": [
       "android",
+      "browser",
       "ios",
       "osx",
       "windows"
@@ -19,6 +20,7 @@
     "sqlite",
     "ecosystem:cordova",
     "cordova-android",
+    "cordova-browser",
     "cordova-ios",
     "cordova-osx",
     "cordova-windows"
@@ -30,16 +32,16 @@
   },
   "homepage": "https://github.com/xpbrew/cordova-sqlite-storage",
   "dependencies": {
-    "cordova-sqlite-storage-dependencies": "https://github.com/OutSystems/cordova-sqlite-storage-dependencies#2.0.0-OS1"
+    "cordova-sqlite-storage-dependencies": "4.0.0"
   },
   "scripts": {
-    "clean-spec": "rm -rf spec/[mnp]* && git cl spec/config.xml && git st",
+    "clean-spec": "rm -rf spec/[mnp]* && git cl 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": "^7.0.1"
+    "fs-extra": "^8.1.0"
   }
 }

package.json

@@ -2,9 +2,9 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-sqlite-storage"
-    version="3.2.0-OS3">
+    version="6.0.0">
 
-    <name>Cordova sqlite storage plugin - cordova-sqlite-storage plugin version</name>
+    <name>Cordova SQLite storage plugin - cordova-sqlite-storage plugin version</name>
 
     <license>MIT</license>
 
@@ -20,6 +20,17 @@
         <clobbers target="SQLitePlugin" />
     </js-module>
 
+    <platform name="browser">
+        <!-- sql-asm js item must come before SQLiteProxy for SQLiteProxy.js to work on browser -->
+        <js-module src="node_modules/cordova-sqlite-storage-dependencies/sql-asm-memory-growth.js" name="sql">
+          <runs />
+        </js-module>
+
+        <js-module src="src/browser/SQLiteProxy.js" name="SQLiteProxy">
+          <runs />
+        </js-module>
+    </platform>
+
     <!-- android -->
     <platform name="android">
         <!-- Cordova >= 3.0.0 -->
@@ -33,10 +44,8 @@
         <source-file src="src/android/io/sqlc/SQLiteAndroidDatabase.java" target-dir="src/io/sqlc"/>
         <source-file src="src/android/io/sqlc/SQLiteConnectorDatabase.java" target-dir="src/io/sqlc"/>
 
-        <!-- Android-sqlite-connector [jar]: -->
-        <lib-file src="node_modules/cordova-sqlite-storage-dependencies/libs/sqlite-connector.jar" />
-        <!-- Android-sqlite-connector native driver [native libs in jar]: -->
-        <lib-file src="node_modules/cordova-sqlite-storage-dependencies/libs/sqlite-native-driver.jar" />
+        <lib-file src="node_modules/cordova-sqlite-storage-dependencies/libs/sqlite-native-ndk-connector.jar" />
+        <lib-file src="node_modules/cordova-sqlite-storage-dependencies/libs/sqlite-ndk-native-driver.jar" />
     </platform>
 
     <!-- iOS -->
@@ -51,34 +60,32 @@
         <header-file src="src/ios/SQLitePlugin.h" />
         <source-file src="src/ios/SQLitePlugin.m" />
 
-        <header-file src="src/ios/PSPDFThreadSafeMutableDictionary.h" />
-        <source-file src="src/ios/PSPDFThreadSafeMutableDictionary.m"
+        <source-file src="src/ios/CustomPSPDFThreadSafeMutableDictionary.m"
                 compiler-flags="-w" />
 
         <header-file src="node_modules/cordova-sqlite-storage-dependencies/sqlite3.h" />
         <source-file src="node_modules/cordova-sqlite-storage-dependencies/sqlite3.c"
-                     compiler-flags="-w -DSQLITE_THREADSAFE=1 -DSQLITE_DEFAULT_SYNCHRONOUS=3 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_TEMP_STORE=2 -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE -DSQLITE_DEFAULT_PAGE_SIZE=1024" />
+                     compiler-flags="-w -DSQLITE_THREADSAFE=1 -DSQLITE_DEFAULT_SYNCHRONOUS=3 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_TEMP_STORE=2 -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE -DSQLITE_DEFAULT_PAGE_SIZE=4096" />
     </platform>
 
     <!-- macOS (osx) -->
     <platform name="osx">
         <config-file target="config.xml" parent="/*">
             <feature name="SQLitePlugin">
-                <param name="ios-package" value="SQLitePlugin" />
+                <param name="osx-package" value="SQLitePlugin" />
             </feature>
         </config-file>
 
         <!-- Note: the macOS (osx) src is based off src/ios implicitly -->
         <header-file src="src/ios/SQLitePlugin.h" />
         <source-file src="src/ios/SQLitePlugin.m" />
 
-        <header-file src="src/ios/PSPDFThreadSafeMutableDictionary.h" />
-        <source-file src="src/ios/PSPDFThreadSafeMutableDictionary.m"
+        <source-file src="src/ios/CustomPSPDFThreadSafeMutableDictionary.m"
                 compiler-flags="-w" />
 
         <header-file src="node_modules/cordova-sqlite-storage-dependencies/sqlite3.h" />
         <source-file src="node_modules/cordova-sqlite-storage-dependencies/sqlite3.c"
-                     compiler-flags="-w -DSQLITE_THREADSAFE=1 -DSQLITE_DEFAULT_SYNCHRONOUS=3 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_TEMP_STORE=2 -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE -DSQLITE_DEFAULT_PAGE_SIZE=1024" />
+                     compiler-flags="-w -DSQLITE_THREADSAFE=1 -DSQLITE_DEFAULT_SYNCHRONOUS=3 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_TEMP_STORE=2 -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE -DSQLITE_DEFAULT_PAGE_SIZE=4096" />
     </platform>
 
     <!-- windows -->

plugin.xml

@@ -0,0 +1,4 @@
+{
+  "name": "cordova-sqlite-spec",
+  "cordova": {}
+}

spec/package.json

@@ -37,8 +37,6 @@ var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;
 var mytests = function() {
 
   for (var i=0; i<scenarioCount; ++i) {
-    // TBD skip plugin test on browser platform (not yet supported):
-    if (isBrowser && (i === 0)) continue;
 
     describe(scenarioList[i] + ': BASIC db tx sql storage results test(s)', function() {
       var scenarioName = scenarioList[i];
@@ -1024,6 +1022,8 @@ var mytests = function() {
         }, MYTIMEOUT);
 
         it(suiteName + 'ALTER TABLE RENAME test', function(done) {
+          if (isWebSql && isAppleMobileOS) pending('TBD SKIP for (WebKit) Web SQL on iOS');
+
           var dbname = 'ALTER-TABLE-RENAME-test.db';
           var createdb = openDatabase(dbname, '1.0', 'Test', DEFAULT_SIZE);
 
@@ -1079,6 +1079,45 @@ var mytests = function() {
           }
         }, MYTIMEOUT);
 
+        // From December 2019 SQLite crash report - fixed in 2020 ref:
+        // - http://sqlite.1065341.n5.nabble.com/Crash-Bug-Report-tc109903.html
+        // - https://github.com/xpbrew/cordova-sqlite-storage/issues/904
+        it(suiteName + 'RENAME table with view test [SQLite crash bug report December 2019]', function(done) {
+          if (isWebSql) pending('[TBD] NOT WORKING on (WebKit) Web SQL');
+          if (!isWebSql && isAndroid && isImpl2) pending('[TBD] NOT WORKING on Android system android.database provider');
+
+          var dbname = 'RENAME-table-with-view-test.db';
+          var db = openDatabase(dbname);
+
+          db.transaction(function(tx) {
+            tx.executeSql('DROP TABLE IF EXISTS v0;');
+            tx.executeSql('DROP TABLE IF EXISTS v2;');
+            tx.executeSql('DROP TABLE IF EXISTS t3;');
+            tx.executeSql('DROP VIEW IF EXISTS v4;');
+            tx.executeSql('DROP TRIGGER IF EXISTS x;');
+            tx.executeSql('CREATE TABLE v0 ( v1 ) ;');
+            tx.executeSql('CREATE TABLE v2 ( v3 ) ;');
+            tx.executeSql('CREATE VIEW v4 AS WITH x AS ( SELECT x () OVER( ) FROM v4 ) SELECT v3 AS x FROM v2 ;');
+            tx.executeSql('ALTER TABLE v2 RENAME TO t3;');
+            tx.executeSql('SELECT COUNT(x) AS cnt FROM v4;', null, function(tx, rs) {
+              expect(rs).toBeDefined();
+              expect(rs.rows.length).toBe(1);
+              expect(rs.rows.item(0).cnt).toBe(0);
+
+              // Close (plugin only) & finish:
+              (isWebSql) ? done() : db.close(done, done);
+            });
+          }, function(e) {
+            // ERROR RESULT (NOT EXPECTED):
+            expect(false).toBe(true);
+            expect(e).toBeDefined();
+            expect(e.message).toBe('--');
+
+            // Close (plugin only) & finish:
+            (isWebSql) ? done() : db.close(done, done);
+          });
+        }, MYTIMEOUT);
+
       });
 
     });

spec/www/spec/basic-db-tx-sql-storage-results.js

@@ -8,13 +8,14 @@ var isFirefox = /Firefox/.test(navigator.userAgent);
 var isWebKitBrowser = !isWindows && !isAndroid && /Safari/.test(navigator.userAgent);
 var isBrowser = isWebKitBrowser || isFirefox;
 var isEdgeBrowser = isBrowser && (/Edge/.test(navigator.userAgent));
+var isChromeBrowser = isBrowser && !isEdgeBrowser && (/Chrome/.test(navigator.userAgent));
 var isMac = !isBrowser && /Macintosh/.test(navigator.userAgent);
 var isAppleMobileOS = /iPhone/.test(navigator.userAgent) ||
       /iPad/.test(navigator.userAgent) || /iPod/.test(navigator.userAgent);
 var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;
 
 window.hasBrowser = true;
-window.hasWebKitWebSQL = isAndroid || (isAppleMobileOS && !hasMobileWKWebView) || (isWebKitBrowser && !isEdgeBrowser);
+window.hasWebKitWebSQL = isAndroid || (isAppleMobileOS && !hasMobileWKWebView) || isChromeBrowser;
 
 describe('Check startup for navigator.userAgent: ' + navigator.userAgent, function() {
   it('receives deviceready event', function(done) {

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

@@ -57,12 +57,13 @@ var pluginScenarioCount = isAndroid ? 2 : 1;
 var mytests = function() {
 
   describe('Open database parameter test(s)', function() {
-    // TBD skip plugin test on browser platform (not yet supported):
-    if (isBrowser) return;
 
     for (var i=0; i<pluginScenarioCount; ++i) {
 
       describe(pluginScenarioList[i] + ': open database file name test(s)', function() {
+        // TBD SKIP open database file name test(s) on browser platform for now:
+        if (isBrowser) return;
+
         var scenarioName = pluginScenarioList[i];
         var suiteName = scenarioName + ': ';
         var isImpl2 = (i === 1);
@@ -962,8 +963,6 @@ var mytests = function() {
 
 
   describe('Plugin - basic sqlitePlugin.deleteDatabase parameter check test(s)', function() {
-    // TBD skip plugin test on browser platform (not yet supported):
-    if (isBrowser) return;
 
     if (true) {
 
@@ -1201,8 +1200,6 @@ var mytests = function() {
   });
 
   describe('Plugin: db open-close-delete operation behavior test(s)', function() {
-    // TBD skip plugin test on browser platform (not yet supported):
-    if (isBrowser) return;
 
     for (var i=0; i<pluginScenarioCount; ++i) {
 
@@ -1449,6 +1446,7 @@ var mytests = function() {
         }, MYTIMEOUT);
 
         test_it(suiteName + ' database.close (immediately after open) calls its success callback', function () {
+          if (isBrowser) pending('TBD SKIP on browser');
           // TBD POSSIBLY BROKEN on iOS/macOS due to current background processing implementation:
           if (isAppleMobileOS || isMac) pending('TBD POSSIBLY BROKEN on iOS/macOS (background processing implementation)');
 
@@ -1786,6 +1784,7 @@ var mytests = function() {
         // XXX SEE BELOW: repeat scenario but wait for open callback before close/delete/reopen
         // (Was needed to test support for an enterprise application)
         test_it(suiteName + ' immediate close, then delete then re-open allows subsequent queries to run', function () {
+          if (isBrowser) pending('TBD SKIP on browser');
           if (isAppleMobileOS || isMac) pending('CURRENTLY BROKEN on iOS/macOS (background processing implementation)');
 
           var dbName = "Immediate-close-delete-Reopen.db";
@@ -1932,6 +1931,7 @@ var mytests = function() {
         });
 
         test_it(suiteName + ' repeatedly open and close database faster (5x)', function () {
+          if (isBrowser) pending('TBD SKIP on browser');
           // TBD CURRENTLY BROKEN on iOS/macOS due to current background processing implementation:
           if (isAppleMobileOS || isMac) pending('CURRENTLY BROKEN on iOS/macOS (background processing implementation)');
           // TBD ???: