cordova-sqlite-evmax-build-free 0.0.12 → 0.1.0

package/CHANGES.md

@@ -1,5 +1,16 @@
 # Changes
 
+# cordova-sqlite-evmax-build-free 0.1.0
+
+## cordova-sqlite-evmax-feat-android-db-location 0.0.3-dev
+
+## cordova-sqlite-evmax-common-free 0.0.8-dev
+
+- more robust handling of large results on Android - replace PluginResult.setKeepCallback() usage to avoid potential stability issue described in:
+- https://github.com/storesafe/cordova-plugin-sqlite-evplus-ext-common-free/issues/14
+
+NOTE: While this may introduce a little more overhead, this overhead is expected to be very minor relative to the cost of handling large results between the C, Java, and JavaScript code.
+
 # cordova-sqlite-evmax-build-free 0.0.12
 
 - update SQLite -> 3.51.2

package/SQLitePlugin.coffee.md

@@ -721,10 +721,16 @@
         cb1 = (result) ->
           if result[0] is 'multi'
             ch1 = true
+            # trigger next callback from Java side
+            # (using "fjnext:..." rather than "fj:..." for the sake of clarity)
+            cordova.exec cb1, null, "SQLitePlugin", "fjnext:0;extra", [mydbid, 0]
           else if result[0] isnt null
             resultSet = resultSet.concat result.slice(0, result.length-1)
             if !ch1
               cb1 [null]
+            if ch1
+              # trigger next callback from Java side (see comment above regarding "fjnext:")
+              cordova.exec cb1, null, "SQLitePlugin", "fjnext:0;extra", [mydbid, 0]
           else # if result[0] is null
             if (index + 1 == batchExecutesLength)
               cb resultSet

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-sqlite-evmax-build-free",
-  "version": "0.0.12",
+  "version": "0.1.0",
   "description": "Cordova/PhoneGap sqlite storage - free evmax enterprise version with premium stability and performance improvements including workaround for super-large INSERT transactions & SELECT results on Android (version with external sqlite3 dependencies)",
   "cordova": {
     "id": "cordova-sqlite-evmax-build-free",

package/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-evmax-build-free"
-    version="0.0.12">
+    version="0.1.0">
 
     <name>Cordova sqlite storage - free evmax common version branch with premium stability performance improvements including workaround for super-large INSERT transactions and SELECT results on Android (with external sqlite3 dependencies)</name>
 

package/src/android/io/sqlc/SQLitePlugin.java

@@ -61,7 +61,7 @@ public class SQLitePlugin extends CordovaPlugin {
 
     @Override
     public boolean execute(String actionAsString, String argsAsString, CallbackContext cbc) {
-        if (actionAsString.startsWith("fj")) {
+        if (actionAsString.startsWith("fj")) { // matches both fj: & fjnext: actions
             int sep1pos = actionAsString.indexOf(':');
             int sep2pos = actionAsString.indexOf(';');
 
@@ -514,10 +514,11 @@ public class SQLitePlugin extends CordovaPlugin {
                         final String jr1 = EVNDKDriver.sqlc_evplus_qc_execute(qc, dbq.fj);
                         final boolean multi = jr1.charAt(2) == 'm';
                         final PluginResult pr1 = new MyPluginResult(jr1);
+                        dbq.cbc.sendPluginResult(pr1);
                         if (multi) {
-                            pr1.setKeepCallback(true);
+                            // wait for fjnext: action from JavaScript
+                            dbq = q.take();
                         }
-                        dbq.cbc.sendPluginResult(pr1);
 
                         boolean more = multi;
 
@@ -525,10 +526,11 @@ public class SQLitePlugin extends CordovaPlugin {
                             final String jr2 = EVNDKDriver.sqlc_evplus_qc_execute(qc, "");
                             more = jr2.charAt(1) != 'n';
                             final PluginResult pr2 = new MyPluginResult(jr2);
+                            dbq.cbc.sendPluginResult(pr2);
                             if (more) {
-                                pr2.setKeepCallback(true);
+                                // wait for fjnext: action from JavaScript
+                                dbq = q.take();
                             }
-                            dbq.cbc.sendPluginResult(pr2);
                         }
 
                         // cleanup:

package/www/SQLitePlugin.js

@@ -631,11 +631,15 @@ Contact for commercial license: sales@litehelpers.net
       cb1 = function(result) {
         if (result[0] === 'multi') {
           ch1 = true;
+          cordova.exec(cb1, null, "SQLitePlugin", "fjnext:0;extra", [mydbid, 0]);
         } else if (result[0] !== null) {
           resultSet = resultSet.concat(result.slice(0, result.length - 1));
           if (!ch1) {
             cb1([null]);
           }
+          if (ch1) {
+            cordova.exec(cb1, null, "SQLitePlugin", "fjnext:0;extra", [mydbid, 0]);
+          }
         } else {
           if (index + 1 === batchExecutesLength) {
             cb(resultSet);