cordova-sqlite-evmax-build-free 0.0.7 → 0.0.8

package/CHANGES.md

@@ -1,5 +1,11 @@
 # Changes
 
+# cordova-sqlite-evmax-build-free 0.0.8
+
+## cordova-sqlite-evmax-common-free 0.0.6-dev
+
+- fix workaround for slash characters with Capacitor
+
 # cordova-sqlite-evmax-build-free 0.0.7
 
 ## cordova-sqlite-evmax-common-free 0.0.5-dev

package/SQLitePlugin.coffee.md

@@ -23,6 +23,9 @@
 
     EE_SIZE_LIMIT = 16 * 1024 * 1024
 
+    REPLACE_BANG_REGEXP = /!/g
+    REPLACE_SLASH_REGEXP = /\//g
+
 ## global(s):
 
     # per-db map of locking and queueing
@@ -456,8 +459,7 @@
           t = typeof v
           flatlist.push(
             if v == null || v == undefined then null
-            else if t == 'number' then v
-            else if t == 'string' then v.replace('!', '!!').replace('/', '!|')
+            else if t == 'number' || t == 'string' then v
             else v.toString()
           )
 
@@ -707,7 +709,11 @@
 
         flatlist = [mydbid, flen]
 
-        flatlist = flatlist.concat flatBatchExecutesEntries[index]
+        flatlist = flatlist.concat flatBatchExecutesEntries[index].map (v) ->
+          if typeof v == 'string'
+            v.replace(REPLACE_BANG_REGEXP, '!1').replace(REPLACE_SLASH_REGEXP, '!2')
+          else
+            v
 
         flatlist.push 'extra'
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-sqlite-evmax-build-free",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "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-common-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.7">
+    version="0.0.8">
 
     <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/spec/www/spec/db-tx-sql-select-value-test.js

@@ -1880,11 +1880,11 @@ var mytests = function() {
           var db = openDatabase('SELECT-UPPER-with-slash-ab-bang-cd-TEXT-string-argument.db');
           expect(db).toBeDefined();
           db.transaction(function(tx) {
-            tx.executeSql('SELECT UPPER(?) as myresult', ['/ab!cd'], function(ignored, rs) {
+            tx.executeSql('SELECT UPPER(?) as myresult', ['/ab!cd!!ef!123/456'], function(ignored, rs) {
               expect(rs).toBeDefined();
               expect(rs.rows).toBeDefined();
               expect(rs.rows.length).toBe(1);
-              expect(rs.rows.item(0).myresult).toBe('/AB!CD');
+              expect(rs.rows.item(0).myresult).toBe('/AB!CD!!EF!123/456');
               done();
             });
           }, function(error) {

package/www/SQLitePlugin.js

@@ -4,7 +4,7 @@ Contact for commercial license: sales@litehelpers.net
  */
 
 (function() {
-  var DB_STATE_INIT, DB_STATE_OPEN, EE_SIZE_LIMIT, READ_ONLY_REGEX, SQLiteFactory, SQLitePlugin, SQLitePluginTransaction, SelfTest, argsArray, dblocations, iosLocationMap, newSQLError, nextTick, root, txLocks;
+  var DB_STATE_INIT, DB_STATE_OPEN, EE_SIZE_LIMIT, READ_ONLY_REGEX, REPLACE_BANG_REGEXP, REPLACE_SLASH_REGEXP, SQLiteFactory, SQLitePlugin, SQLitePluginTransaction, SelfTest, argsArray, dblocations, iosLocationMap, newSQLError, nextTick, root, txLocks;
 
   root = this;
 
@@ -16,6 +16,10 @@ Contact for commercial license: sales@litehelpers.net
 
   EE_SIZE_LIMIT = 16 * 1024 * 1024;
 
+  REPLACE_BANG_REGEXP = /!/g;
+
+  REPLACE_SLASH_REGEXP = /\//g;
+
   txLocks = {};
 
   newSQLError = function(error, code) {
@@ -390,7 +394,7 @@ Contact for commercial license: sales@litehelpers.net
       for (l = 0, len1 = values.length; l < len1; l++) {
         v = values[l];
         t = typeof v;
-        flatlist.push(v === null || v === void 0 ? null : t === 'number' ? v : t === 'string' ? v.replace('!', '!!').replace('/', '!|') : v.toString());
+        flatlist.push(v === null || v === void 0 ? null : t === 'number' || t === 'string' ? v : v.toString());
       }
     } else {
       flatlist.push(0);
@@ -615,7 +619,13 @@ Contact for commercial license: sales@litehelpers.net
       var cb1, ch1, flatlist, flen;
       flen = flatBatchExecutesEntries[index].flen;
       flatlist = [mydbid, flen];
-      flatlist = flatlist.concat(flatBatchExecutesEntries[index]);
+      flatlist = flatlist.concat(flatBatchExecutesEntries[index].map(function(v) {
+        if (typeof v === 'string') {
+          return v.replace(REPLACE_BANG_REGEXP, '!1').replace(REPLACE_SLASH_REGEXP, '!2');
+        } else {
+          return v;
+        }
+      }));
       flatlist.push('extra');
       ch1 = false;
       cb1 = function(result) {