@capacitor-community/sqlite 3.4.3 → 3.5.1-2

package/README.md

@@ -51,7 +51,7 @@ The main change is related to the delete table's rows when a synchronization tab
 
 - In the JSON object outputs by the `exportToJson`, all the deleted rows in your local database have got the `sql_deleted` column set to 1 to help in your synchronization management process with the remote server database. A system `last_exported_date` is automatically saved in the synchronization table at the start of the export process flow.
 
-- On successfull completion of your synchronization management process with the remote server database, you must 
+- On successful completion of your synchronization management process with the remote server database, you must 
   - Set a new synchronization date (as `(new Date()).toISOString()`) with the `setSyncDate` method.
   - Execute the `deleteExportedRows` method which physically deletes all table's rows having 1 as value for the `sql_deleted` column prior to the `last_exported_date` in your local database.
 
@@ -465,6 +465,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <a href="https://github.com/tobiasmuecksch"><img src="https://github.com/tobiasmuecksch.png?size=100" width="50" height="50" /></a>
   <a href="https://github.com/dragermrb"><img src="https://github.com/dragermrb.png?size=100" width="50" height="50" /></a>
   <a href="https://github.com/iamcco"><img src="https://github.com/iamcco.png?size=100" width="50" height="50" /></a>
+  <a href="https://github.com/eltociear"><img src="https://github.com/eltociear.png?size=100" width="50" height="50" /></a>
 </p>
 
 <!-- markdownlint-enable -->

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

