@capacitor-community/sqlite 5.6.1 → 5.6.2

package/README.md

@@ -48,7 +48,7 @@ pnpm install --save sql.js
 npx cap sync
 ```
 
-then add plugin to main `capacitor.config.json` file:
+then add plugin to main `capacitor.config.ts` file:
 
 ```ts
 import { CapacitorConfig } from '@capacitor/cli';

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/Database.java

@@ -743,24 +743,40 @@ public class Database {
             if (returningIndex != -1) {
                 String substring = suffix.substring(returningIndex + "returning".length());
                 String names = substring.trim();
-                if (names.endsWith(";")) {
-                    retObj.put("names", names.substring(0, names.length() - 1));
-                }
-            }
+                retObj.put("names", getNames(names));
+             }
         }
         return retObj;
     }
 
+    private String getNames(String input) {
+        int indexSemicolon = input.indexOf(";");
+        int indexDoubleDash = input.indexOf("--");
+        int indexCommentStart = input.indexOf("/*");
+
+        // Find the minimum index among them
+        int minIndex = input.length();
+        if (indexSemicolon != -1) {
+            minIndex = Math.min(minIndex, indexSemicolon);
+        }
+        if (indexDoubleDash != -1) {
+            minIndex = Math.min(minIndex, indexDoubleDash);
+        }
+        if (indexCommentStart != -1) {
+            minIndex = Math.min(minIndex, indexCommentStart);
+        }
+        return input.substring(0, minIndex).trim();
+    }
     private JSObject isReturning(String sqlStmt) {
         JSObject retObj = new JSObject();
 
-        String stmt = sqlStmt.replace("\n", "").trim();
+        String stmt = sqlStmt.trim();
         if (stmt.endsWith(";")) {
             // Remove the suffix
             stmt = stmt.substring(0, stmt.length() - 1).trim();
         }
         retObj.put("isReturning", false);
-        retObj.put("stmt", stmt);
+        retObj.put("stmt", sqlStmt);
         retObj.put("names", "");
 
         switch (stmt.substring(0, Math.min(stmt.length(), 6)).toUpperCase()) {

package/electron/dist/plugin.js

@@ -1098,29 +1098,6 @@ class UtilsSQLStatement {
         const lines = input.split(/\r?\n/);
         return lines.join(' ');
     }
-    getStmtAndRetColNames(sqlStmt, retMode) {
-        const retWord = 'RETURNING';
-        const retStmtNames = {
-            stmt: sqlStmt,
-            names: '',
-        };
-        const retWordIndex = sqlStmt.toUpperCase().indexOf(retWord);
-        if (retWordIndex !== -1) {
-            const prefix = sqlStmt.substring(0, retWordIndex);
-            retStmtNames.stmt = `${prefix};`;
-            if (retMode.substring(0, 2) === 'wA') {
-                const suffix = sqlStmt.substring(retWordIndex + retWord.length);
-                const names = suffix.trim();
-                if (names.endsWith(';')) {
-                    retStmtNames.names = names.substring(0, names.length - 1);
-                }
-                else {
-                    retStmtNames.names = names;
-                }
-            }
-        }
-        return retStmtNames;
-    }
     extractCombinedPrimaryKey(whereClause) {
         const pattern = /WHERE\s*\((.+?)\)\s*(?:=|IN)\s*\((.+?)\)/g;
         const regex = new RegExp(pattern);
@@ -1540,7 +1517,7 @@ class UtilsSQLite {
     }
     statementsToSQL92(mDB, sql, fromJson, isSQL92) {
         // split the statements in an array of statement
-        let sqlStmt = sql.replace(/\n/g, '');
+        let sqlStmt = sql /*.replace(/\n/g, '')*/;
         // deal with trigger
         sqlStmt = sqlStmt.replace(/end;/g, 'END;');
         sqlStmt = sqlStmt.replace(/;END;/g, '&END;');
@@ -1589,7 +1566,7 @@ class UtilsSQLite {
             }
             resArr.push(rStmt);
         }
-        sqlStmt = resArr.join(';');
+        sqlStmt = resArr.join(';\n');
         return sqlStmt;
     }
     /**
@@ -1678,7 +1655,7 @@ class UtilsSQLite {
         const result = { changes: 0, lastId: -1 };
         const msg = 'PrepareRun';
         const stmtType = statement
-            .replace(/\n/g, '')
+            //      .replace(/\n/g, '')
             .trim()
             .substring(0, 6)
             .toUpperCase();
@@ -2327,7 +2304,7 @@ class UtilsSQLite {
         return retStmt;
     }
     isReturning(sqlStmt) {
-        let stmt = sqlStmt.replace(/\n/g, '').trim();
+        let stmt = sqlStmt.trim();
         if (stmt.endsWith(';')) {
             stmt = stmt.slice(0, -1).trim();
         }
@@ -2410,16 +2387,31 @@ class UtilsSQLite {
             if (returningIndex !== -1) {
                 const substring = suffix.slice(returningIndex + 9); // 9 is the length of "returning"
                 const names = substring.trim();
-                if (names.endsWith(';')) {
-                    retObj.names = names.slice(0, -1);
-                }
-                else {
-                    retObj.names = names;
-                }
+                retObj.names = this.getNames(names);
             }
         }
         return retObj;
     }
+    getNames(input) {
+        // Find the index of the first occurrence of ";", "--", or "/*"
+        const indexSemicolon = input.indexOf(';');
+        const indexDoubleDash = input.indexOf('--');
+        const indexCommentStart = input.indexOf('/*');
+        // Find the minimum index among them
+        let minIndex = input.length;
+        if (indexSemicolon !== -1) {
+            minIndex = Math.min(minIndex, indexSemicolon);
+        }
+        if (indexDoubleDash !== -1) {
+            minIndex = Math.min(minIndex, indexDoubleDash);
+        }
+        if (indexCommentStart !== -1) {
+            minIndex = Math.min(minIndex, indexCommentStart);
+        }
+        // Extract substring up to the minimum index
+        const colnames = input.substring(0, minIndex).trim();
+        return colnames;
+    }
     getTableName(sqlStatement) {
         const patterns = {
             insert: /INSERT\s+INTO\s+(\w+)/i,