@capacitor-community/sqlite 4.1.0-4 → 4.1.0-7

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

@@ -284,7 +284,7 @@ public class CapacitorSQLitePlugin extends Plugin {
         dbName = call.getString("database");
         dbVersion = call.getInt("version", 1);
 
-        boolean encrypted = call.getBoolean("encrypted", false);
+        Boolean encrypted = call.getBoolean("encrypted", false);
         if (encrypted) {
             inMode = call.getString("mode", "no-encryption");
             if (
@@ -299,10 +299,11 @@ public class CapacitorSQLitePlugin extends Plugin {
         } else {
             inMode = "no-encryption";
         }
+        boolean readOnly = call.getBoolean("readonly", false);
         Dictionary<Integer, JSONObject> upgDict = versionUpgrades.get(dbName);
         if (implementation != null) {
             try {
-                implementation.createConnection(dbName, encrypted, inMode, dbVersion, upgDict);
+                implementation.createConnection(dbName, encrypted, inMode, dbVersion, upgDict, readOnly);
                 rHandler.retResult(call, null, null);
                 return;
             } catch (Exception e) {
@@ -330,9 +331,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String dbName = call.getString("database");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                implementation.open(dbName);
+                implementation.open(dbName, readOnly);
                 rHandler.retResult(call, null, null);
                 return;
             } catch (Exception e) {
@@ -360,9 +362,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String dbName = call.getString("database");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                implementation.close(dbName);
+                implementation.close(dbName, readOnly);
                 rHandler.retResult(call, null, null);
                 return;
             } catch (Exception e) {
@@ -390,9 +393,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String dbName = call.getString("database");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                String res = implementation.getUrl(dbName);
+                String res = implementation.getUrl(dbName, readOnly);
                 rHandler.retUrl(call, res, null);
                 return;
             } catch (Exception e) {
@@ -420,9 +424,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String dbName = call.getString("database");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                Integer res = implementation.getVersion(dbName);
+                Integer res = implementation.getVersion(dbName, readOnly);
                 rHandler.retVersion(call, res, null);
                 return;
             } catch (Exception e) {
@@ -480,9 +485,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String dbName = call.getString("database");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                implementation.closeConnection(dbName);
+                implementation.closeConnection(dbName, readOnly);
                 rHandler.retResult(call, null, null);
                 return;
             } catch (Exception e) {
@@ -602,9 +608,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String tableName = call.getString("table");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                Boolean res = implementation.isTableExists(dbName, tableName);
+                Boolean res = implementation.isTableExists(dbName, tableName, readOnly);
                 rHandler.retResult(call, res, null);
                 return;
             } catch (Exception e) {
@@ -794,10 +801,11 @@ public class CapacitorSQLitePlugin extends Plugin {
         }
         String statements = call.getString("statements");
         Boolean transaction = call.getBoolean("transaction", true);
+        Boolean readOnly = call.getBoolean("readonly", false);
 
         if (implementation != null) {
             try {
-                JSObject res = implementation.execute(dbName, statements, transaction);
+                JSObject res = implementation.execute(dbName, statements, transaction, readOnly);
                 rHandler.retChanges(call, res, null);
                 return;
             } catch (Exception e) {
@@ -852,9 +860,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             }
         }
         Boolean transaction = call.getBoolean("transaction", true);
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                JSObject res = implementation.executeSet(dbName, set, transaction);
+                JSObject res = implementation.executeSet(dbName, set, transaction, readOnly);
                 rHandler.retChanges(call, res, null);
                 return;
             } catch (Exception e) {
@@ -898,9 +907,10 @@ public class CapacitorSQLitePlugin extends Plugin {
         JSArray values = call.getArray("values");
 
         Boolean transaction = call.getBoolean("transaction", true);
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                JSObject res = implementation.run(dbName, statement, values, transaction);
+                JSObject res = implementation.run(dbName, statement, values, transaction, readOnly);
                 rHandler.retChanges(call, res, null);
                 return;
             } catch (Exception e) {
@@ -940,9 +950,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         JSArray values = call.getArray("values");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                JSArray res = implementation.query(dbName, statement, values);
+                JSArray res = implementation.query(dbName, statement, values, readOnly);
                 rHandler.retValues(call, res, null);
                 return;
             } catch (Exception e) {
@@ -964,9 +975,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String dbName = call.getString("database");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                JSArray res = implementation.getTableList(dbName);
+                JSArray res = implementation.getTableList(dbName, readOnly);
                 rHandler.retValues(call, res, null);
                 return;
             } catch (Exception e) {
@@ -994,10 +1006,11 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String dbName = call.getString("database");
+        Boolean readOnly = call.getBoolean("readonly", false);
 
         if (implementation != null) {
             try {
-                Boolean res = implementation.isDBExists(dbName);
+                Boolean res = implementation.isDBExists(dbName, readOnly);
                 rHandler.retResult(call, res, null);
                 return;
             } catch (Exception e) {
@@ -1025,9 +1038,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String dbName = call.getString("database");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                Boolean res = implementation.isDBOpen(dbName);
+                Boolean res = implementation.isDBOpen(dbName, readOnly);
                 rHandler.retResult(call, res, null);
                 return;
             } catch (Exception e) {
@@ -1055,9 +1069,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String dbName = call.getString("database");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                implementation.deleteDatabase(dbName);
+                implementation.deleteDatabase(dbName, readOnly);
                 rHandler.retResult(call, null, null);
                 return;
             } catch (Exception e) {
@@ -1087,9 +1102,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String dbName = call.getString("database");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                JSObject res = implementation.createSyncTable(dbName);
+                JSObject res = implementation.createSyncTable(dbName, readOnly);
                 rHandler.retChanges(call, res, null);
                 return;
             } catch (Exception e) {
@@ -1124,9 +1140,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String syncDate = call.getString("syncdate");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                implementation.setSyncDate(dbName, syncDate);
+                implementation.setSyncDate(dbName, syncDate, readOnly);
                 rHandler.retResult(call, null, null);
                 return;
             } catch (Exception e) {
@@ -1156,9 +1173,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String dbName = call.getString("database");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                long syncDate = implementation.getSyncDate(dbName);
+                long syncDate = implementation.getSyncDate(dbName, readOnly);
                 rHandler.retSyncDate(call, syncDate, null);
                 return;
             } catch (Exception e) {
@@ -1300,10 +1318,11 @@ public class CapacitorSQLitePlugin extends Plugin {
             rHandler.retJSObject(call, retObj, msg);
             return;
         }
+        Boolean readOnly = call.getBoolean("readonly", false);
 
         if (implementation != null) {
             try {
-                JSObject res = implementation.exportToJson(dbName, expMode);
+                JSObject res = implementation.exportToJson(dbName, expMode, readOnly);
                 rHandler.retJSObject(call, res, null);
                 return;
             } catch (Exception e) {
@@ -1327,9 +1346,10 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         String dbName = call.getString("database");
+        Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
-                implementation.deleteExportedRows(dbName);
+                implementation.deleteExportedRows(dbName, readOnly);
                 rHandler.retResult(call, null, null);
                 return;
             } catch (Exception e) {

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

@@ -8,21 +8,16 @@ import static android.database.Cursor.FIELD_TYPE_STRING;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.text.TextUtils;
 import android.util.Log;
 import androidx.sqlite.db.SimpleSQLiteQuery;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 import androidx.sqlite.db.SupportSQLiteStatement;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
-import com.getcapacitor.community.database.sqlite.SQLite.GlobalSQLite;
 import com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson.ExportToJson;
 import com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson.ImportFromJson;
-import com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson.JsonIndex;
 import com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson.JsonSQLite;
 import com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson.UtilsJson;
-import com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLCipher;
-import com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLite;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -31,7 +26,6 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.Dictionary;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import net.sqlcipher.Cursor;
 import net.sqlcipher.database.SQLiteDatabase;
@@ -44,27 +38,28 @@ public class Database {
 
     private static final String TAG = Database.class.getName();
     private Boolean _isOpen = false;
-    private String _dbName;
-    private Context _context;
-    private String _mode;
+    private final String _dbName;
+    private final Context _context;
+    private final String _mode;
     private String _secret;
-    private Boolean _encrypted;
-    private Boolean _isEncryption;
-    private SharedPreferences _sharedPreferences;
-    private File _file;
-    private int _version;
-    private GlobalSQLite _globVar;
+    private final Boolean _encrypted;
+    private final Boolean _isEncryption;
+    private final SharedPreferences _sharedPreferences;
+    private final Boolean _readOnly;
+    private final File _file;
+    private final int _version;
+    private final GlobalSQLite _globVar;
     private SupportSQLiteDatabase _db = null;
-    private UtilsSQLite _uSqlite;
-    private UtilsSQLCipher _uCipher;
-    private UtilsFile _uFile;
-    private UtilsJson _uJson;
-    private UtilsUpgrade _uUpg;
-    private UtilsDrop _uDrop;
-    private UtilsSecret _uSecret;
+    private final UtilsSQLite _uSqlite;
+    private final UtilsSQLCipher _uCipher;
+    private final UtilsFile _uFile;
+    private final UtilsJson _uJson;
+    private final UtilsUpgrade _uUpg;
+    private final UtilsDrop _uDrop;
+    private final UtilsSecret _uSecret;
     private Dictionary<Integer, JSONObject> _vUpgObject = new Hashtable<>();
-    private ImportFromJson fromJson = new ImportFromJson();
-    private ExportToJson toJson = new ExportToJson();
+    private final ImportFromJson fromJson = new ImportFromJson();
+    private final ExportToJson toJson = new ExportToJson();
     private Boolean ncDB = false;
 
     public Database(
@@ -75,7 +70,8 @@ public class Database {
         int version,
         Boolean isEncryption,
         Dictionary<Integer, JSONObject> vUpgObject,
-        SharedPreferences sharedPreferences
+        SharedPreferences sharedPreferences,
+        Boolean readonly
     ) {
         this._context = context;
         this._dbName = dbName;
@@ -85,6 +81,7 @@ public class Database {
         this._version = version;
         this._vUpgObject = vUpgObject;
         this._sharedPreferences = sharedPreferences;
+        this._readOnly = readonly;
         if (dbName.contains("/") && dbName.endsWith("SQLite.db")) {
             this.ncDB = true;
             this._file = new File(dbName);
@@ -171,7 +168,7 @@ public class Database {
             }
         }
         try {
-            if (!isNCDB()) {
+            if (!isNCDB() && !this._readOnly) {
                 _db = SQLiteDatabase.openOrCreateDatabase(_file, password, null);
             } else {
                 _db = SQLiteDatabase.openDatabase(String.valueOf(_file), "", null, SQLiteDatabase.OPEN_READONLY);
@@ -188,64 +185,54 @@ public class Database {
                         _db = null;
                         throw new Exception(msg);
                     }
-                    if (!isNCDB()) {
+                    if (isNCDB() || this._readOnly) {
+                            _isOpen = true;
+                            return;
+                     }
+                     try {
+                        curVersion = _db.getVersion(); // default 0
+                    } catch (IllegalStateException e) {
+                        String msg = "Failed in get/setVersion " + e.getMessage();
+                        Log.v(TAG, msg);
+                        close();
+                        _db = null;
+                        throw new Exception(msg);
+                    } catch (SQLiteException e) {
+                        String msg = "Failed in setVersion " + e.getMessage();
+                        Log.v(TAG, msg);
+                        close();
+                        _db = null;
+                        throw new Exception(msg);
+                    }
+                    if (_version > curVersion && _vUpgObject != null && _vUpgObject.size() > 0) {
+                        //                           if (_vUpgObject != null && _vUpgObject.size() > 0) {
                         try {
-                            curVersion = _db.getVersion();
-                            if (curVersion == 0) {
-                                _db.setVersion(1);
-                                curVersion = _db.getVersion();
-                            }
-                        } catch (IllegalStateException e) {
-                            String msg = "Failed in get/setVersion " + e.getMessage();
-                            Log.v(TAG, msg);
-                            close();
-                            _db = null;
-                            throw new Exception(msg);
-                        } catch (SQLiteException e) {
-                            String msg = "Failed in setVersion " + e.getMessage();
-                            Log.v(TAG, msg);
-                            close();
-                            _db = null;
-                            throw new Exception(msg);
-                        }
-                        if (_version > curVersion && _vUpgObject != null && _vUpgObject.size() > 0) {
-                            //                           if (_vUpgObject != null && _vUpgObject.size() > 0) {
-                            try {
-                                _uUpg.onUpgrade(this, _context, _dbName, _vUpgObject, curVersion, _version);
-                                boolean ret = _uFile.deleteBackupDB(_context, _dbName);
-                                if (!ret) {
-                                    String msg = "Failed in deleteBackupDB backup-\" + _dbName";
-                                    Log.v(TAG, msg);
-                                    close();
-                                    _db = null;
-                                    throw new Exception(msg);
-                                }
-                            } catch (Exception e) {
-                                // restore DB
-                                boolean ret = _uFile.restoreDatabase(_context, _dbName);
-                                String msg = e.getMessage();
-                                if (!ret) msg += "Failed in restoreDatabase " + _dbName;
+                            this._uFile.copyFile(_context, _dbName, "backup-" + _dbName);
+
+                            _uUpg.onUpgrade(this, _vUpgObject, curVersion, _version);
+
+                            boolean ret = _uFile.deleteBackupDB(_context, _dbName);
+                            if (!ret) {
+                                String msg = "Failed in deleteBackupDB backup-\" + _dbName";
                                 Log.v(TAG, msg);
                                 close();
                                 _db = null;
                                 throw new Exception(msg);
                             }
-                            /*                           } else {
-                                try {
-                                    _db.setVersion(_version);
-                                } catch (Exception e) {
-                                    String msg = e.getMessage() + "Failed in setting version " + _version;
-                                    close();
-                                    _db = null;
-                                    throw new Exception(msg);
-                                }
-                            }
-  */
+                        } catch (Exception e) {
+                            // restore DB
+                            boolean ret = _uFile.restoreDatabase(_context, _dbName);
+                            String msg = e.getMessage();
+                            if (!ret) msg += "Failed in restoreDatabase " + _dbName;
+                            Log.v(TAG, msg);
+                            close();
+                            _db = null;
+                            throw new Exception(msg);
                         }
-                        _isOpen = true;
-                        return;
                     }
-                } else {
+                    _isOpen = true;
+                    return;
+                 } else {
                     _isOpen = false;
                     _db = null;
                     throw new Exception("Database not opened");
@@ -306,11 +293,7 @@ public class Database {
      * @return the existence of the database on folder
      */
     public boolean isDBExists() {
-        if (_file.exists()) {
-            return true;
-        } else {
-            return false;
-        }
+        return _file.exists();
     }
 
     /**
@@ -524,7 +507,7 @@ public class Database {
                 // Replace DELETE by UPDATE and set sql_deleted to 1
                 Integer wIdx = statement.toUpperCase().indexOf("WHERE");
                 String preStmt = statement.substring(0, wIdx - 1);
-                String clauseStmt = statement.substring(wIdx, statement.length());
+                String clauseStmt = statement.substring(wIdx);
                 String tableName = preStmt.substring(("DELETE FROM").length()).trim();
                 sqlStmt = "UPDATE " + tableName + " SET sql_deleted = 1 " + clauseStmt;
                 // Find REFERENCES if any and update the sql_deleted column
@@ -738,6 +721,7 @@ public class Database {
             "sql LIKE('%" +
             tableName +
             "%') AND sql LIKE('%ON DELETE%');";
+
         try {
             JSArray references = mDB.selectSQL(sqlStmt, new ArrayList<Object>());
             ArrayList<String> retRefs = new ArrayList<String>();
@@ -794,19 +778,20 @@ public class Database {
                 JSObject row = new JSObject();
                 for (int i = 0; i < c.getColumnCount(); i++) {
                     String colName = c.getColumnName(i);
+                    int index = c.getColumnIndex(colName);
                     int type = c.getType(i);
                     switch (type) {
                         case FIELD_TYPE_STRING:
-                            row.put(colName, c.getString(c.getColumnIndex(colName)));
+                            row.put(colName, c.getString(index));
                             break;
                         case FIELD_TYPE_INTEGER:
-                            row.put(colName, c.getLong(c.getColumnIndex(colName)));
+                            row.put(colName, c.getLong(index));
                             break;
                         case FIELD_TYPE_FLOAT:
-                            row.put(colName, c.getDouble(c.getColumnIndex(colName)));
+                            row.put(colName, c.getDouble(index));
                             break;
                         case FIELD_TYPE_BLOB:
-                            row.put(colName, c.getBlob(c.getColumnIndex(colName)));
+                            row.put(colName, c.getBlob(index));
                             break;
                         case FIELD_TYPE_NULL:
                             row.put(colName, JSONObject.NULL);
@@ -913,6 +898,27 @@ public class Database {
         }
     }
 
+    /**
+     * GetSyncDate method
+     * get the synchronization date
+     *
+     * @return
+     * @throws Exception
+     */
+    public Long getSyncDate() throws Exception {
+        long syncDate = 0;
+        try {
+            boolean isSyncTable = _uJson.isTableExists(this, "sync_table");
+            if (!isSyncTable) {
+                throw new Exception("No sync_table available");
+            }
+            syncDate = toJson.getSyncDate(this);
+            return syncDate;
+        } catch (Exception e) {
+            throw new Exception(e.getMessage());
+        }
+    }
+
     /**
      * SetSyncDate Method
      * Set the synchronization date
@@ -942,27 +948,6 @@ public class Database {
         }
     }
 
-    /**
-     * GetSyncDate method
-     * get the synchronization date
-     *
-     * @return
-     * @throws Exception
-     */
-    public Long getSyncDate() throws Exception {
-        long syncDate = 0;
-        try {
-            boolean isSyncTable = _uJson.isTableExists(this, "sync_table");
-            if (!isSyncTable) {
-                throw new Exception("No sync_table available");
-            }
-            syncDate = toJson.getSyncDate(this);
-            return syncDate;
-        } catch (Exception e) {
-            throw new Exception(e.getMessage());
-        }
-    }
-
     /**
      * Import from Json object
      *