@unvired/cordova-plugin-unvired-electron-db 0.0.43 → 0.0.44

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unvired/cordova-plugin-unvired-electron-db",
   "displayName": "Unvired DB",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "Unvired DB Native Support for Cordova",
   "scripts": {},
   "keywords": [

package/plugin.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         id="@unvired/cordova-plugin-unvired-electron-db"
-        version="0.0.43"
+        version="0.0.44"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Unvired DB</name>
     <description>Unvired DB Native Support for Cordova</description>

package/src/android/DBPlugin.java

@@ -117,6 +117,7 @@ public class DBPlugin extends CordovaPlugin {
         String userId = params.getString("userId");
         String dbType = params.getString("dbType");
         String query = params.getString("query");
+        JSONArray queryArgs = params.optJSONArray("args");
 
         if (userId == null || userId.isEmpty()) {
             callbackContext.error("userId is required");
@@ -145,44 +146,48 @@ public class DBPlugin extends CordovaPlugin {
         }
 
         try {
-            if (query.toUpperCase().contains("SELECT")) {
-                JSONArray results = new JSONArray();
-                android.database.Cursor cursor = db.rawQuery(query, null);
-                if (cursor != null) {
-                    try {
-                        String[] columnNames = cursor.getColumnNames();
-                        while (cursor.moveToNext()) {
-                            JSONObject row = new JSONObject();
-                            for (String columnName : columnNames) {
-                                int columnIndex = cursor.getColumnIndex(columnName);
-                                switch (cursor.getType(columnIndex)) {
-                                    case android.database.Cursor.FIELD_TYPE_INTEGER:
-                                        row.put(columnName, cursor.getLong(columnIndex));
-                                        break;
-                                    case android.database.Cursor.FIELD_TYPE_FLOAT:
-                                        row.put(columnName, cursor.getDouble(columnIndex));
-                                        break;
-                                    case android.database.Cursor.FIELD_TYPE_STRING:
-                                        row.put(columnName, cursor.getString(columnIndex));
-                                        break;
-                                    case android.database.Cursor.FIELD_TYPE_BLOB:
-                                        row.put(columnName, cursor.getBlob(columnIndex));
-                                        break;
-                                    default:
-                                        row.put(columnName, JSONObject.NULL);
-                                }
+            String[] selectionArgs = null;
+            if (queryArgs != null && queryArgs.length() > 0) {
+                selectionArgs = new String[queryArgs.length()];
+                for (int i = 0; i < queryArgs.length(); i++) {
+                    Object val = queryArgs.get(i);
+                    selectionArgs[i] = (val == null || val == JSONObject.NULL) ? null : String.valueOf(val);
+                }
+            }
+
+            JSONArray results = new JSONArray();
+            android.database.Cursor cursor = db.rawQuery(query, selectionArgs);
+            if (cursor != null) {
+                try {
+                    String[] columnNames = cursor.getColumnNames();
+                    while (cursor.moveToNext()) {
+                        JSONObject row = new JSONObject();
+                        for (String columnName : columnNames) {
+                            int columnIndex = cursor.getColumnIndex(columnName);
+                            switch (cursor.getType(columnIndex)) {
+                                case android.database.Cursor.FIELD_TYPE_INTEGER:
+                                    row.put(columnName, cursor.getLong(columnIndex));
+                                    break;
+                                case android.database.Cursor.FIELD_TYPE_FLOAT:
+                                    row.put(columnName, cursor.getDouble(columnIndex));
+                                    break;
+                                case android.database.Cursor.FIELD_TYPE_STRING:
+                                    row.put(columnName, cursor.getString(columnIndex));
+                                    break;
+                                case android.database.Cursor.FIELD_TYPE_BLOB:
+                                    row.put(columnName, cursor.getBlob(columnIndex));
+                                    break;
+                                default:
+                                    row.put(columnName, JSONObject.NULL);
                             }
-                            results.put(row);
                         }
-                    } finally {
-                        cursor.close();
+                        results.put(row);
                     }
+                } finally {
+                    cursor.close();
                 }
-                callbackContext.success(results);
-            } else {
-                db.execSQL(query);
-                callbackContext.success("Success");
             }
+            callbackContext.success(results);
         } catch (SQLiteException e) {
             Log.e(TAG, "Error executing query", e);
             callbackContext.error("Error executing query: " + e.getMessage());

package/src/browser/DbPluginProxy.js

@@ -27,13 +27,22 @@ module.exports.create = async function (sucessCallback, errorCallback, options)
 module.exports.execute = async function (sucessCallback, errorCallback, options) {
     const dbType = options[0].dbType
     const query = options[0].query;
+    const args = options[0].args || [];
     try {
         const db = dbType == DBType.FrameworkDb ? webDb.fwDb : webDb.appDb;
         
-        // Parse query and convert to prepared statement with bound values for ALL query types
-        const parsedQuery = webDb.parseQueryToPrepared(query);
+        var parsedQuery = {query: query, values: []}
+        if (args.length > 0) {
+            parsedQuery = {
+                query: query,
+                values: args
+            }
+        }
+        else {
+            parsedQuery = webDb.parseQueryToPrepared(query);
+        }
+
         let stmt;
-        
         if (parsedQuery.values.length > 0) {
             stmt = db.prepare(parsedQuery.query);
             stmt.bind(parsedQuery.values);

package/src/electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-unvired-electron-db",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "Unvired DB Native Support for Cordova",
   "main": "unvired-db-proxy.js",
   "author": "Unvired Inc",

package/src/electron/unvired-db-proxy.js

@@ -52,6 +52,7 @@ const execute = (args) => {
         const userId = args[0].userId
         const dbType = args[0].dbType
         const query = args[0].query;
+        const queryArgs = args[0].args || [];
 
         if (userId == undefined || userId == null || userId == "") {
             reject("userId is required")
@@ -79,24 +80,13 @@ const execute = (args) => {
             }
         }
 
-        if (query.toUpperCase().includes("SELECT")) {
-            db.all(query, [], (err, rows) => {
-                if (err) {
-                    reject(err)
-                } else {
-                    resolve(rows)
-                }
-            });
-        }
-        else {
-            db.run(query, (err) => {
-                if (err) {
-                    reject(err)
-                } else {
-                    resolve("Success")
-                }
-            });
-        }
+        db.all(query, queryArgs, (err, rows) => {
+            if (err) {
+                reject(err)
+            } else {
+                resolve(rows || []) // Ensure we return an array
+            }
+        });
     });
 }
 

package/src/ios/UnviredDB.m

@@ -129,12 +129,12 @@ static const NSString *DBTypeFrameworkDb = @"FrameworkDb";
             // enable foreign Keys ON
             NSError *error = NULL;
             
-            [self executeQuery:@"PRAGMA journal_mode = WAL;" sqlDb:self->fwDb error:&error];
-            [self executeQuery:@"PRAGMA read_uncommitted = 1;" sqlDb:self->fwDb error:&error];
+            [self executeQuery:@"PRAGMA journal_mode = WAL;" args:nil sqlDb:self->fwDb error:&error];
+            [self executeQuery:@"PRAGMA read_uncommitted = 1;" args:nil sqlDb:self->fwDb error:&error];
 
-            [self executeQuery:@"PRAGMA journal_mode = WAL;" sqlDb:self->appDb error:&error];
-            [self executeQuery:@"PRAGMA foreign_keys = ON;" sqlDb:self->appDb error:&error];
-            [self executeQuery:@"PRAGMA read_uncommitted = 1;" sqlDb:self->appDb error:&error];
+            [self executeQuery:@"PRAGMA journal_mode = WAL;" args:nil sqlDb:self->appDb error:&error];
+            [self executeQuery:@"PRAGMA foreign_keys = ON;" args:nil sqlDb:self->appDb error:&error];
+            [self executeQuery:@"PRAGMA read_uncommitted = 1;" args:nil sqlDb:self->appDb error:&error];
             pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool:true];
             [pluginResult setKeepCallbackAsBool:true];
             [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
@@ -160,6 +160,7 @@ static const NSString *DBTypeFrameworkDb = @"FrameworkDb";
         NSString *userId = dataObjects[@"userId"];
         NSString *dbType = dataObjects[@"dbType"];
         NSString *query = dataObjects[@"query"];
+        NSArray *args = dataObjects[@"args"];
         
         sqlite3 *sql = [dbType isEqualToString:DBTypeFrameworkDb] ? self->fwDb : self->appDb;
         
@@ -173,11 +174,7 @@ static const NSString *DBTypeFrameworkDb = @"FrameworkDb";
         }
     
 //        NSLog(@"EXECUTE QUERY: %@", query);
-        if ([[query lowercaseString] containsString:@"create table"])
-            [self executeCreate:query sqlDb:sql error:&error];
-        else {
-            result = [self executeQuery:query sqlDb:sql error:&error];
-        }
+        result = [self executeQuery:query args:args sqlDb:sql error:&error];
         if (error == NULL) {
             pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:result];
         }
@@ -309,7 +306,7 @@ static const NSString *DBTypeFrameworkDb = @"FrameworkDb";
     return YES;
 }
 
-- (NSArray *)executeQuery:(NSString *)sqlStatement sqlDb:(sqlite3 *)sql error:(NSError **)error {
+- (NSArray *)executeQuery:(NSString *)sqlStatement args:(NSArray *)args sqlDb:(sqlite3 *)sql error:(NSError **)error {
     
     sqlite3_stmt *statement;
     statement = [self prepareStatement:sqlStatement sqlDb:sql error:error];
@@ -317,6 +314,27 @@ static const NSString *DBTypeFrameworkDb = @"FrameworkDb";
     if (statement == NULL) {
         return NULL;
     }
+
+    if (args && [args isKindOfClass:[NSArray class]] && [args count] > 0) {
+        for (int i = 0; i < [args count]; i++) {
+            id val = args[i];
+            int idx = i + 1;
+            if ([val isKindOfClass:[NSString class]]) {
+                sqlite3_bind_text(statement, idx, [val UTF8String], -1, SQLITE_TRANSIENT);
+            } else if ([val isKindOfClass:[NSNumber class]]) {
+                const char *objCType = [val objCType];
+                if (strcmp(objCType, @encode(double)) == 0 || strcmp(objCType, @encode(float)) == 0) {
+                     sqlite3_bind_double(statement, idx, [val doubleValue]);
+                } else {
+                     sqlite3_bind_int64(statement, idx, [val longLongValue]);
+                }
+            } else if ([val isKindOfClass:[NSNull class]]) {
+                sqlite3_bind_null(statement, idx);
+            } else {
+                 sqlite3_bind_text(statement, idx, [[NSString stringWithFormat:@"%@", val] UTF8String], -1, SQLITE_TRANSIENT);
+            }
+        }
+    }
     
     NSLog(@"Statement: %@", sqlStatement);