@@ -517,7 +517,8 @@ public class Database {
         String sqlStmt = statement;
         try {
             Boolean isLast = _uJson.isLastModified(mDB);
-            if (isLast) {
+            Boolean isDel = _uJson.isSqlDeleted(mDB);
+            if (isLast && isDel) {
                 // Replace DELETE by UPDATE and set sql_deleted to 1
                 Integer wIdx = statement.toUpperCase().indexOf("WHERE");
                 String preStmt = statement.substring(0, wIdx - 1);
@@ -770,7 +771,8 @@ public class Database {
         boolean isExists = _uJson.isTableExists(this, "sync_table");
         if (!isExists) {
             boolean isLastModified = _uJson.isLastModified(this);
-            if (isLastModified) {
+            boolean isSqlDeleted = _uJson.isSqlDeleted(this);
+            if (isLastModified && isSqlDeleted) {
                 Date date = new Date();
                 long syncTime = date.getTime() / 1000L;
                 String[] statements = {

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

@@ -159,6 +159,7 @@ public class ImportFromJson {
         ArrayList<String> statements = new ArrayList<>();
         String stmt = new StringBuilder("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").toString();
         Boolean isLastModified = false;
+        Boolean isSqlDeleted = false;
         for (int j = 0; j < mSchema.size(); j++) {
             if (j == mSchema.size() - 1) {
                 if (mSchema.get(j).getColumn() != null) {
@@ -167,6 +168,9 @@ public class ImportFromJson {
                     if (mSchema.get(j).getColumn().equals("last_modified")) {
                         isLastModified = true;
                     }
+                    if (mSchema.get(j).getColumn().equals("sql_deleted")) {
+                        isSqlDeleted = true;
+                    }
                 } else if (mSchema.get(j).getForeignkey() != null) {
                     stmt =
                         new StringBuilder(stmt)
@@ -196,6 +200,9 @@ public class ImportFromJson {
                     if (mSchema.get(j).getColumn().equals("last_modified")) {
                         isLastModified = true;
                     }
+                    if (mSchema.get(j).getColumn().equals("sql_deleted")) {
+                        isSqlDeleted = true;
+                    }
                 } else if (mSchema.get(j).getForeignkey() != null) {
                     stmt =
                         new StringBuilder(stmt)
@@ -219,7 +226,7 @@ public class ImportFromJson {
         }
         stmt = new StringBuilder(stmt).append(");").toString();
         statements.add(stmt);
-        if (isLastModified) {
+        if (isLastModified && isSqlDeleted) {
             // create trigger last_modified associated with the table
             String stmtTrigger = new StringBuilder("CREATE TRIGGER IF NOT EXISTS ")
                 .append(tableName)

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

@@ -19,6 +19,12 @@ public class UtilsJson {
     private JsonView uJView = new JsonView();
     private UtilsDrop _uDrop = new UtilsDrop();
 
+    /**
+     * Check existence of last_modified column
+     * @param db
+     * @return
+     * @throws Exception
+     */
     public boolean isLastModified(Database db) throws Exception {
         if (!db.isOpen()) {
             throw new Exception("isLastModified: Database not opened");
@@ -40,6 +46,33 @@ public class UtilsJson {
         }
     }
 
+    /**
+     * Check existence of sql_deleted column
+     * @param db
+     * @return
+     * @throws Exception
+     */
+    public boolean isSqlDeleted(Database db) throws Exception {
+        if (!db.isOpen()) {
+            throw new Exception("isSqlDeleted: Database not opened");
+        }
+        boolean ret = false;
+        try {
+            List<String> tables = _uDrop.getTablesNames(db);
+            for (String tableName : tables) {
+                JSObject namesTypes = getTableColumnNamesTypes(db, tableName);
+                ArrayList<String> colNames = (ArrayList<String>) namesTypes.get("names");
+                if (colNames.contains("sql_deleted")) {
+                    ret = true;
+                    break;
+                }
+            }
+            return ret;
+        } catch (Exception e) {
+            throw new Exception("isSqlDeleted: " + e.getMessage());
+        }
+    }
+
     /**
      * Check if a table exists
      *

package/electron/dist/plugin.js

@@ -429,12 +429,7 @@ class UtilsSQLite {
             if (values != null && values.length > 0) {
                 mVal = await this.replaceUndefinedByNull(values);
             }
-            if (mVal.length > 0) {
-                await db.run(sqlStmt, mVal);
-            }
-            else {
-                await db.exec(sqlStmt);
-            }
+            await this.runExec(db, sqlStmt, mVal);
             lastId = await this.getLastId(db);
             return Promise.resolve(lastId);
         }
@@ -442,6 +437,30 @@ class UtilsSQLite {
             return Promise.reject(`PrepareRun: ${err}`);
         }
     }
+    async runExec(db, stmt, values = []) {
+        return new Promise((resolve, reject) => {
+            if (values != null && values.length > 0) {
+                db.run(stmt, values, (err) => {
+                    if (err) {
+                        reject(err.message);
+                    }
+                    else {
+                        resolve();
+                    }
+                });
+            }
+            else {
+                db.exec(stmt, (err) => {
+                    if (err) {
+                        reject(err.message);
+                    }
+                    else {
+                        resolve();
+                    }
+                });
+            }
+        });
+    }
     /**
      * replaceUndefinedByNull
      * @param values
@@ -470,7 +489,8 @@ class UtilsSQLite {
         let sqlStmt = statement;
         try {
             const isLast = await this.isLastModified(db, true);
-            if (isLast) {
+            const isDel = await this.isSqlDeleted(db, true);
+            if (isLast && isDel) {
                 // Replace DELETE by UPDATE and set sql_deleted to 1
                 const wIdx = statement.toUpperCase().indexOf('WHERE');
                 const preStmt = statement.substring(0, wIdx - 1);
@@ -671,6 +691,29 @@ class UtilsSQLite {
             return Promise.reject(`isLastModified: ${err}`);
         }
     }
+    /**
+     * isSqlDeleted
+     * @param db
+     * @param isOpen
+     */
+    async isSqlDeleted(db, isOpen) {
+        if (!isOpen) {
+            return Promise.reject('isSqlDeleted: database not opened');
+        }
+        try {
+            const tableList = await this.getTablesNames(db);
+            for (const table of tableList) {
+                const tableNamesTypes = await this.getTableColumnNamesTypes(db, table);
+                const tableColumnNames = tableNamesTypes.names;
+                if (tableColumnNames.includes('sql_deleted')) {
+                    return Promise.resolve(true);
+                }
+            }
+        }
+        catch (err) {
+            return Promise.reject(`isSqlDeleted: ${err}`);
+        }
+    }
     /**
      * GetTableColumnNamesTypes
      * @param mDB
@@ -820,6 +863,7 @@ class UtilsJson {
     async createSchemaStatement(jsonData) {
         const statements = [];
         let isLastModified = false;
+        let isSqlDeleted = false;
         // Prepare the statement to execute
         try {
             for (const jTable of jsonData.tables) {
@@ -833,6 +877,9 @@ class UtilsJson {
                                 if (jTable.schema[j].column === 'last_modified') {
                                     isLastModified = true;
                                 }
+                                if (jTable.schema[j].column === 'sql_deleted') {
+                                    isSqlDeleted = true;
+                                }
                             }
                             else if (jTable.schema[j].foreignkey) {
                                 statements.push(`FOREIGN KEY (${jTable.schema[j].foreignkey}) ${jTable.schema[j].value}`);
@@ -847,6 +894,9 @@ class UtilsJson {
                                 if (jTable.schema[j].column === 'last_modified') {
                                     isLastModified = true;
                                 }
+                                if (jTable.schema[j].column === 'sql_deleted') {
+                                    isSqlDeleted = true;
+                                }
                             }
                             else if (jTable.schema[j].foreignkey) {
                                 statements.push(`FOREIGN KEY (${jTable.schema[j].foreignkey}) ${jTable.schema[j].value},`);
@@ -857,7 +907,7 @@ class UtilsJson {
                         }
                     }
                     statements.push(');');
-                    if (isLastModified) {
+                    if (isLastModified && isSqlDeleted) {
                         // create trigger last_modified associated with the table
                         let trig = 'CREATE TRIGGER IF NOT EXISTS ';
                         trig += `${jTable.name}`;
@@ -3443,7 +3493,8 @@ class Database {
             const retB = await this.jsonUtil.isTableExists(this.database, isOpen, 'sync_table');
             if (!retB) {
                 const isLastModified = await this.sqliteUtil.isLastModified(this.database, isOpen);
-                if (isLastModified) {
+                const isSqlDeleted = await this.sqliteUtil.isSqlDeleted(this.database, isOpen);
+                if (isLastModified && isSqlDeleted) {
                     const date = Math.round(new Date().getTime() / 1000);
                     let stmts = `
                           CREATE TABLE IF NOT EXISTS sync_table (