@capacitor-community/sqlite 3.4.2-5 → 3.4.3-2

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

@@ -4,8 +4,10 @@ import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.community.database.sqlite.NotificationCenter;
 import com.getcapacitor.community.database.sqlite.SQLite.Database;
+import com.getcapacitor.community.database.sqlite.SQLite.UtilsDrop;
 import com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLite;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +19,7 @@ public class ExportToJson {
     private static final String TAG = ImportFromJson.class.getName();
     private UtilsJson uJson = new UtilsJson();
     private UtilsSQLite uSqlite = new UtilsSQLite();
+    private UtilsDrop _uDrop = new UtilsDrop();
 
     /**
      * Notify progress export event
@@ -32,6 +35,96 @@ public class ExportToJson {
         NotificationCenter.defaultCenter().postNotification("exportJsonProgress", info);
     }
 
+    /**
+     * GetLastExportDate method
+     * get the last export date
+     *
+     * @return
+     * @throws Exception
+     */
+    public Long getLastExportDate(Database mDb) throws Exception {
+        long lastExportDate = -1;
+        String stmt = "SELECT sync_date FROM sync_table WHERE id = 2;";
+        JSArray retQuery = new JSArray();
+
+        try {
+            boolean isSyncTable = uJson.isTableExists(mDb, "sync_table");
+            if (!isSyncTable) {
+                throw new Exception("GetSyncDate: No sync_table available");
+            }
+            retQuery = mDb.selectSQL(stmt, new ArrayList<Object>());
+            List<JSObject> lQuery = retQuery.toList();
+            if (lQuery.size() == 1) {
+                long syncDate = lQuery.get(0).getLong("sync_date");
+                if (syncDate > 0) lastExportDate = syncDate;
+            }
+        } catch (Exception e) {
+            throw new Exception("GetSyncDate: " + e.getMessage());
+        } finally {
+            return lastExportDate;
+        }
+    }
+
+    public void setLastExportDate(Database mDb, Long sTime) throws Exception {
+        try {
+            boolean isSyncTable = uJson.isTableExists(mDb, "sync_table");
+            if (!isSyncTable) {
+                throw new Exception("SetLastExportDate: No sync_table available");
+            }
+            String stmt = "";
+            Long lastExportDate = getLastExportDate(mDb);
+            if (lastExportDate > 0) {
+                stmt = "UPDATE sync_table SET sync_date = " + sTime + " WHERE id = 2;";
+            } else {
+                stmt = "INSERT INTO sync_table (sync_date) VALUES (" + sTime + ");";
+            }
+            long lastId = mDb.prepareSQL(stmt, new ArrayList<>(), false);
+            if (lastId < 0) {
+                throw new Exception("SetLastExportDate: lastId < 0");
+            }
+            return;
+        } catch (Exception e) {
+            throw new Exception("SetLastExportDate: " + e.getMessage());
+        }
+    }
+
+    /**
+     * Delete Exported Rows
+     * @throws Exception
+     */
+    public void delExportedRows(Database mDb) throws Exception {
+        try {
+            // check if 'sync_table' exists
+            boolean isSyncTable = uJson.isTableExists(mDb, "sync_table");
+            if (!isSyncTable) {
+                throw new Exception("DelExportedRows: No sync_table available");
+            }
+            // get the last export date
+            long lastExportDate = getLastExportDate(mDb);
+            if (lastExportDate < 0) {
+                throw new Exception("DelExportedRows: No last exported date available");
+            }
+            // get the table' name list
+            List<String> tables = _uDrop.getTablesNames(mDb);
+            if (tables.size() == 0) {
+                throw new Exception("DelExportedRows: No table's names returned");
+            }
+            // Loop through the tables
+            for (String table : tables) {
+                long lastId = -1;
+                // define the delete statement
+                String delStmt = "DELETE FROM " + table + " WHERE sql_deleted = 1 " + "AND last_modified < " + lastExportDate + ";";
+                lastId = mDb.prepareSQL(delStmt, new ArrayList<>(), true);
+                if (lastId < 0) {
+                    throw new Exception("SetLastExportDate: lastId < 0");
+                }
+            }
+            return;
+        } catch (Exception e) {
+            throw new Exception("DelExportedRows: " + e.getMessage());
+        }
+    }
+
     /**
      * Create Export Json Object from Database (Schema, Data)
      * @param db
@@ -149,7 +242,7 @@ public class ExportToJson {
 
                 // create Table's Data
                 String query = "SELECT * FROM " + tableName + ";";
-                ArrayList<ArrayList<Object>> values = getValues(mDb, query, tableName);
+                ArrayList<ArrayList<Object>> values = uJson.getValues(mDb, query, tableName);
 
                 table.setName(tableName);
                 if (schema.size() != 0) {
@@ -388,87 +481,6 @@ public class ExportToJson {
         }
     }
 
-    /**
-     * Get Tables Values
-     * @param mDb
-     * @param query
-     * @param tableName
-     * @return
-     * @throws Exception
-     */
-    private ArrayList<ArrayList<Object>> getValues(Database mDb, String query, String tableName) throws Exception {
-        ArrayList<ArrayList<Object>> values = new ArrayList<>();
-        try {
-            JSObject tableNamesTypes = uJson.getTableColumnNamesTypes(mDb, tableName);
-            ArrayList<String> rowNames = new ArrayList<>();
-            ArrayList<String> rowTypes = new ArrayList<>();
-            if (tableNamesTypes.has("names")) {
-                rowNames = (ArrayList<String>) tableNamesTypes.get("names");
-            } else {
-                throw new Exception("GetValues: Table " + tableName + " no names");
-            }
-            if (tableNamesTypes.has("types")) {
-                rowTypes = (ArrayList<String>) tableNamesTypes.get("types");
-            } else {
-                throw new Exception("GetValues: Table " + tableName + " no types");
-            }
-            JSArray retValues = mDb.selectSQL(query, new ArrayList<Object>());
-            List<JSObject> lValues = retValues.toList();
-            if (lValues.size() > 0) {
-                for (int j = 0; j < lValues.size(); j++) {
-                    ArrayList<Object> row = new ArrayList<>();
-                    for (int k = 0; k < rowNames.size(); k++) {
-                        String nType = rowTypes.get(k);
-                        String nName = rowNames.get(k);
-
-                        //                       if (nType.equals("INTEGER")) {
-                        if (lValues.get(j).has(nName)) {
-                            Object obj = lValues.get(j).get(nName);
-                            if (obj.toString().equals("null")) {
-                                row.add(JSONObject.NULL);
-                            } else if (obj instanceof Long) {
-                                row.add(lValues.get(j).getLong(nName));
-                            } else if (obj instanceof String) {
-                                row.add(lValues.get(j).getString(nName));
-                            } else if (obj instanceof Double) {
-                                row.add(lValues.get(j).getDouble(nName));
-                            }
-                        } else {
-                            String msg = "GetValues: value is not (string, nsnull," + "int64,double";
-                            throw new Exception("GetValues: " + msg);
-                        }
-                        /*                       } else if (nType.equals("REAL")) {
-                            if (lValues.get(j).has(nName)) {
-                                Object obj = lValues.get(j).get(nName);
-                                if (obj instanceof Double) {
-                                    row.add(lValues.get(j).getDouble(nName));
-                                }
-                                if (obj instanceof String) {
-                                    row.add(lValues.get(j).getString(nName));
-                                }
-                            } else {
-                                row.add(null);
-                            }
-                        } else {
-                            if (lValues.get(j).has(nName)) {
-                                row.add(lValues.get(j).getString(nName));
-                            } else {
-                                row.add(null);
-                            }
-
-                        }
-                    */
-                    }
-                    values.add(row);
-                }
-            }
-        } catch (Exception e) {
-            throw new Exception("GetValues: " + e.getMessage());
-        } finally {
-            return values;
-        }
-    }
-
     /**
      * Get Tables when Mode is Partial
      * @param mDb
@@ -548,9 +560,9 @@ public class ExportToJson {
                 if (modTables.getString(tableName).equals("Create")) {
                     query = "SELECT * FROM " + tableName + ";";
                 } else {
-                    query = "SELECT * FROM " + tableName + " WHERE last_modified > " + syncDate + ";";
+                    query = "SELECT * FROM " + tableName + " WHERE last_modified >= " + syncDate + ";";
                 }
-                ArrayList<ArrayList<Object>> values = getValues(mDb, query, tableName);
+                ArrayList<ArrayList<Object>> values = uJson.getValues(mDb, query, tableName);
 
                 // check the table object validity
                 table.setName(tableName);
@@ -625,9 +637,13 @@ public class ExportToJson {
      */
     public Long getSyncDate(Database mDb) throws Exception {
         long ret = -1;
-        String stmt = "SELECT sync_date FROM sync_table;";
+        String stmt = "SELECT sync_date FROM sync_table WHERE id = 1;";
         JSArray retQuery = new JSArray();
         try {
+            boolean isSyncTable = uJson.isTableExists(mDb, "sync_table");
+            if (!isSyncTable) {
+                throw new Exception("No sync_table available");
+            }
             retQuery = mDb.selectSQL(stmt, new ArrayList<Object>());
             List<JSObject> lQuery = retQuery.toList();
             if (lQuery.size() == 1) {
@@ -667,7 +683,7 @@ public class ExportToJson {
                 if (lQuery.size() != 1) break;
                 long totalCount = lQuery.get(0).getLong("count");
                 // get total count of modified since last sync
-                stmt = "SELECT count(*) AS count FROM " + tableName + " WHERE last_modified > " + syncDate + ";";
+                stmt = "SELECT count(*) AS count FROM " + tableName + " WHERE last_modified >= " + syncDate + ";";
                 retQuery = mDb.selectSQL(stmt, new ArrayList<Object>());
                 lQuery = retQuery.toList();
                 if (lQuery.size() != 1) break;

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

@@ -48,15 +48,6 @@ public class ImportFromJson {
         db.getDb().setVersion(version);
 
         if (jsonSQL.getMode().equals("full")) {
-            // Set Foreign Key OFF
-            try {
-                db.getDb().setForeignKeyConstraintsEnabled(false);
-            } catch (IllegalStateException e) {
-                String msg = "CreateDatabaseSchema: ";
-                msg += "setForeignKeyConstraintsEnabled failed ";
-                msg += e.getMessage();
-                throw new Exception(msg);
-            }
             try {
                 _uDrop.dropAll(db);
             } catch (Exception e) {
@@ -64,15 +55,6 @@ public class ImportFromJson {
                 throw new Exception(msg);
             }
         }
-        // Set Foreign Key ON
-        try {
-            db.getDb().setForeignKeyConstraintsEnabled(true);
-        } catch (IllegalStateException e) {
-            String msg = "CreateDatabaseSchema: ";
-            msg += "setForeignKeyConstraintsEnabled failed ";
-            msg += e.getMessage();
-            throw new Exception(msg);
-        }
         try {
             changes = createSchema(db, jsonSQL);
             notifyImportProgressEvent("Schema creation completed changes: " + changes);
@@ -245,7 +227,7 @@ public class ImportFromJson {
                 .append(" AFTER UPDATE ON ")
                 .append(tableName)
                 .append(" FOR EACH ROW ")
-                .append("WHEN NEW.last_modified <= " + "OLD.last_modified BEGIN ")
+                .append("WHEN NEW.last_modified < " + "OLD.last_modified BEGIN ")
                 .append("UPDATE ")
                 .append(tableName)
                 .append(" SET last_modified = (strftime('%s','now')) ")
@@ -401,11 +383,18 @@ public class ImportFromJson {
                 // Check row validity remove to accept RDBMS types
                 //                _uJson.checkRowValidity(mDb, tColNames, tColTypes, row, j, tableName);
                 // Create INSERT or UPDATE Statements
+                Boolean isRun = true;
                 String stmt = createRowStatement(mDb, tColNames, tColTypes, row, j, tableName, mode);
-                // load the values
-                long lastId = mDb.prepareSQL(stmt, row);
-                if (lastId < 0) {
-                    throw new Exception("CreateTableData: lastId < 0");
+                isRun = checkUpdate(mDb, stmt, row, tableName, tColNames, tColTypes);
+                if (isRun) {
+                    // load the values
+                    if (stmt.substring(0, 6).toUpperCase().equals("DELETE")) {
+                        row = new ArrayList<>();
+                    }
+                    long lastId = mDb.prepareSQL(stmt, row, true);
+                    if (lastId < 0) {
+                        throw new Exception("CreateTableData: lastId < 0");
+                    }
                 }
             }
             return;
@@ -416,6 +405,88 @@ public class ImportFromJson {
         }
     }
 
+    /**
+     * Check when UPDATE if the values are updated
+     * @param mDb
+     * @param stmt
+     * @param values
+     * @param tableName
+     * @param tColNames
+     * @param tColTypes
+     * @return
+     * @throws Exception
+     */
+    private Boolean checkUpdate(
+        Database mDb,
+        String stmt,
+        ArrayList<Object> values,
+        String tableName,
+        ArrayList<String> tColNames,
+        ArrayList<String> tColTypes
+    ) throws Exception {
+        Boolean isRun = true;
+        if (stmt.substring(0, 6).equals("UPDATE")) {
+            StringBuilder sbQuery = new StringBuilder("SELECT * FROM ").append(tableName).append(" WHERE ").append(tColNames.get(0));
+
+            if (values.get(0) instanceof String) {
+                sbQuery.append(" = '").append(values.get(0)).append("';");
+            } else {
+                sbQuery.append(" = ").append(values.get(0)).append(";");
+            }
+            String query = sbQuery.toString();
+
+            try {
+                ArrayList<ArrayList<Object>> resValues = _uJson.getValues(mDb, query, tableName);
+                if (resValues.size() > 0) {
+                    isRun = checkValues(values, resValues.get(0));
+                } else {
+                    throw new Exception("CheckUpdate: CheckUpdate statement returns nothing");
+                }
+            } catch (Exception e) {
+                throw new Exception("CheckUpdate: " + e.getMessage());
+            }
+        }
+        return isRun;
+    }
+
+    /**
+     * Check Values
+     * @param values
+     * @param nValues
+     * @return
+     * @throws Exception
+     */
+    private Boolean checkValues(ArrayList<Object> values, ArrayList<Object> nValues) throws Exception {
+        if (values.size() > 0 && nValues.size() > 0 && values.size() == nValues.size()) {
+            for (int i = 0; i < values.size(); i++) {
+                if (nValues.get(i) instanceof String) {
+                    if (!values.get(i).equals(nValues.get(i))) {
+                        return true;
+                    }
+                } else if (nValues.get(i) instanceof Long && values.get(i) instanceof Integer) {
+                    //            int iVal = (Integer) values.get(i);
+                    long lVal = (Integer) values.get(i);
+                    //            long nlVal = (Long) nValues.get(i);
+                    if (lVal != (Long) nValues.get(i)) {
+                        return true;
+                    }
+                } else if (nValues.get(i) instanceof Double && values.get(i) instanceof Integer) {
+                    double dVal = (Integer) values.get(i);
+                    if (dVal != (Double) nValues.get(i)) {
+                        return true;
+                    }
+                } else {
+                    if (values.get(i) != nValues.get(i)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        } else {
+            throw new Exception("CheckValues: Both arrays not the same length");
+        }
+    }
+
     /**
      * Create the Row Statement to load the data
      * @param mDb
@@ -463,23 +534,41 @@ public class ImportFromJson {
                     .append(");")
                     .toString();
         } else {
-            // Update
-            String setString = _uJson.setNameForUpdate(tColNames);
-            if (setString.length() == 0) {
-                throw new Exception(msg + j + "setString is empty");
+            Boolean isUpdate = true;
+            Integer idxDelete = tColNames.indexOf("sql_deleted");
+            if (idxDelete >= 0) {
+                if (row.get(idxDelete).equals(1)) {
+                    // Delete
+                    isUpdate = false;
+                    stmt =
+                        new StringBuilder("DELETE FROM ")
+                            .append(tableName)
+                            .append(" WHERE ")
+                            .append(tColNames.get(0))
+                            .append(" = ")
+                            .append(row.get(0))
+                            .toString();
+                }
             }
-            Object key = tColNames.get(0);
-            StringBuilder sbQuery = new StringBuilder("UPDATE ")
-                .append(tableName)
-                .append(" SET ")
-                .append(setString)
-                .append(" WHERE ")
-                .append(tColNames.get(0))
-                .append(" = ");
+            if (isUpdate) {
+                // Update
+                String setString = _uJson.setNameForUpdate(tColNames);
+                if (setString.length() == 0) {
+                    throw new Exception(msg + j + "setString is empty");
+                }
+                Object key = tColNames.get(0);
+                StringBuilder sbQuery = new StringBuilder("UPDATE ")
+                    .append(tableName)
+                    .append(" SET ")
+                    .append(setString)
+                    .append(" WHERE ")
+                    .append(tColNames.get(0))
+                    .append(" = ");
 
-            if (key instanceof Integer) sbQuery.append(row.get(0)).append(";");
-            if (key instanceof String) sbQuery.append("'").append(row.get(0)).append("';");
-            stmt = sbQuery.toString();
+                if (key instanceof Integer) sbQuery.append(row.get(0)).append(";");
+                if (key instanceof String) sbQuery.append("'").append(row.get(0)).append("';");
+                stmt = sbQuery.toString();
+            }
         }
         return stmt;
     }

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

@@ -42,6 +42,7 @@ public class UtilsJson {
 
     /**
      * Check if a table exists
+     *
      * @param db
      * @param tableName
      * @return
@@ -63,6 +64,7 @@ public class UtilsJson {
 
     /**
      * Check if a view exists
+     *
      * @param db
      * @param viewName
      * @return
@@ -84,6 +86,7 @@ public class UtilsJson {
 
     /**
      * Check if the Id already exsists
+     *
      * @param mDb
      * @param tableName
      * @param firstColumnName
@@ -118,6 +121,7 @@ public class UtilsJson {
     /**
      * Create a String from a given Array of Strings with
      * a given separator
+     *
      * @param arr
      * @param sep
      * @return
@@ -137,6 +141,7 @@ public class UtilsJson {
 
     /**
      * Convert ArrayList to JSArray
+     *
      * @param row
      * @return
      */
@@ -150,6 +155,7 @@ public class UtilsJson {
 
     /**
      * Create the ? string for a given values length
+     *
      * @param length
      * @return
      */
@@ -166,6 +172,7 @@ public class UtilsJson {
 
     /**
      * Create the Name string from a given Names array
+     *
      * @param names
      * @return
      */
@@ -182,6 +189,7 @@ public class UtilsJson {
 
     /**
      * Check the values type from fields type
+     *
      * @param types
      * @param values
      * @return
@@ -197,6 +205,7 @@ public class UtilsJson {
 
     /**
      * Check if the the value type is the same than the field type
+     *
      * @param type
      * @param value
      * @return
@@ -223,6 +232,7 @@ public class UtilsJson {
 
     /**
      * Get Field's type and name for a given table
+     *
      * @param mDb
      * @param tableName
      * @return
@@ -254,6 +264,7 @@ public class UtilsJson {
 
     /**
      * Get JSObject keys
+     *
      * @param jsonObject
      * @return
      */
@@ -270,6 +281,7 @@ public class UtilsJson {
 
     /**
      * Check Row validity
+     *
      * @param mDb
      * @param tColNames
      * @param tColTypes
@@ -299,6 +311,7 @@ public class UtilsJson {
 
     /**
      * Check Schema Validity
+     *
      * @param schema
      * @throws Exception
      */
@@ -328,6 +341,7 @@ public class UtilsJson {
 
     /**
      * Check Indexes Validity
+     *
      * @param indexes
      * @throws Exception
      */
@@ -357,6 +371,7 @@ public class UtilsJson {
 
     /**
      * Check Triggers Validity
+     *
      * @param triggers
      * @throws Exception
      */
@@ -386,6 +401,7 @@ public class UtilsJson {
 
     /**
      * Check Views Validity
+     *
      * @param views
      * @throws Exception
      */
@@ -406,4 +422,78 @@ public class UtilsJson {
         }
         return;
     }
+
+    /**
+     * Get Tables Values
+     *
+     * @param mDb
+     * @param query
+     * @param tableName
+     * @return
+     * @throws Exception
+     */
+    public ArrayList<ArrayList<Object>> getValues(Database mDb, String query, String tableName) throws Exception {
+        ArrayList<ArrayList<Object>> values = new ArrayList<>();
+        try {
+            JSObject tableNamesTypes = getTableColumnNamesTypes(mDb, tableName);
+            ArrayList<String> rowNames = new ArrayList<>();
+            ArrayList<String> rowTypes = new ArrayList<>();
+            if (tableNamesTypes.has("names")) {
+                rowNames = (ArrayList<String>) tableNamesTypes.get("names");
+            } else {
+                throw new Exception("GetValues: Table " + tableName + " no names");
+            }
+            if (tableNamesTypes.has("types")) {
+                rowTypes = (ArrayList<String>) tableNamesTypes.get("types");
+            } else {
+                throw new Exception("GetValues: Table " + tableName + " no types");
+            }
+            JSArray retValues = mDb.selectSQL(query, new ArrayList<Object>());
+            List<JSObject> lValues = retValues.toList();
+            if (lValues.size() > 0) {
+                for (int j = 0; j < lValues.size(); j++) {
+                    ArrayList<Object> row = createRowValues(lValues, j, rowNames, rowTypes);
+                    values.add(row);
+                }
+            }
+        } catch (Exception e) {
+            throw new Exception("GetValues: " + e.getMessage());
+        } finally {
+            return values;
+        }
+    }
+
+    /**
+     * Get Table Row Values
+     * @param values
+     * @param pos
+     * @param rowNames
+     * @param rowTypes
+     * @return
+     */
+    public ArrayList<Object> createRowValues(List<JSObject> values, int pos, ArrayList<String> rowNames, ArrayList<String> rowTypes)
+        throws Exception {
+        ArrayList<Object> row = new ArrayList<>();
+        for (int k = 0; k < rowNames.size(); k++) {
+            String nType = rowTypes.get(k);
+            String nName = rowNames.get(k);
+
+            if (values.get(pos).has(nName)) {
+                Object obj = values.get(pos).get(nName);
+                if (obj.toString().equals("null")) {
+                    row.add(JSONObject.NULL);
+                } else if (obj instanceof Long) {
+                    row.add(values.get(pos).getLong(nName));
+                } else if (obj instanceof String) {
+                    row.add(values.get(pos).getString(nName));
+                } else if (obj instanceof Double) {
+                    row.add(values.get(pos).getDouble(nName));
+                }
+            } else {
+                String msg = "value is not (string, nsnull," + "int64,double";
+                throw new Exception("CreateRowValues: " + msg);
+            }
+        }
+        return row;
+    }
 }

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

@@ -150,15 +150,15 @@ public class UtilsUpgrade {
 
             // -> Update the new table's data from old table's data
             updateNewTablesData(db);
-
+        } catch (Exception e) {
+            throw new Exception("Error: executeStatementProcess " + " failed " + e);
+        } finally {
             // -> Drop _temp_tables
             _uDrop.dropTempTables(db, _alterTables);
 
             // -> Do some cleanup
             _alterTables = new Hashtable<>();
             _commonColumns = new Hashtable<>();
-        } catch (Exception e) {
-            throw new Exception("Error: executeStatementProcess " + " failed " + e);
         }
     }
 
@@ -194,9 +194,13 @@ public class UtilsUpgrade {
             // get the column's name
             List<String> colNames = getColumnNames(db, table);
             _alterTables.put(table, colNames);
+            // Delete _temp_table if exists
+            String tmpTable = "_temp_" + table;
+            String delStmt = "DROP TABLE IF EXISTS " + tmpTable + ";";
+            db.runSQL(delStmt, new ArrayList<>());
             // prefix the table with _temp_
             String stmt = "ALTER TABLE " + table + " RENAME ";
-            stmt += "TO _temp_" + table + ";";
+            stmt += "TO " + tmpTable + ";";
             JSObject ret = db.runSQL(stmt, new ArrayList<>());
             long lastId = ret.getLong("lastId");
             if (lastId == -1) {