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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unvired/cordova-plugin-unvired-electron-db",
   "displayName": "Unvired DB",
-  "version": "0.0.42",
+  "version": "0.0.43",
   "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.42"
+        version="0.0.43"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Unvired DB</name>
     <description>Unvired DB Native Support for Cordova</description>

package/src/browser/DbPluginProxy.js

@@ -30,32 +30,25 @@ module.exports.execute = async function (sucessCallback, errorCallback, options)
     try {
         const db = dbType == DBType.FrameworkDb ? webDb.fwDb : webDb.appDb;
         
-        // Check if query is a SELECT statement (starts with SELECT or WITH for CTEs)
-        // Using regex to handle leading whitespace and ensure it's the start of the command
-        const isSelect = /^\s*\(?\s*(SELECT|WITH|PRAGMA|VALUES|EXPLAIN)\b/i.test(query);
-
-        if (isSelect) {
-            let rows = [];
-            var stmt = db.prepare(query);
-            while (stmt.step()) {
-                var row = stmt.getAsObject();
-                rows.push(row);
-            }
-            stmt.free();
-            sucessCallback(rows);
+        // Parse query and convert to prepared statement with bound values for ALL query types
+        const parsedQuery = webDb.parseQueryToPrepared(query);
+        let stmt;
+        
+        if (parsedQuery.values.length > 0) {
+            stmt = db.prepare(parsedQuery.query);
+            stmt.bind(parsedQuery.values);
         } else {
-            // Parse query and convert to prepared statement with bound values
-            const parsedQuery = webDb.parseQueryToPrepared(query);
-            if (parsedQuery.isPrepared) {
-                var stmt = db.prepare(parsedQuery.query);
-                stmt.run(parsedQuery.values);
-                stmt.free();
-            } else {
-                // Fallback to exec for queries without parameters
-                db.exec(query);
-            }
-            sucessCallback("Success");
+            stmt = db.prepare(query);
         }
+
+        // Execute statement and capture results if any
+        let rows = [];
+        while (stmt.step()) {
+            rows.push(stmt.getAsObject());
+        }
+        stmt.free();
+
+        sucessCallback(rows);
     }
     catch (err) {
         console.error("Error executing query: " + query, err);
@@ -252,7 +245,7 @@ var webDb = /** @class */ (function () {
 
             // If query already contains positional placeholders, don't attempt to re-parameterize it.
             if (query.indexOf('?') !== -1) {
-                return { isPrepared: false, query: query, values: [] };
+                return { query: query, values: [] };
             }
             if (queryUpper.startsWith('CREATE') || 
                 queryUpper.startsWith('DROP') || 
@@ -276,7 +269,7 @@ var webDb = /** @class */ (function () {
                 // DDL/transactional statements and similar should not be parameterized.
                 // Note: INSERT ... VALUES will be parameterized below so large
                 // string/numeric literals (eg. base64 blobs) can be bound safely.
-                return { isPrepared: false, query: query, values: [] };
+                return { query: query, values: [] };
             }
  
             
@@ -285,7 +278,7 @@ var webDb = /** @class */ (function () {
             const hasNumericLiterals = /\b\d+\.?\d*\b/.test(query);
 
             if (!hasStringLiterals && !hasNumericLiterals) {
-                return { isPrepared: false, query: query, values: [] };
+                return { query: query, values: [] };
             }
 
             // We'll scan the original query left-to-right and replace literals with
@@ -333,7 +326,7 @@ var webDb = /** @class */ (function () {
 
                     if (!closed) {
                         // Unmatched quote; bail out to safe fallback to avoid errors
-                        return { isPrepared: false, query: query, values: [] };
+                        return { query: query, values: [] };
                     }
 
                     // Extract content and handle escaped quotes
@@ -396,13 +389,13 @@ var webDb = /** @class */ (function () {
 
             // If we didn't find any bindable literals, don't treat as prepared
             if (values.length === 0) {
-                return { isPrepared: false, query: query, values: [] };
+                return { query: query, values: [] };
             }
 
-            return { isPrepared: true, query: preparedQuery, values: values };
+            return { query: preparedQuery, values: values };
         } catch (err) {
             console.warn('Error parsing query to prepared statement:', err);
-            return { isPrepared: false, query: query, values: [] };
+            return { query: query, values: [] };
         }
     };
 

package/src/electron/package.json

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