@capacitor-community/sqlite 3.4.2 → 3.4.3-1

package/ios/Plugin/Utils/UtilsUpgrade.swift

@@ -22,7 +22,7 @@ enum UtilsUpgradeError: Error {
     case executeStatementProcessFailed(message: String)
     case executeSetProcessFailed(message: String)
 }
-
+// swiftlint:disable file_length
 // swiftlint:disable type_body_length
 class UtilsUpgrade {
     let utilsDrop: UtilsDrop = UtilsDrop()
@@ -88,6 +88,13 @@ class UtilsUpgrade {
             if statement.count > 0 {
                 _ = try executeStatementProcess(mDB: mDB,
                                                 statement: statement)
+                // -> Drop _temp_tables
+                _ = try UtilsDrop
+                    .dropTempTables(mDB: mDB,
+                                    alterTables: self.alterTables)
+                // -> Do some cleanup
+                self.alterTables = [:]
+                self.commonColumns = [:]
 
                 // here we assume that the Set contains only
                 //  - the data for new tables as INSERT statements
@@ -116,6 +123,25 @@ class UtilsUpgrade {
             throw UtilsUpgradeError.onUpgradeFailed(message: msg)
         } catch UtilsUpgradeError.executeStatementProcessFailed(
                     let message) {
+            var msg: String = message
+            do {
+                // -> Drop _temp_tables
+                _ = try UtilsDrop
+                    .dropTempTables(mDB: mDB,
+                                    alterTables: self.alterTables)
+                // -> Do some cleanup
+                self.alterTables = [:]
+                self.commonColumns = [:]
+
+            } catch UtilsDropError.dropTempTablesFailed(let message) {
+                msg += ": \(message)"
+                throw UtilsUpgradeError.onUpgradeFailed(
+                    message: message)
+            }
+
+            throw UtilsUpgradeError.onUpgradeFailed(
+                message: message)
+        } catch UtilsDropError.dropTempTablesFailed(let message) {
             throw UtilsUpgradeError.onUpgradeFailed(
                 message: message)
         } catch UtilsUpgradeError.executeSetProcessFailed(
@@ -194,6 +220,7 @@ class UtilsUpgrade {
     throws {
         var changes: Int = -1
         do {
+
             // -> backup all existing tables  "tableName" in
             //    "temp_tableName"
             _ = try backupTables(mDB: mDB)
@@ -216,13 +243,6 @@ class UtilsUpgrade {
             // -> Update the new table's data from old table's data
             _ = try updateNewTablesData(mDB: mDB)
 
-            // -> Drop _temp_tables
-            _ = try UtilsDrop
-                .dropTempTables(mDB: mDB,
-                                alterTables: self.alterTables)
-            // -> Do some cleanup
-            self.alterTables = [:]
-            self.commonColumns = [:]
         } catch UtilsUpgradeError.backupTablesFailed(let message) {
             throw UtilsUpgradeError.executeStatementProcessFailed(
                 message: message)
@@ -243,9 +263,6 @@ class UtilsUpgrade {
                     let message) {
             throw UtilsUpgradeError.executeStatementProcessFailed(
                 message: message)
-        } catch UtilsDropError.dropTempTablesFailed(let message) {
-            throw UtilsUpgradeError.executeStatementProcessFailed(
-                message: message)
         }
 
     }
@@ -276,9 +293,12 @@ class UtilsUpgrade {
             columnNames = try getTableColumnNames(mDB: mDB,
                                                   tableName: tableName)
             alterTables["\(tableName)"] = columnNames
+            let tmpTable = "_temp_\(tableName)"
+            let delStmt: String  = "DROP TABLE IF EXISTS \(tmpTable);"
+            _ = try mDB.runSQL(sql: delStmt, values: [])
             // prefix the table with _temp_
             var stmt: String = "ALTER TABLE \(tableName) RENAME "
-            stmt.append("TO _temp_\(tableName);")
+            stmt.append("TO \(tmpTable);")
             let retRun: [String: Int64] = try mDB.runSQL(
                 sql: stmt, values: [])
             guard let changes: Int64 = retRun["changes"] else {
@@ -392,3 +412,4 @@ class UtilsUpgrade {
     }
 }
 // swiftlint:enable type_body_length
+// swiftlint:enable file_length

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "3.4.2",
+  "version": "3.4.3-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.4.2",
-    "@capacitor/core": "^3.4.2",
+    "@capacitor/android": "^3.4.3",
+    "@capacitor/core": "^3.4.3",
     "@capacitor/docgen": "^0.0.17",
-    "@capacitor/ios": "^3.4.2",
+    "@capacitor/ios": "^3.4.3",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
@@ -74,7 +74,7 @@
     "typescript": "~4.0.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "~3.4.2"
+    "@capacitor/core": "~3.4.3"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",
@@ -93,6 +93,6 @@
     }
   },
   "dependencies": {
-    "jeep-sqlite": "^1.4.1"
+    "jeep-sqlite": "^1.4.2"
   }
 }