@capacitor-community/sqlite 5.2.3 → 5.2.5

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

@@ -451,6 +451,7 @@ public class CapacitorSQLite {
             throw new Exception(msg);
         }
     }
+
     /**
      * BeginTransaction
      *
@@ -466,7 +467,7 @@ public class CapacitorSQLite {
         if (db != null) {
             if (!db.isNCDB() && db.isOpen()) {
                 try {
-                    Integer res =  db.beginTransaction();
+                    Integer res = db.beginTransaction();
                     retObj.put("changes", res);
                     return retObj;
                 } catch (Exception e) {
@@ -497,7 +498,7 @@ public class CapacitorSQLite {
         if (db != null) {
             if (!db.isNCDB() && db.isOpen()) {
                 try {
-                    Integer res =  db.commitTransaction();
+                    Integer res = db.commitTransaction();
                     retObj.put("changes", res);
                     return retObj;
                 } catch (Exception e) {
@@ -528,7 +529,7 @@ public class CapacitorSQLite {
         if (db != null) {
             if (!db.isNCDB() && db.isOpen()) {
                 try {
-                    Integer res =  db.rollbackTransaction();
+                    Integer res = db.rollbackTransaction();
                     retObj.put("changes", res);
                     return retObj;
                 } catch (Exception e) {
@@ -563,7 +564,6 @@ public class CapacitorSQLite {
                 } catch (Exception e) {
                     throw new Exception(e.getMessage());
                 }
-
             } else {
                 String msg = "database " + dbName + " not opened";
                 throw new Exception(msg);
@@ -1269,8 +1269,7 @@ public class CapacitorSQLite {
         }
     }
 
-    public JSObject exportToJson(String dbName, String expMode,
-                                 Boolean readonly, Boolean encrypted) throws Exception {
+    public JSObject exportToJson(String dbName, String expMode, Boolean readonly, Boolean encrypted) throws Exception {
         dbName = getDatabaseName(dbName);
         String connName = readonly ? "RO_" + dbName : "RW_" + dbName;
         Database db = dbDict.get(connName);

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

@@ -9,6 +9,8 @@ import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
 import com.getcapacitor.community.database.sqlite.SQLite.SqliteConfig;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -28,6 +30,9 @@ public class CapacitorSQLitePlugin extends Plugin {
     private String passphrase = null;
     private String oldpassphrase = null;
     private String loadMessage = "";
+    private final ArrayList<String> modeList = new ArrayList<>(
+        Arrays.asList("no-encryption", "encryption", "secret", "decryption", "wrongsecret")
+    );
 
     /**
      * Load Method
@@ -287,12 +292,9 @@ public class CapacitorSQLitePlugin extends Plugin {
         Boolean encrypted = call.getBoolean("encrypted", false);
         if (encrypted) {
             inMode = call.getString("mode", "no-encryption");
-            if (
-                !inMode.equals("no-encryption") && !inMode.equals("encryption") && !inMode.equals("secret") && !inMode.equals("wrongsecret")
-            ) {
+            if (!modeList.contains(inMode)) {
                 String msg = "CreateConnection: inMode must ";
-                msg += "be in ['encryption','secret'] ";
-                msg += "** 'newsecret' has been deprecated";
+                msg += "be in ['encryption','secret', 'decryption'] ";
                 rHandler.retResult(call, null, msg);
                 return;
             }
@@ -369,6 +371,7 @@ public class CapacitorSQLitePlugin extends Plugin {
             rHandler.retResult(call, null, loadMessage);
         }
     }
+
     /**
      * BeginTransaction Method
      * Begin a Database Transaction
@@ -398,6 +401,7 @@ public class CapacitorSQLitePlugin extends Plugin {
             rHandler.retChanges(call, retRes, loadMessage);
         }
     }
+
     /**
      * CommitTransaction Method
      * Commit a Database Transaction
@@ -457,6 +461,7 @@ public class CapacitorSQLitePlugin extends Plugin {
             rHandler.retChanges(call, retRes, loadMessage);
         }
     }
+
     /**
      * IsTransactionActive Method
      * Check if a Database Transaction is Active
@@ -482,6 +487,7 @@ public class CapacitorSQLitePlugin extends Plugin {
             rHandler.retResult(call, null, loadMessage);
         }
     }
+
     /**
      * GetUrl Method
      * Get a database Url
@@ -1452,8 +1458,7 @@ public class CapacitorSQLitePlugin extends Plugin {
 
         if (implementation != null) {
             try {
-                JSObject res = implementation.exportToJson(dbName, expMode,
-                                                           readOnly, encrypted);
+                JSObject res = implementation.exportToJson(dbName, expMode, readOnly, encrypted);
                 rHandler.retJSObject(call, res, null);
             } catch (Exception e) {
                 String msg = "ExportToJson: " + e.getMessage();

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

@@ -144,6 +144,7 @@ public class Database {
     public boolean isAvailTrans() {
         return _db.inTransaction();
     }
+
     /**
      * BeginTransaction method
      *
@@ -152,7 +153,7 @@ public class Database {
     public Integer beginTransaction() throws Exception {
         if (_db.isOpen()) {
             try {
-                if( isAvailTrans()) {
+                if (isAvailTrans()) {
                     throw new Exception("Already in transaction");
                 }
                 _db.beginTransaction();
@@ -165,8 +166,8 @@ public class Database {
         } else {
             throw new Exception("Database not opened");
         }
-
     }
+
     /**
      * CommitTransaction method
      *
@@ -175,7 +176,7 @@ public class Database {
     public Integer commitTransaction() throws Exception {
         if (_db.isOpen()) {
             try {
-                if(!isAvailTrans()) {
+                if (!isAvailTrans()) {
                     throw new Exception("No transaction active");
                 }
                 _db.setTransactionSuccessful();
@@ -188,7 +189,6 @@ public class Database {
         } else {
             throw new Exception("Database not opened");
         }
-
     }
 
     /**
@@ -199,7 +199,7 @@ public class Database {
     public Integer rollbackTransaction() throws Exception {
         if (_db.isOpen()) {
             try {
-                if( isAvailTrans()) {
+                if (isAvailTrans()) {
                     _db.endTransaction();
                 }
                 return 0;
@@ -211,7 +211,6 @@ public class Database {
         } else {
             throw new Exception("Database not opened");
         }
-
     }
 
     /**
@@ -233,7 +232,7 @@ public class Database {
         int curVersion;
 
         String password = "";
-        if (_encrypted && (_mode.equals("secret") || _mode.equals("encryption"))) {
+        if (_encrypted && (_mode.equals("secret") || _mode.equals("encryption") || _mode.equals("decryption"))) {
             if (!_uSecret.isPassphrase()) {
                 throw new Exception("No Passphrase stored");
             }
@@ -252,6 +251,20 @@ public class Database {
                 throw new Exception("No Encryption set in capacitor.config");
             }
         }
+        if (_mode.equals("decryption")) {
+            if (_isEncryption) {
+                try {
+                    _uCipher.decrypt(_context, _file, SQLiteDatabase.getBytes(password.toCharArray()));
+                    password = "";
+                } catch (Exception e) {
+                    String msg = "Failed in decryption " + e.getMessage();
+                    Log.v(TAG, msg);
+                    throw new Exception(msg);
+                }
+            } else {
+                throw new Exception("No Encryption set in capacitor.config");
+            }
+        }
         try {
             if (!isNCDB() && !this._readOnly) {
                 _db = SQLiteDatabase.openOrCreateDatabase(_file, password, null);

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

@@ -134,6 +134,68 @@ public class UtilsSQLCipher {
         }
     }
 
+    public void decrypt(Context ctxt, File originalFile, byte[] passphrase) throws IOException {
+        SQLiteDatabase.loadLibs(ctxt);
+
+        if (originalFile.exists()) {
+            // Create a temporary file for the decrypted database in the cache directory
+            File decryptedFile = File.createTempFile("sqlcipherutils", "tmp", ctxt.getCacheDir());
+
+            // Open the decrypted database
+            SQLiteDatabase decryptedDb = SQLiteDatabase.openDatabase(
+                decryptedFile.getAbsolutePath(),
+                "",
+                null,
+                SQLiteDatabase.OPEN_READWRITE
+            );
+
+            // Open the encrypted database with the provided passphrase
+            SQLiteDatabase encryptedDb = SQLiteDatabase.openDatabase(
+                originalFile.getAbsolutePath(),
+                new String(passphrase),
+                null,
+                SQLiteDatabase.OPEN_READWRITE
+            );
+
+            int version = encryptedDb.getVersion();
+            decryptedDb.setVersion(version);
+
+            decryptedDb.close();
+
+            // Attach the encrypted database to itself using an empty key
+            StringBuilder attachSql = new StringBuilder();
+            attachSql.append("ATTACH DATABASE ? AS plaintext KEY '';");
+            final SQLiteStatement attachStatement = encryptedDb.compileStatement(attachSql.toString());
+
+            attachStatement.bindString(1, decryptedFile.getAbsolutePath());
+            attachStatement.execute();
+
+            // Export data from the encrypted database to the plaintext database
+            StringBuilder exportSql = new StringBuilder();
+            exportSql.append("SELECT sqlcipher_export('plaintext');");
+            encryptedDb.rawExecSQL(exportSql.toString());
+
+            // Detach the plaintext database
+            StringBuilder detachSql = new StringBuilder();
+            detachSql.append("DETACH DATABASE plaintext;");
+            encryptedDb.rawExecSQL(detachSql.toString());
+
+            attachStatement.close();
+            encryptedDb.close();
+
+            boolean delFile = originalFile.delete();
+            if (!delFile) {
+                throw new FileNotFoundException(originalFile.getAbsolutePath() + " not deleted");
+            }
+            boolean renFile = decryptedFile.renameTo(originalFile);
+            if (!renFile) {
+                throw new FileNotFoundException(originalFile.getAbsolutePath() + " not renamed");
+            }
+        } else {
+            throw new FileNotFoundException(originalFile.getAbsolutePath() + " not found");
+        }
+    }
+
     public void changePassword(Context ctxt, File file, String password, String nwpassword) throws IOException {
         SQLiteDatabase.loadLibs(ctxt);
 

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

@@ -134,25 +134,31 @@ public class UtilsSQLStatement {
 
     public static List<String> extractColumnNames(String whereClause) {
         Set<String> keywords = new HashSet<>(Arrays.asList("AND", "OR", "IN", "VALUES", "LIKE", "BETWEEN", "NOT"));
-        String[] tokens = whereClause.split("\\s|,|\\(|\\)");
 
+        Pattern pattern = Pattern.compile(
+          "\\b[a-zA-Z]\\w*\\b(?=\\s*(?:<=?|>=?|<>?|=|AND|OR|BETWEEN|NOT|IN|LIKE))|" +
+            "\\b[a-zA-Z]\\w*\\b\\s+BETWEEN\\s+'[^']+'\\s+AND\\s+'[^']+'|" +
+            "\\(([^)]+)\\)\\s+IN\\s+\\(\\s*VALUES\\s*\\("
+        );
+        Matcher matcher = pattern.matcher(whereClause);
         List<String> columns = new ArrayList<>();
-        boolean inClause = false;
-        boolean inValues = false;
-
-        for (String token : tokens) {
-            if (token.equals("IN")) {
-                inClause = true;
-            } else if (inClause && token.equals("(")) {
-                inValues = true;
-            } else if (inValues && token.equals(")")) {
-                inValues = false;
-            } else if (token.matches("\\b[a-zA-Z]\\w*\\b") && !inValues && !keywords.contains(token.toUpperCase())) {
-                columns.add(token);
+
+        while (matcher.find()) {
+            String columnList = matcher.group(1);
+            if (columnList != null) {
+                String[] columnNamesArray = columnList.split(",");
+                for (String columnName : columnNamesArray) {
+                    columns.add(columnName.trim());
+                }
+            } else {
+                String matchedText = matcher.group();
+                if (!keywords.contains(matchedText.trim().toUpperCase())) {
+                    columns.add(matchedText.trim());
+                }
             }
         }
 
-        return new ArrayList<>(new HashSet<>(columns));
+        return columns;
     }
 
     public static List<Integer> indicesOf(String str, String searchStr, int fromIndex) {

package/dist/esm/definitions.d.ts

@@ -127,11 +127,11 @@ export interface CapacitorSQLitePlugin {
      */
     commitTransaction(options: capSQLiteOptions): Promise<capSQLiteChanges>;
     /**
-   * Rollback Database Transaction
-   * @param options
-   * @returns capSQLiteChanges
-   * @since 5.0.7
-   */
+     * Rollback Database Transaction
+     * @param options
+     * @returns capSQLiteChanges
+     * @since 5.0.7
+     */
     rollbackTransaction(options: capSQLiteOptions): Promise<capSQLiteChanges>;
     /**
      * Is Database Transaction Active
@@ -1087,7 +1087,7 @@ export interface ISQLiteConnection {
     clearEncryptionSecret(): Promise<void>;
     /**
      * Check the passphrase stored in a secure store
-     * @param passphrase
+     * @param oldPassphrase
      * @returns Promise<capSQLiteResult>
      * @since 4.6.1
      */

