@capacitor-community/sqlite 4.0.0-0 → 4.1.0-1

package/ios/Plugin/CapacitorSQLite.swift

@@ -1341,6 +1341,32 @@ enum CapacitorSQLiteError: Error {
             throw CapacitorSQLiteError.failed(message: initMessage)
         }
     }
+
+    // MARK: - moveDatabasesAndAddSuffix
+
+    @objc func moveDatabasesAndAddSuffix(_ folderPath: String, dbList: [String]) throws {
+        if isInit {
+            do {
+                try UtilsMigrate
+                    .moveDatabasesAndAddSuffix(databaseLocation: databaseLocation,
+                                               folderPath: folderPath,
+                                               dbList: dbList)
+                return
+            } catch UtilsMigrateError.moveDatabasesAndAddSuffix(let message) {
+                var msg: String = "moveDatabasesAndAddSuffix:"
+                msg.append(" \(message)")
+                throw CapacitorSQLiteError.failed(message: msg)
+
+            } catch let error {
+                var msg: String = "moveDatabasesAndAddSuffix:"
+                msg.append(" \(error)")
+                throw CapacitorSQLiteError.failed(message: msg)
+            }
+        } else {
+            throw CapacitorSQLiteError.failed(message: initMessage)
+        }
+    }
+
     class func getDatabaseName(dbName: String) -> String {
         var retName: String = dbName
         if !retName.contains("/") {

package/ios/Plugin/CapacitorSQLitePlugin.m

@@ -38,6 +38,7 @@ CAP_PLUGIN(CapacitorSQLitePlugin, "CapacitorSQLite",
            CAP_PLUGIN_METHOD(getMigratableDbList, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(addSQLiteSuffix, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(deleteOldDatabases, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(moveDatabasesAndAddSuffix, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(checkConnectionsConsistency, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(isSecretStored, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(setEncryptionSecret, CAPPluginReturnPromise);

package/ios/Plugin/CapacitorSQLitePlugin.swift

@@ -549,6 +549,35 @@ public class CapacitorSQLitePlugin: CAPPlugin {
         }
     }
 
+    // MARK: - moveDatabasesAndAddSuffix
+
+    @objc func moveDatabasesAndAddSuffix(_ call: CAPPluginCall) {
+        let folderPath: String = call.getString("folderPath") ?? "default"
+        let dbJsList: JSArray = call.getArray("dbNameList") ?? []
+        var dbList: [String] = []
+        if dbJsList.count > 0 {
+            for dbName in dbJsList {
+                if let name = dbName as? String {
+                    dbList.append(name)
+                }
+            }
+        }
+        do {
+            try implementation?.moveDatabasesAndAddSuffix(folderPath, dbList: dbList)
+            retHandler.rResult(call: call)
+            return
+        } catch CapacitorSQLiteError.failed(let message) {
+            let msg = "moveDatabasesAndAddSuffix: \(message)"
+            retHandler.rResult(call: call, message: msg)
+            return
+        } catch let error {
+            retHandler.rResult(
+                call: call,
+                message: "moveDatabasesAndAddSuffix: \(error)")
+            return
+        }
+    }
+
     // MARK: - Execute
 
     @objc func execute(_ call: CAPPluginCall) {

package/ios/Plugin/Extensions/String.swift

@@ -16,7 +16,6 @@ extension String {
                 searchStartIndex = self.index(self.startIndex, offsetBy: fIdx)
             }
         }
-        
 
         while searchStartIndex < self.endIndex,
               let range = self.range(of: string, options: .caseInsensitive, range: searchStartIndex..<self.endIndex),

package/ios/Plugin/ImportExportJson/ExportToJson.swift

@@ -819,6 +819,7 @@ class ExportToJson {
     // MARK: - ExportToJson - CreateSchema
 
     // swiftlint:disable function_body_length
+    // swiftlint:disable cyclomatic_complexity
     class func createSchema(stmt: String) throws -> [[String: String]] {
         var retSchema: [[String: String]] = []
         // get the sqlStmt between the parenthesis sqlStmt
@@ -836,14 +837,8 @@ class ExportToJson {
                         var row = rstr.split(separator: " ", maxSplits: 1)
                         if  row.count == 2 {
                             var columns: [String: String] = [:]
-                            if String(row[0]).uppercased() != "FOREIGN" && String(row[0]).uppercased() != "CONSTRAINT" {
-                                columns["column"] =  String(row[0])
-                            } else if String(row[0]).uppercased() == "CONSTRAINT" {
-                                let tRow = row[1].split(separator: " ", maxSplits: 1)
-                                row[0] = tRow[0]
-                                columns["constraint"] = String(row[0])
-                                row[1] = tRow[1]
-                            } else {
+                            switch String(row[0]).uppercased() {
+                            case "FOREIGN":
                                 guard let oPar = rstr.firstIndex(of: "(")
                                 else {
                                     var msg: String = "Create Schema "
@@ -860,9 +855,45 @@ class ExportToJson {
                                 }
                                 row[0] = rstr[rstr.index(
                                                 after: oPar)..<cPar]
-                                row[1] = rstr[rstr.index(
-                                                cPar, offsetBy: 2)..<rstr.endIndex]
+                                row[1] = rstr[rstr.index(cPar,
+                                                         offsetBy: 2)..<rstr.endIndex]
                                 columns["foreignkey"] = String(row[0])
+                                    .replacingOccurrences(of: "§",
+                                                          with: ",")
+                                    .replacingOccurrences(of: ", ",
+                                                          with: ",")
+                            case "PRIMARY":
+                                guard let oPar = rstr.firstIndex(of: "(")
+                                else {
+                                    var msg: String = "Create Schema "
+                                    msg.append("PRIMARY KEY no '('")
+                                    throw ExportToJsonError
+                                    .createSchema(message: msg)
+                                }
+                                guard let cPar = rstr.firstIndex(of: ")")
+                                else {
+                                    var msg: String = "Create Schema "
+                                    msg.append("PRIMARY KEY no ')'")
+                                    throw ExportToJsonError
+                                    .createSchema(message: msg)
+                                }
+                                row[0] = rstr[rstr.index(
+                                                after: oPar)..<cPar]
+                                row[1] = rstr[rstr.index(rstr.startIndex,
+                                                         offsetBy: 0)..<rstr.endIndex]
+                                columns["constraint"] = "CPK_" + String(row[0])
+                                    .replacingOccurrences(of: "§",
+                                                          with: "_")
+                                    .replacingOccurrences(of: "_ ",
+                                                          with: "_")
+                            case "CONSTRAINT":
+                                let tRow = row[1].split(separator: " ",
+                                                        maxSplits: 1)
+                                row[0] = tRow[0]
+                                columns["constraint"] = String(row[0])
+                                row[1] = tRow[1]
+                            default:
+                                columns["column"] =  String(row[0])
                             }
                             columns["value"] = String(row[1]).replacingOccurrences(of: "§", with: ",")
                             retSchema.append(columns)
@@ -886,6 +917,7 @@ class ExportToJson {
         }
         return retSchema
     }
+    // swiftlint:enable cyclomatic_complexity
     // swiftlint:enable function_body_length
 
     // MARK: - ExportToJson - CreateIndexes

package/ios/Plugin/Utils/UtilsFile.swift

@@ -149,7 +149,7 @@ class UtilsFile {
                 dbPathURL = try UtilsFile.getApplicationURL().absoluteURL
             } else if first[0] == "Library" {
                 dbPathURL = try UtilsFile.getLibraryURL().absoluteURL
-            }  else if first[0].caseInsensitiveCompare("cache") == .orderedSame {
+            } else if first[0].caseInsensitiveCompare("cache") == .orderedSame {
                 dbPathURL = try UtilsFile.getCacheURL().absoluteURL
             } else if first[0] == "Documents" || first[0] == "default" {
                 dbPathURL = databaseURL
@@ -241,7 +241,7 @@ class UtilsFile {
             throw UtilsFileError.getApplicationPathFailed
         }
     }
-    
+
     // MARK: - getCacheURL
 
     class func getCacheURL() throws -> URL {

package/ios/Plugin/Utils/UtilsMigrate.swift

@@ -9,6 +9,7 @@ enum UtilsMigrateError: Error {
     case addSQLiteSuffix(message: String)
     case getMigratableList(message: String)
     case deleteOldDatabases(message: String)
+    case moveDatabasesAndAddSuffix(message: String)
 }
 
 class UtilsMigrate {
@@ -192,4 +193,75 @@ class UtilsMigrate {
     // swiftlint:enable cyclomatic_complexity
     // swiftlint:enable function_body_length
 
+    // MARK: - moveDatabasesAndAddSuffix
+
+    // swiftlint:disable function_body_length
+    // swiftlint:disable cyclomatic_complexity
+    class func moveDatabasesAndAddSuffix(databaseLocation: String, folderPath: String,
+                                         dbList: [String]) throws {
+        var fromFile: String = ""
+        var toFile: String = ""
+        do {
+            let databaseURL: URL = try UtilsFile
+                .getFolderURL(folderPath: databaseLocation)
+            let dbPathURL: URL = try UtilsFile
+                .getFolderURL(folderPath: folderPath)
+            var isDir = ObjCBool(true)
+            if FileManager.default.fileExists(atPath: dbPathURL.relativePath,
+                                              isDirectory: &isDir) &&
+                isDir.boolValue {
+                var mDbList: [String]
+                if dbList.count > 0 {
+                    mDbList = try UtilsFile
+                        .getFileList(path: dbPathURL.relativePath, ext: nil)
+                } else {
+                    mDbList = try UtilsFile
+                        .getFileList(path: dbPathURL.relativePath, ext: "db")
+                }
+                for file: String in mDbList {
+                    if !file.contains("SQLite.db") {
+                        fromFile = file
+                        toFile = ""
+                        if dbList.count > 0 {
+                            if dbList.contains(fromFile) {
+                                if String(file.suffix(3)) == ".db" {
+                                    toFile = file
+                                        .replacingOccurrences(of: ".db", with: "SQLite.db")
+                                } else {
+                                    toFile = file + "SQLite.db"
+                                }
+                            }
+                        } else {
+                            toFile = file
+                                .replacingOccurrences(of: ".db", with: "SQLite.db")
+                        }
+                        if !toFile.isEmpty {
+                            let uFrom: URL = dbPathURL.appendingPathComponent(fromFile)
+                            let uTo: URL = databaseURL.appendingPathComponent(toFile)
+                            try UtilsFile.moveFile(pathName: uFrom.path, toPathName: uTo.path, overwrite: true)
+                        }
+                    }
+                }
+                return
+            } else {
+                var msg: String = "moveDatabasesAndAddSuffix command failed :"
+                msg.append(" Folder '\(dbPathURL.absoluteString)' not found")
+                throw UtilsMigrateError.moveDatabasesAndAddSuffix(message: msg)
+            }
+        } catch UtilsFileError.getDatabasesURLFailed {
+            throw UtilsMigrateError
+            .moveDatabasesAndAddSuffix(message: "getDatabasesURLFailed")
+        } catch UtilsFileError.getFolderURLFailed(let message) {
+            throw UtilsMigrateError.moveDatabasesAndAddSuffix(message: message)
+        } catch UtilsFileError.getFileListFailed {
+            throw UtilsMigrateError.moveDatabasesAndAddSuffix(message: "getFileListFailed")
+        } catch let error {
+            var msg: String = "moveDatabasesAndAddSuffix command failed :"
+            msg.append(" \(error.localizedDescription)")
+            throw UtilsMigrateError.moveDatabasesAndAddSuffix(message: msg)
+        }
+    }
+    // swiftlint:enable cyclomatic_complexity
+    // swiftlint:enable function_body_length
+
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "4.0.0-0",
+  "version": "4.1.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": "^4.0.0",
-    "@capacitor/core": "^4.0.0",
+    "@capacitor/android": "^4.1.0",
+    "@capacitor/core": "^4.1.0",
     "@capacitor/docgen": "^0.0.17",
-    "@capacitor/ios": "^4.0.0",
+    "@capacitor/ios": "^4.1.0",
     "@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.4"
+    "jeep-sqlite": "^1.5.6"
   }
 }