@capacitor-community/sqlite 3.3.3-4 → 3.4.0-1

package/ios/Plugin/Database.swift

@@ -84,7 +84,7 @@ class Database {
     // MARK: - getUrl
 
     func getUrl () -> String {
-        return path
+        return "file://\(path)"
     }
 
     // MARK: - Open
@@ -264,6 +264,16 @@ class Database {
                 throw DatabaseError.executeSQL(
                     message: "Failed in executeSQL : \(msg)" )
             }
+        } else {
+            if transaction {
+                do {
+                    try UtilsSQLCipher
+                        .rollbackTransaction(mDB: self)
+                } catch UtilsSQLCipherError
+                            .rollbackTransaction(let message) {
+                    msg.append(" rollback: \(message)")
+                }
+            }
         }
         return changes
     }
@@ -310,7 +320,7 @@ class Database {
             msg.append(" \(message)")
             throw DatabaseError.execSet(message: msg )
         }
-        if changes > 0 && transaction {
+        if changes >= 0 && transaction {
             // commit the transaction
             do {
                 try UtilsSQLCipher.commitTransaction(mDB: self)
@@ -321,6 +331,7 @@ class Database {
         }
         return changesDict
     }
+    // swiftlint:enable function_body_length
 
     // MARK: - RunSQL
 
@@ -368,8 +379,8 @@ class Database {
                     throw DatabaseError.runSQL(message: msg )
                 }
             }
-            changes = UtilsSQLCipher.dbChanges(mDB: mDb) - initChanges
         }
+        changes = UtilsSQLCipher.dbChanges(mDB: mDb) - initChanges
         let result: [String: Int64] = ["changes": Int64(changes),
                                        "lastId": lastId]
         return result

package/ios/Plugin/Utils/UtilsFile.swift

@@ -29,24 +29,17 @@ enum UtilsFileError: Error {
     case getFolderURLFailed(message: String)
     case createDirFailed(message: String)
     case moveAllDBSQLiteFailed(message: String)
+    case createDatabaseLocationFailed(message: String)
 }
 // swiftlint:disable file_length
 // swiftlint:disable type_body_length
 class UtilsFile {
 
-    // MARK: - IsFileExist
-
-    class func isDirExist(dirPath: String) -> Bool {
-        var isDir: ObjCBool = true
-        let fileManager = FileManager.default
-        let exists = fileManager.fileExists(atPath: dirPath, isDirectory: &isDir)
-        return exists && isDir.boolValue
-    }
-
-    class func createDirCopyDB(url: URL) throws {
+    class func createDatabaseLocation(location: String) throws {
         do {
-            var dirUrl = url
-            let dirPath: String = url.path
+            var dirUrl: URL = try UtilsFile
+                .getFolderURL(folderPath: location)
+            let dirPath: String = dirUrl.path
             if !UtilsFile.isDirExist(dirPath: dirPath) {
                 // create the directory
                 try FileManager.default
@@ -54,20 +47,31 @@ class UtilsFile {
                 // exclude the directory from iCloud Backup
                 try UtilsFile.setExcludeFromiCloudBackup(&dirUrl,
                                                          isExcluded: true)
-                // move all SQLite database from Documents folder
-                // to this new directory
-                try UtilsFile.moveAllDBSQLite(dirUrl: dirUrl)
+                // move all existing dbs from "Documents" to location folder
+                if location.prefix(9) != "Documents" &&
+                    location.prefix(7) != "default" {
+
+                    try UtilsFile.moveAllDBSQLite(dirUrl: dirUrl)
+                }
             }
         } catch UtilsFileError.getFolderURLFailed(let message) {
-            throw UtilsFileError.createDirFailed(message: message)
+            throw UtilsFileError.createDatabaseLocationFailed(message: message)
         } catch UtilsFileError.moveAllDBSQLiteFailed(let message) {
-            throw UtilsFileError.createDirFailed(message: message)
+            throw UtilsFileError.createDatabaseLocationFailed(message: message)
         } catch let error {
-            var msg: String = "createDir command failed :"
+            var msg: String = "CreateDatabaseLocation command failed :"
             msg.append(" \(error.localizedDescription)")
-            throw UtilsFileError.createDirFailed(message: msg)
+            throw UtilsFileError.createDatabaseLocationFailed(message: msg)
         }
+    }
 
+    // MARK: - IsFileExist
+
+    class func isDirExist(dirPath: String) -> Bool {
+        var isDir: ObjCBool = true
+        let fileManager = FileManager.default
+        let exists = fileManager.fileExists(atPath: dirPath, isDirectory: &isDir)
+        return exists && isDir.boolValue
     }
 
     // MARK: - moveAllDBSQLite
@@ -175,11 +179,6 @@ class UtilsFile {
         do {
             let url: URL = try UtilsFile
                 .getFolderURL(folderPath: databaseLocation)
-            if databaseLocation.prefix(9) != "Documents" &&
-                databaseLocation.prefix(7) != "default" {
-                // create the directories if they do not exists
-                try UtilsFile.createDirCopyDB(url: url)
-            }
             let dbPath: String = url
                 .appendingPathComponent("\(fileName)").path
             return dbPath

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "3.3.3-4",
+  "version": "3.4.0-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.3.3",
-    "@capacitor/core": "3.3.3",
-    "@capacitor/docgen": "^0.0.17",
-    "@capacitor/ios": "^3.3.3",
+    "@capacitor/android": "^3.4.0",
+    "@capacitor/core": "^3.4.0",
+    "@capacitor/docgen": "^0.1.1",
+    "@capacitor/ios": "^3.4.0",
     "@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.3.3"
+    "@capacitor/core": "^3.4.0"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",