package/dist/esm/definitions.js

@@ -135,6 +135,12 @@ export class SQLiteConnection {
             const conn = new SQLiteDBConnection(database, readonly, this.sqlite);
             const connName = readonly ? `RO_${database}` : `RW_${database}`;
             this._connectionDict.set(connName, conn);
+            /*
+            console.log(`*** in createConnection connectionDict: ***`)
+            this._connectionDict.forEach((connection, key) => {
+              console.log(`Key: ${key}, Value: ${connection}`);
+            });
+      */
             return Promise.resolve(conn);
         }
         catch (err) {
@@ -148,6 +154,11 @@ export class SQLiteConnection {
             await this.sqlite.closeConnection({ database, readonly });
             const connName = readonly ? `RO_${database}` : `RW_${database}`;
             this._connectionDict.delete(connName);
+            /*      console.log(`*** in closeConnection connectionDict: ***`)
+            this._connectionDict.forEach((connection, key) => {
+              console.log(`Key: ${key}, Value: ${connection}`);
+            });
+      */
             return Promise.resolve();
         }
         catch (err) {
@@ -251,6 +262,11 @@ export class SQLiteConnection {
     async closeAllConnections() {
         const delDict = new Map();
         try {
+            /*      console.log(`*** in closeAllConnections connectionDict: ***`)
+            this._connectionDict.forEach((connection, key) => {
+              console.log(`Key: ${key}, Value: ${connection}`);
+            });
+      */
             for (const key of this._connectionDict.keys()) {
                 const database = key.substring(3);
                 const readonly = key.substring(0, 3) === 'RO_' ? true : false;
@@ -263,6 +279,7 @@ export class SQLiteConnection {
             return Promise.resolve();
         }
         catch (err) {
+            console.log(`in definition closeAllConnections err: `, err);
             return Promise.reject(err);
         }
     }
@@ -470,8 +487,9 @@ export class SQLiteDBConnection {
     }
     async beginTransaction() {
         try {
-            const changes = await this.sqlite
-                .beginTransaction({ database: this.dbName });
+            const changes = await this.sqlite.beginTransaction({
+                database: this.dbName,
+            });
             return Promise.resolve(changes);
         }
         catch (err) {
@@ -480,8 +498,9 @@ export class SQLiteDBConnection {
     }
     async commitTransaction() {
         try {
-            const changes = await this.sqlite
-                .commitTransaction({ database: this.dbName });
+            const changes = await this.sqlite.commitTransaction({
+                database: this.dbName,
+            });
             return Promise.resolve(changes);
         }
         catch (err) {
@@ -490,8 +509,9 @@ export class SQLiteDBConnection {
     }
     async rollbackTransaction() {
         try {
-            const changes = await this.sqlite
-                .rollbackTransaction({ database: this.dbName });
+            const changes = await this.sqlite.rollbackTransaction({
+                database: this.dbName,
+            });
             return Promise.resolve(changes);
         }
         catch (err) {
@@ -500,8 +520,9 @@ export class SQLiteDBConnection {
     }
     async isTransactionActive() {
         try {
-            const result = await this.sqlite
-                .isTransactionActive({ database: this.dbName });
+            const result = await this.sqlite.isTransactionActive({
+                database: this.dbName,
+            });
             return Promise.resolve(result);
         }
         catch (err) {
@@ -578,7 +599,7 @@ export class SQLiteDBConnection {
                     statements: statements,
                     transaction: transaction,
                     readonly: false,
-                    isSQL92: isSQL92
+                    isSQL92: isSQL92,
                 });
                 return Promise.resolve(res);
             }
@@ -599,7 +620,7 @@ export class SQLiteDBConnection {
                     statement: statement,
                     values: values,
                     readonly: this.readonly,
-                    isSql92: true
+                    isSql92: true,
                 });
             }
             else {
@@ -608,7 +629,7 @@ export class SQLiteDBConnection {
                     statement: statement,
                     values: [],
                     readonly: this.readonly,
-                    isSQL92: isSQL92
+                    isSQL92: isSQL92,
                 });
             }
             // reorder rows for ios
@@ -634,7 +655,7 @@ export class SQLiteDBConnection {
                         transaction: transaction,
                         readonly: false,
                         returnMode: mRetMode,
-                        isSQL92: true
+                        isSQL92: true,
                     });
                     //        }
                 }
@@ -649,7 +670,7 @@ export class SQLiteDBConnection {
                         transaction: transaction,
                         readonly: false,
                         returnMode: mRetMode,
-                        isSQL92: isSQL92
+                        isSQL92: isSQL92,
                     });
                 }
                 // reorder rows for ios
@@ -674,7 +695,7 @@ export class SQLiteDBConnection {
                     transaction: transaction,
                     readonly: false,
                     returnMode: returnMode,
-                    isSQL92: isSQL92
+                    isSQL92: isSQL92,
                 });
                 //      }
                 // reorder rows for ios
@@ -830,10 +851,10 @@ export class SQLiteDBConnection {
         if (!this.readonly) {
             try {
                 await this.sqlite.beginTransaction({
-                    database: this.dbName
+                    database: this.dbName,
                 });
                 isActive = await this.sqlite.isTransactionActive({
-                    database: this.dbName
+                    database: this.dbName,
                 });
                 if (!isActive) {
                     return Promise.reject('After Begin Transaction, no transaction active');
@@ -855,7 +876,7 @@ export class SQLiteDBConnection {
                             transaction: false,
                             readonly: false,
                             returnMode: retMode,
-                            isSQL92: isSQL92
+                            isSQL92: isSQL92,
                         });
                         if (ret.changes.changes <= 0) {
                             throw new Error('Error in transaction method run ');
@@ -870,7 +891,7 @@ export class SQLiteDBConnection {
                             readonly: false,
                         });
                         isActive = await this.sqlite.isTransactionActive({
-                            database: this.dbName
+                            database: this.dbName,
                         });
                         if (ret.changes.changes < 0) {
                             throw new Error('Error in transaction method execute ');
@@ -879,11 +900,11 @@ export class SQLiteDBConnection {
                     }
                 }
                 isActive = await this.sqlite.isTransactionActive({
-                    database: this.dbName
+                    database: this.dbName,
                 });
                 if (isActive) {
                     const retC = await this.sqlite.commitTransaction({
-                        database: this.dbName
+                        database: this.dbName,
                     });
                     changes += retC.changes.changes;
                 }
@@ -893,7 +914,7 @@ export class SQLiteDBConnection {
             catch (err) {
                 const msg = err.message ? err.message : err;
                 isActive = await this.sqlite.isTransactionActive({
-                    database: this.dbName
+                    database: this.dbName,
                 });
                 if (isActive) {
                     await this.sqlite.rollbackTransaction({