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

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/spec/www/spec/sqlite-version-test.js

@@ -104,7 +104,7 @@ var mytests = function() {
               expect(rs).toBeDefined();
               expect(rs.rows).toBeDefined();
               expect(rs.rows.length).toBe(1);
-              expect(rs.rows.item(0).myResult).toBe('3.40.0');
+              expect(rs.rows.item(0).myResult).toBe('3.43.1');
 
               // Close (plugin only) & finish:
               (isWebSql) ? done() : db.close(done, done);

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

@@ -12,6 +12,9 @@ import java.io.File;
 
 import java.lang.IllegalArgumentException;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+
 import java.util.Map;
 
 import java.util.concurrent.BlockingQueue;
@@ -155,8 +158,11 @@ public class SQLitePlugin extends CordovaPlugin {
             case delete:
                 o = args.getJSONObject(0);
                 dbname = o.getString("path");
+                String dblocation = null;
+                if (o.has("androidDatabaseLocation"))
+                    dblocation = o.getString("androidDatabaseLocation");
 
-                deleteDatabase(dbname, cbc);
+                deleteDatabase(dbname, dblocation, cbc);
 
                 break;
 
@@ -239,22 +245,37 @@ public class SQLitePlugin extends CordovaPlugin {
             this.cordova.getThreadPool().execute(r);
         }
     }
+
     /**
-     * Open a database.
+     * Get a database file.
      *
      * @param dbName   The name of the database file
      */
-    private SQLiteNativeDatabase openDatabase(String dbname, boolean ignored, CallbackContext cbc, boolean old_impl, int dbid) throws Exception {
-        try {
-            // ASSUMPTION: no db (connection/handle) is already stored in the map
-            // [should be true according to the code in DBRunner.run()]
-
+    private File getDatabaseFile(String dbname, String dblocation) throws URISyntaxException {
+        if (dblocation == null) {
             File dbfile = this.cordova.getActivity().getDatabasePath(dbname);
 
             if (!dbfile.exists()) {
                 dbfile.getParentFile().mkdirs();
             }
 
+            return dbfile;
+        }
+
+        return new File(new File(new URI(dblocation)), dbname);
+    }
+
+    /**
+     * Open a database.
+     *
+     * @param dbName   The name of the database file
+     */
+    private SQLiteNativeDatabase openDatabase(String dbname, String dblocation, CallbackContext cbc, boolean old_impl, int dbid) throws Exception {
+        try {
+            // ASSUMPTION: no db (connection/handle) is already stored in the map
+            // [should be true according to the code in DBRunner.run()]
+
+            File dbfile = getDatabaseFile(dbname, dblocation);
             Log.v("info", "Open sqlite db: " + dbfile.getAbsolutePath());
 
             SQLiteNativeDatabase mydb = new SQLiteNativeDatabase();
@@ -273,17 +294,12 @@ public class SQLitePlugin extends CordovaPlugin {
         }
     }
 
-    private SQLiteAndroidDatabase openDatabase2(String dbname, boolean ignored, CallbackContext cbc, boolean old_impl) throws Exception {
+    private SQLiteAndroidDatabase openDatabase2(String dbname, String dblocation, CallbackContext cbc, boolean old_impl) throws Exception {
         try {
             // ASSUMPTION: no db (connection/handle) is already stored in the map
             // [should be true according to the code in DBRunner.run()]
 
-            File dbfile = this.cordova.getActivity().getDatabasePath(dbname);
-
-            if (!dbfile.exists()) {
-                dbfile.getParentFile().mkdirs();
-            }
-
+            File dbfile = getDatabaseFile(dbname, dblocation);
             Log.v("info", "Open sqlite db: " + dbfile.getAbsolutePath());
 
             SQLiteAndroidDatabase mydb = new SQLiteAndroidDatabase();
@@ -339,7 +355,7 @@ public class SQLitePlugin extends CordovaPlugin {
         }
     }
 
-    private void deleteDatabase(String dbname, CallbackContext cbc) {
+    private void deleteDatabase(String dbname, String dblocation, CallbackContext cbc) {
         DBRunner r = dbrmap.get(dbname);
         if (r != null) {
             try {
@@ -351,7 +367,7 @@ public class SQLitePlugin extends CordovaPlugin {
                 Log.e(SQLitePlugin.class.getSimpleName(), "couldn't close database", e);
             }
         } else {
-            boolean deleteResult = this.deleteDatabaseNow(dbname);
+            boolean deleteResult = this.deleteDatabaseNow(dbname, dblocation);
             if (deleteResult) {
                 cbc.success();
             } else {
@@ -367,10 +383,10 @@ public class SQLitePlugin extends CordovaPlugin {
      *
      * @return true if successful or false if an exception was encountered
      */
-    private boolean deleteDatabaseNow(String dbname) {
-        File dbfile = this.cordova.getActivity().getDatabasePath(dbname);
-
+    private boolean deleteDatabaseNow(String dbname, String dblocation) {
         try {
+            File dbfile = getDatabaseFile(dbname, dblocation);
+
             return cordova.getActivity().deleteDatabase(dbfile.getAbsolutePath());
         } catch (Exception e) {
             Log.e(SQLitePlugin.class.getSimpleName(), "couldn't delete database", e);
@@ -435,6 +451,7 @@ public class SQLitePlugin extends CordovaPlugin {
     private class DBRunner implements Runnable {
         final int dbid;
         final String dbname;
+        final String dblocation;
         // expose oldImpl:
         boolean oldImpl;
         private boolean bugWorkaround;
@@ -449,8 +466,20 @@ public class SQLitePlugin extends CordovaPlugin {
             this.dbid = dbid;
             this.dbname = dbname;
             this.oldImpl = options.has("androidOldDatabaseImplementation");
-            Log.v(SQLitePlugin.class.getSimpleName(), "Android db implementation: built-in android.database.sqlite package");
+            //Log.v(SQLitePlugin.class.getSimpleName(), "Android db implementation: built-in android.database.sqlite package");
             this.bugWorkaround = this.oldImpl && options.has("androidBugWorkaround");
+
+            String mydblocation = null;
+            if (options.has("androidDatabaseLocation")) {
+                try {
+                    mydblocation = options.getString("androidDatabaseLocation");
+                } catch (Exception e) {
+                    // IGNORED
+                    Log.e(SQLitePlugin.class.getSimpleName(), "unexpected JSON exception, IGNORED", e);
+                }
+            }
+            this.dblocation = mydblocation;
+
             if (this.bugWorkaround)
                 Log.v(SQLitePlugin.class.getSimpleName(), "Android db closing/locking workaround applied");
 
@@ -461,9 +490,9 @@ public class SQLitePlugin extends CordovaPlugin {
         public void run() {
             try {
                 if (!oldImpl)
-                    this.mydb = this.mydb1 = openDatabase(dbname, false, this.openCbc, this.oldImpl, this.dbid);
+                    this.mydb = this.mydb1 = openDatabase(dbname, dblocation, this.openCbc, this.oldImpl, this.dbid);
                 else
-                    this.mydb = openDatabase2(dbname, false, this.openCbc, this.oldImpl);
+                    this.mydb = openDatabase2(dbname, dblocation, this.openCbc, this.oldImpl);
             } catch (Exception e) {
                 Log.e(SQLitePlugin.class.getSimpleName(), "unexpected error, stopping db thread", e);
                 dbrmap.remove(dbname);
@@ -526,7 +555,7 @@ public class SQLitePlugin extends CordovaPlugin {
                         dbq.cbc.success();
                     } else {
                         try {
-                            boolean deleteResult = deleteDatabaseNow(dbname);
+                            boolean deleteResult = deleteDatabaseNow(dbname, dblocation);
                             if (deleteResult) {
                                 dbq.cbc.success();
                             } else {