@capacitor-community/sqlite 3.5.0 → 3.5.1-1

package/ios/Plugin/Database.swift

@@ -467,7 +467,8 @@ class Database {
             if !isExists {
                 // check if there are tables with last_modified column
                 let isLastModified: Bool = try UtilsJson.isLastModified(mDB: self)
-                if isLastModified {
+                let isSqlDeleted: Bool = try UtilsJson.isSqlDeleted(mDB: self)
+                if isLastModified && isSqlDeleted {
                     let date = Date()
                     let syncTime: Int = Int(date.timeIntervalSince1970)
                     var stmt: String = "CREATE TABLE IF NOT EXISTS "
@@ -486,6 +487,8 @@ class Database {
             }
         } catch UtilsJsonError.isLastModified(let message) {
             throw DatabaseError.createSyncTable(message: message)
+        } catch UtilsJsonError.isSqlDeleted(let message) {
+            throw DatabaseError.createSyncTable(message: message)
         } catch UtilsJsonError.tableNotExists(let message) {
             throw DatabaseError.createSyncTable(message: message)
         } catch DatabaseError.executeSQL(let message) {

package/ios/Plugin/ImportExportJson/ImportFromJson.swift

@@ -186,12 +186,15 @@ class ImportFromJson {
 
     // MARK: - ImportFromJson - CreateTableSchema
 
+    // swiftlint:disable function_body_length
+    // swiftlint:disable cyclomatic_complexity
     class func createTableSchema(mSchema: [JsonColumn],
                                  tableName: String, mode: String)
     -> [String] {
         var statements: [String] = []
         var stmt: String
         var isLastModified: Bool = false
+        var isSqlDeleted: Bool = false
         stmt = "CREATE TABLE IF NOT EXISTS "
         stmt.append(tableName)
         stmt.append(" (")
@@ -201,6 +204,9 @@ class ImportFromJson {
                     if jSchColumn == "last_modified" {
                         isLastModified = true
                     }
+                    if jSchColumn == "sql_deleted" {
+                        isSqlDeleted = true
+                    }
                     stmt.append(jSchColumn)
                 }
             }
@@ -222,7 +228,7 @@ class ImportFromJson {
         }
         stmt.append(");")
         statements.append(stmt)
-        if isLastModified {
+        if isLastModified && isSqlDeleted {
             // create trigger last_modified associated with the table
             let triggerName: String = tableName + "_trigger_last_modified"
             stmt = "CREATE TRIGGER IF NOT EXISTS "
@@ -240,6 +246,8 @@ class ImportFromJson {
         }
         return statements
     }
+    // swiftlint:enable cyclomatic_complexity
+    // swiftlint:enable function_body_length
 
     // MARK: - ImportFromJson - CreateTableIndexes
 

package/ios/Plugin/Utils/UtilsJson.swift

@@ -18,6 +18,7 @@ enum UtilsJsonError: Error {
     case validateTriggers(message: String)
     case validateViews(message: String)
     case isLastModified(message: String)
+    case isSqlDeleted(message: String)
     case checkUpdate(message: String)
     case checkValues(message: String)}
 
@@ -81,6 +82,33 @@ class UtilsJson {
         return ret
     }
 
+    // MARK: - ImportFromJson - IsSqlDeleted
+
+    class func isSqlDeleted(mDB: Database) throws -> Bool {
+        var msg: String = "Error SqlDeleted: "
+        if !mDB.isDBOpen() {
+            msg.append("Database not opened")
+            throw UtilsJsonError.isSqlDeleted(message: msg)
+        }
+        var ret: Bool = false
+        do {
+            let tableList: [String] = try UtilsDrop.getTablesNames(mDB: mDB)
+            for table in tableList {
+                let namesTypes: JsonNamesTypes = try getTableColumnNamesTypes(mDB: mDB,
+                                                                              tableName: table)
+                if namesTypes.names.contains("sql_deleted") {
+                    ret = true
+                    break
+                }
+            }
+        } catch UtilsJsonError.getTableColumnNamesTypes(let message) {
+            throw UtilsJsonError.isSqlDeleted(message: message)
+        } catch UtilsDropError.getTablesNamesFailed(let message) {
+            throw UtilsJsonError.isSqlDeleted(message: message)
+        }
+        return ret
+    }
+
     // MARK: - ImportFromJson - IsViewExists
 
     class func isViewExists(mDB: Database, viewName: String)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "3.5.0",
+  "version": "3.5.1-1",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -55,10 +55,10 @@
     "prepublishOnly": "npm run build && npm run build-electron && npm run docgen"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.5.0",
-    "@capacitor/core": "^3.5.0",
+    "@capacitor/android": "^3.5.1",
+    "@capacitor/core": "^3.5.1",
     "@capacitor/docgen": "^0.0.17",
-    "@capacitor/ios": "^3.5.0",
+    "@capacitor/ios": "^3.5.1",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
@@ -93,6 +93,6 @@
     }
   },
   "dependencies": {
-    "jeep-sqlite": "^1.5.1"
+    "jeep-sqlite": "^1.5.2"
   }
 }