Merge pull request #1 from brodybits/json1-build

JSON1 build

Author: Chris Brody

.gitignore

@@ -6,3 +6,4 @@ node_modules
 spec/myplugin
 spec/plugins
 spec/platforms
+spec/www/index.js

CHANGES.md

@@ -1,5 +1,33 @@
 # Changes
 
+# sqlite-evcustom-browser-memory-storage-ext-free 0.0.3-dev
+
+- sql-memory-growth.js with FTS5, R-Tree, and JSON1 enabled from the following custom sql.js branch: <https://github.com/brodybits/sql.js/tree/sqlite-3.26.0-json1>
+
+# sqlite-evcustom-browser-memory-storage-ext-free 0.0.2-dev
+
+# cordova-sqlite-evplus-ext-free 0.3.7
+
+## cordova-sqlite-evcore-extbuild-free 0.9.10
+
+_Not enabled in this project:_
+
+- Include SQLite 3.26.0 update from cordova-sqlite-evcore-free-dependencies 0.8.7
+
+#### cordova-sqlite-storage 2.5.1
+
+_Not enabled in this project:_
+
+- fix internal plugin cleanup error log on Android
+
+#### cordova-sqlite-storage 2.5.0
+
+- androidDatabaseProvider: 'system' setting, to replace androidDatabaseImplementation setting which is now deprecated
+
+### cordova-sqlite-evcore-common-free 0.0.3
+
+- Internal error message fix for evcore on Android
+
 # sqlite-evcustom-browser-memory-storage-ext-free 0.0.1-dev
 
 - New version for browser platform, with use of Cordova __removed__, with SQLite 3.26.0 update from the following branch: <https://github.com/brodybits/sql.js/tree/sqlite-3.26.0-build>
@@ -109,7 +137,7 @@
 
 ## cordova-sqlite-evcore-extbuild-free 0.9.2
 
-### cordova-sqlite-storage 2.2.0
+#### cordova-sqlite-storage 2.2.0
 
 - Fix SQLiteAndroidDatabase implementation for Turkish and other foreign locales
 

README.md

@@ -810,6 +810,18 @@
         if !!openargs.createFromLocation and openargs.createFromLocation == 1
           openargs.createFromResource = "1"
 
+        if !!openargs.androidDatabaseProvider and !!openargs.androidDatabaseImplementation
+          throw newSQLError 'AMBIGUOUS: both androidDatabaseProvider and deprecated androidDatabaseImplementation settings are present in openDatabase call. Please drop androidDatabaseImplementation in favor of androidDatabaseProvider.'
+
+        if openargs.androidDatabaseProvider isnt undefined and
+            openargs.androidDatabaseProvider isnt 'default' and
+            openargs.androidDatabaseProvider isnt 'system'
+          throw newSQLError "Incorrect androidDatabaseProvider value. Valid values are: 'default', 'system'"
+
+        if !!openargs.androidDatabaseProvider and openargs.androidDatabaseProvider is 'system'
+          openargs.androidOldDatabaseImplementation = 1
+
+        # DEPRECATED:
         if !!openargs.androidDatabaseImplementation and openargs.androidDatabaseImplementation == 2
           openargs.androidOldDatabaseImplementation = 1
 

SQLitePlugin.coffee.md

@@ -1,6 +1,6 @@
 {
   "name": "sqlite-evcustom-browser-memory-storage-ext-free",
-  "version": "0.0.1-dev",
+  "version": "0.0.3-dev",
   "description": "SQLite evcustom browser memory storage - emulation of Cordova/PhoneGap sqlite storage plugin on browser - custom enterprise version with premium performance improvements and extra features",
   "main": "index.js",
   "cordova-disabled": {

index.js

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="sqlite-evcustom-browser-memory-storage-ext-free"
-    version="0.0.1-dev">
+    version="0.0.3-dev">
 
     <name>SQLite evcustom browser memory storage - emulation of Cordova/PhoneGap sqlite storage plugin on browser - custom enterprise version with premium performance improvements and extra features</name>
 

package.json

@@ -10,6 +10,8 @@ var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
 // XXX
 var isFirefox = /Firefox/.test(navigator.userAgent);
 var isWebKitBrowser = !isWindows && !isAndroid && /Safari/.test(navigator.userAgent);
+// XXX TBD QUICK FIX ???:
+// var isBrowser = (/Firefox/.test(navigator.userAgent)) || (!isWindows && !isAndroid && /Safari/.test(navigator.userAgent));
 var isBrowser = isWebKitBrowser || isFirefox;
 
 // NOTE: In the common storage-master branch there is no difference between the
@@ -26,6 +28,8 @@ var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
 var mytests = function() {
 
   for (var i=0; i<scenarioCount; ++i) {
+    // XXX QUICK FIX:
+    if (isBrowser) continue;
 
     describe(scenarioList[i] + ': BASE64 encoding test(s)', function() {
       var scenarioName = scenarioList[i];

plugin.xml

@@ -985,8 +985,6 @@ var mytests = function() {
               addColumnTest();
             } else {
               createdb.close(addColumnTest, function(e) {
-                // XXX TBD IGNORE close error on Windows:
-                if (isWindows) return addColumnTest();
                 // ERROR RESULT (NOT EXPECTED):
                 expect(false).toBe(true);
                 expect(e).toBeDefined();
@@ -1045,8 +1043,6 @@ var mytests = function() {
               tableRenameTest();
             } else {
               createdb.close(tableRenameTest, function(e) {
-                // XXX TBD IGNORE close error on Windows:
-                if (isWindows) return tableRenameTest();
                 // ERROR RESULT (NOT EXPECTED):
                 expect(false).toBe(true);
                 expect(e).toBeDefined();

spec/www/spec/base64-encode-test.js

@@ -16,6 +16,7 @@ var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.m
 window.hasBrowser = true;
 
 // XXX TBD ???:
+// window.hasWebKitWebSQL = isAndroid || (isAppleMobileOS && !hasMobileWKWebView) || (isWebKitBrowser && !isEdgeBrowser);
 window.hasWebKitWebSQL = (window.cordova) ?
     isAndroid || (isAppleMobileOS && !isWKWebView) || (isWebKitBrowser && !isEdgeBrowser) : false