@capacitor-community/sqlite 3.4.2-2 → 3.4.2-5

package/ios/Plugin/CapacitorSQLite.swift

@@ -425,8 +425,7 @@ enum CapacitorSQLiteError: Error {
         if isInit {
             let mDbName = CapacitorSQLite.getDatabaseName(dbName: dbName)
             guard let mDb: Database = dbDict[mDbName] else {
-                let msg = "Connection to \(mDbName) not available"
-                throw CapacitorSQLiteError.failed(message: msg)
+                return
             }
             if mDb.isDBOpen() {
                 do {
@@ -830,6 +829,7 @@ enum CapacitorSQLiteError: Error {
     // MARK: - importFromJson
 
     // swiftlint:disable function_body_length
+    // swiftlint:disable cyclomatic_complexity
     @objc func importFromJson(_ parsingData: String)
     throws -> [String: Int] {
         if isInit {
@@ -845,6 +845,11 @@ enum CapacitorSQLiteError: Error {
                     throw CapacitorSQLiteError.failed(message: msg)
                 }
                 let encrypted: Bool = jsonSQLite[0].encrypted
+                var overwrite: Bool = false
+                if let mOverwrite = jsonSQLite[0].overwrite {
+                    overwrite = mOverwrite
+                }
+                let mode: String = jsonSQLite[0].mode
                 let inMode: String = encrypted ? "secret"
                     : "no-encryption"
                 let version: Int = jsonSQLite[0].version
@@ -856,13 +861,49 @@ enum CapacitorSQLiteError: Error {
                         databaseLocation: databaseLocation, databaseName: dbName,
                         encrypted: encrypted, isEncryption: isEncryption, account: account,
                         mode: inMode, version: version, vUpgDict: [:])
+                    if overwrite && mode == "full" {
+                        let isExists = UtilsFile
+                            .isFileExist(databaseLocation: databaseLocation,
+                                         fileName: dbName)
+                        if isExists {
+                            _ = try UtilsFile
+                                .deleteFile(fileName: dbName,
+                                            databaseLocation: databaseLocation)
+                        }
+                    }
                     try mDb.open()
+                } catch UtilsFileError.deleteFileFailed {
+                    let message = "Delete Database failed"
+                    throw CapacitorSQLiteError.failed(message: message)
                 } catch DatabaseError.open(let message) {
                     throw CapacitorSQLiteError.failed(message: message)
                 } catch let error {
                     let msg: String = "\(error)"
                     throw CapacitorSQLiteError.failed(message: msg)
                 }
+                // check if the database as some tables
+                do {
+                    let tableList: [String] = try mDb.getTableNames()
+                    if mode == "full" && tableList.count > 0 {
+                        let curVersion = try mDb.getVersion()
+                        if version < curVersion {
+                            var msg: String = "ImportFromJson: Cannot import a "
+                            msg += "version lower than \(curVersion)"
+                            throw CapacitorSQLiteError.failed(message: msg)
+                        }
+                        if curVersion == version {
+                            var res: [String: Int] = [:]
+                            res["changes"] = 0
+                            return res
+                        }
+                    }
+
+                } catch DatabaseError.getTableNames(let message) {
+                    throw CapacitorSQLiteError.failed(message: message)
+                } catch let error {
+                    let msg: String = "\(error)"
+                    throw CapacitorSQLiteError.failed(message: msg)
+                }
                 // import from Json Object
                 do {
                     let res: [String: Int] = try mDb
@@ -900,6 +941,7 @@ enum CapacitorSQLiteError: Error {
             throw CapacitorSQLiteError.failed(message: initMessage)
         }
     }
+    // swiftlint:enable cyclomatic_complexity
     // swiftlint:enable function_body_length
 
     // MARK: - exportToJson
@@ -917,7 +959,7 @@ enum CapacitorSQLiteError: Error {
                 do {
                     let res: [String: Any] = try
                         mDb.exportToJson(expMode: expMode)
-                    if res.count == 5 || res.count == 6 {
+                    if res.count == 5 || res.count == 6 || res.count == 7 {
                         return res
                     } else {
                         var msg: String = "return Object is not a "
@@ -1125,6 +1167,34 @@ enum CapacitorSQLiteError: Error {
         }
     }
 
+    // MARK: - getTableList
+
+    @objc func getTableList(_ dbName: String) throws -> [String] {
+        if isInit {
+            let mDbName = CapacitorSQLite.getDatabaseName(dbName: dbName)
+            guard let mDb: Database = dbDict[mDbName] else {
+                let msg = "Connection to \(mDbName) not available"
+                throw CapacitorSQLiteError.failed(message: msg)
+            }
+            if mDb.isDBOpen() {
+                do {
+                    let res: [String] = try mDb.getTableNames()
+                    return res
+                } catch DatabaseError.getTableNames(let message) {
+                    throw CapacitorSQLiteError.failed(message: message)
+                } catch let error {
+                    let msg: String = "\(error)"
+                    throw CapacitorSQLiteError.failed(message: msg)
+                }
+            } else {
+                let msg = "Database \(mDbName) not opened"
+                throw CapacitorSQLiteError.failed(message: msg)
+            }
+        } else {
+            throw CapacitorSQLiteError.failed(message: initMessage)
+        }
+    }
+
     // MARK: - getDatabaseList
 
     @objc func getDatabaseList() throws -> [String] {

package/ios/Plugin/CapacitorSQLitePlugin.m

@@ -33,6 +33,7 @@ CAP_PLUGIN(CapacitorSQLitePlugin, "CapacitorSQLite",
            CAP_PLUGIN_METHOD(isNCDatabase, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(isTableExists, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(getDatabaseList, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(getTableList, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(getMigratableDbList, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(addSQLiteSuffix, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(deleteOldDatabases, CAPPluginReturnPromise);

package/ios/Plugin/CapacitorSQLitePlugin.swift

@@ -395,6 +395,33 @@ public class CapacitorSQLitePlugin: CAPPlugin {
         }
     }
 
+    // MARK: - GetTableList
+
+    @objc func getTableList(_ call: CAPPluginCall) {
+        guard let dbName = call.options["database"] as? String else {
+            retHandler.rValues(
+                call: call, ret: [],
+                message: "getDatabaseList: Must provide a database name")
+            return
+
+        }
+        do {
+            let res = try implementation?.getTableList(dbName) ?? []
+            retHandler.rValues(call: call, ret: res)
+            return
+        } catch CapacitorSQLiteError.failed(let message) {
+            retHandler.rValues(
+                call: call, ret: [],
+                message: "getDatabaseList: \(message)")
+            return
+        } catch let error {
+            retHandler.rValues(
+                call: call, ret: [],
+                message: "getDatabaseList: \(error)")
+            return
+        }
+    }
+
     // MARK: - getDatabaseList
 
     @objc func getDatabaseList(_ call: CAPPluginCall) {
@@ -697,7 +724,7 @@ public class CapacitorSQLitePlugin: CAPPlugin {
 
         }
         do {
-            if let res = try
+            if let res: [[String: Any]] = try
                 implementation?.query(dbName,
                                       statement: statement,
                                       values: values) {

package/ios/Plugin/Database.swift

@@ -23,6 +23,7 @@ enum DatabaseError: Error {
     case getSyncDate(message: String)
     case exportToJson(message: String)
     case importFromJson(message: String)
+    case getTableNames(message: String)
 }
 // swiftlint:disable file_length
 // swiftlint:disable type_body_length
@@ -138,20 +139,16 @@ class Database {
                     try UtilsSQLCipher.setVersion(mDB: self, version: 1)
                     curVersion = try UtilsSQLCipher.getVersion(mDB: self)
                 }
-                if dbVersion > curVersion {
-                    if vUpgDict.count > 0 {
-                        _ = try uUpg
-                            .onUpgrade(mDB: self, upgDict: vUpgDict,
-                                       dbName: dbName,
-                                       currentVersion: curVersion,
-                                       targetVersion: dbVersion,
-                                       databaseLocation: databaseLocation)
-                        try UtilsSQLCipher
-                            .deleteBackupDB(databaseLocation: databaseLocation,
-                                            databaseName: dbName)
-                    } else {
-                        try UtilsSQLCipher.setVersion(mDB: self, version: dbVersion)
-                    }
+                if dbVersion > curVersion && vUpgDict.count > 0 {
+                    _ = try uUpg
+                        .onUpgrade(mDB: self, upgDict: vUpgDict,
+                                   dbName: dbName,
+                                   currentVersion: curVersion,
+                                   targetVersion: dbVersion,
+                                   databaseLocation: databaseLocation)
+                    try UtilsSQLCipher
+                        .deleteBackupDB(databaseLocation: databaseLocation,
+                                        databaseName: dbName)
                 }
             }
         } catch UtilsSQLCipherError.openOrCreateDatabase(let message) {
@@ -411,6 +408,19 @@ class Database {
         return result
     }
 
+    // MARK: - GetTableNames
+
+    func getTableNames() throws -> [String] {
+        var result: [String] = []
+        do {
+            result = try UtilsDrop.getTablesNames(mDB: self)
+        } catch UtilsDropError.getTablesNamesFailed(let msg) {
+            throw DatabaseError.getTableNames(
+                message: "Failed in getTableNames : \(msg)" )
+        }
+        return result
+    }
+
     // MARK: - DeleteDB
 
     func deleteDB(databaseName: String) throws -> Bool {

package/ios/Plugin/ImportExportJson/ExportToJson.swift

@@ -72,9 +72,10 @@ class ExportToJson {
             // get the view's name
             var stmtV: String = "SELECT name,sql FROM sqlite_master WHERE "
             stmtV.append("type = 'view' AND name NOT LIKE 'sqlite_%';")
-            let resViews =  try UtilsSQLCipher.querySQL(
+            var resViews =  try UtilsSQLCipher.querySQL(
                 mDB: mDB, sql: stmtV, values: [])
-            if resViews.count > 0 {
+            if resViews.count > 1 {
+                resViews.removeFirst()
                 views = try ExportToJson
                     .getViews(mDB: mDB,
                               resViews: resViews)
@@ -85,9 +86,10 @@ class ExportToJson {
             var query: String = "SELECT name,sql FROM sqlite_master WHERE "
             query.append("type = 'table' AND name NOT LIKE 'sqlite_%' ")
             query.append("AND name NOT LIKE 'sync_table';")
-            let resTables =  try UtilsSQLCipher.querySQL(
+            var resTables =  try UtilsSQLCipher.querySQL(
                 mDB: mDB, sql: query, values: [])
-            if resTables.count > 0 {
+            if resTables.count > 1 {
+                resTables.removeFirst()
                 let isExists: Bool = try UtilsJson.isTableExists(
                     mDB: mDB, tableName: "sync_table")
                 if !isExists && expMode == "partial" {
@@ -528,9 +530,10 @@ class ExportToJson {
         var ret: Int64 = -1
         let query: String = "SELECT sync_date FROM sync_table;"
         do {
-            let resSyncDate =  try UtilsSQLCipher.querySQL(
+            var resSyncDate =  try UtilsSQLCipher.querySQL(
                 mDB: mDB, sql: query, values: [])
-            if resSyncDate.count > 0 {
+            if resSyncDate.count > 1 {
+                resSyncDate.removeFirst()
                 guard let res: Int64 = resSyncDate[0]["sync_date"] as?
                         Int64 else {
                     throw ExportToJsonError.getSyncDate(
@@ -548,6 +551,7 @@ class ExportToJson {
     // MARK: - ExportToJson - GetTablesModified
 
     // swiftlint:disable function_body_length
+    // swiftlint:disable cyclomatic_complexity
     class func getTablesModified(mDB: Database,
                                  tables: [[String: Any]],
                                  syncDate: Int64)
@@ -569,6 +573,9 @@ class ExportToJson {
                 do {
                     var resQuery =  try UtilsSQLCipher.querySQL(
                         mDB: mDB, sql: query, values: [])
+                    if resQuery.count > 1 {
+                        resQuery.removeFirst()
+                    }
                     if resQuery.count != 1 {
                         break
                     } else {
@@ -585,6 +592,9 @@ class ExportToJson {
                         query.append("\(syncDate);")
                         resQuery =  try UtilsSQLCipher.querySQL(
                             mDB: mDB, sql: query, values: [])
+                        if resQuery.count > 1 {
+                            resQuery.removeFirst()
+                        }
                         if resQuery.count != 1 {
                             break
                         } else {
@@ -618,6 +628,8 @@ class ExportToJson {
         }
         return retObj
     }
+    // swiftlint:enable cyclomatic_complexity
+    // swiftlint:enable function_body_length
 
     // MARK: - ExportToJson - ModEmbeddedParentheses
 
@@ -751,9 +763,10 @@ class ExportToJson {
         query.append("type = 'index' AND tbl_name = '\(tableName)' ")
         query.append("AND sql NOTNULL;")
         do {
-            let resIndexes =  try UtilsSQLCipher.querySQL(
+            var resIndexes =  try UtilsSQLCipher.querySQL(
                 mDB: mDB, sql: query, values: [])
-            if resIndexes.count > 0 {
+            if resIndexes.count > 1 {
+                resIndexes.removeFirst()
                 for ipos in 0..<resIndexes.count {
                     var row: [String: String] = [:]
                     let keys: [String] = Array(resIndexes[ipos].keys)
@@ -837,9 +850,10 @@ class ExportToJson {
         query.append("type = 'trigger' AND tbl_name = '\(tableName)' ")
         query.append("AND sql NOTNULL;")
         do {
-            let resTriggers =  try UtilsSQLCipher.querySQL(
+            var resTriggers =  try UtilsSQLCipher.querySQL(
                 mDB: mDB, sql: query, values: [])
-            if resTriggers.count > 0 {
+            if resTriggers.count > 1 {
+                resTriggers.removeFirst()
                 for ipos in 0..<resTriggers.count {
                     var row: [String: String] = [:]
                     let keys: [String] = Array(resTriggers[ipos].keys)
@@ -952,9 +966,10 @@ class ExportToJson {
 
         var retValues: [[Any]] = []
         do {
-            let resValues =  try UtilsSQLCipher.querySQL(
+            var resValues =  try UtilsSQLCipher.querySQL(
                 mDB: mDB, sql: query, values: [])
-            if resValues.count > 0 {
+            if resValues.count > 1 {
+                resValues.removeFirst()
                 for ipos in 0..<resValues.count {
                     var row: [Any] = []
                     do {

package/ios/Plugin/ImportExportJson/ImportFromJson.swift

@@ -45,13 +45,16 @@ class ImportFromJson {
             // Set PRAGMAS
             try UtilsSQLCipher.setVersion(mDB: mDB,
                                           version: version)
-            try UtilsSQLCipher
-                .setForeignKeyConstraintsEnabled(mDB: mDB,
-                                                 toggle: true)
             if jsonSQLite.mode == "full" {
+                try UtilsSQLCipher
+                    .setForeignKeyConstraintsEnabled(mDB: mDB,
+                                                     toggle: false)
                 // Drop All Tables, Indexes and Triggers
                 try _ = UtilsDrop.dropAll(mDB: mDB)
             }
+            try UtilsSQLCipher
+                .setForeignKeyConstraintsEnabled(mDB: mDB,
+                                                 toggle: true)
             // create database schema
             changes = try ImportFromJson
                 .createSchema(mDB: mDB,

package/ios/Plugin/ImportExportJson/JsonSQLite.swift

@@ -10,6 +10,7 @@ import Foundation
 public struct JsonSQLite: Codable {
     let database: String
     let version: Int
+    var overwrite: Bool?
     let encrypted: Bool
     let mode: String
     let tables: [JsonTable]
@@ -18,6 +19,11 @@ public struct JsonSQLite: Codable {
     public func show() {
         print("databaseName: \(database) ")
         print("version: \(version) ")
+        var mOverwrite = false
+        if let mOver = overwrite {
+            mOverwrite = mOver
+        }
+        print("overwrite: \(mOverwrite) ")
         print("encrypted: \(encrypted) ")
         print("mode: \(mode) ")
         print("Number of Tables: \(tables.count) ")

package/ios/Plugin/Utils/UtilsBinding.swift

@@ -24,10 +24,10 @@ class UtilsBinding {
                                           value: value, idx: idx)
                     idx += 1
                 } else {
-                    message = "Error: querySQL bind failed "
+                    message = "Error: bindValues bind failed "
                 }
             } catch let error as NSError {
-                message = "Error: querySQL bind failed "
+                message = "Error: bindValues bind failed "
                 message.append("\(error.localizedDescription)")
             }
             if message.count > 0 { break }

package/ios/Plugin/Utils/UtilsDrop.swift

@@ -33,8 +33,9 @@ class UtilsDrop {
         query.append("AND name NOT LIKE 'sqlite_%' ")
         query.append("ORDER BY rootpage DESC;")
         do {
-            let resQuery = try mDB.selectSQL(sql: query, values: [])
+            var resQuery = try mDB.selectSQL(sql: query, values: [])
             if resQuery.count > 0 {
+                resQuery.removeFirst()
                 for ipos in 0..<resQuery.count {
                     if let mName = resQuery[ipos]["name"] as? String {
                         names.append("\(mName)")
@@ -81,8 +82,9 @@ class UtilsDrop {
         query.append("type='view' AND name NOT LIKE 'sqlite_%' ")
         query.append("ORDER BY rootpage DESC;")
         do {
-            let resQuery = try mDB.selectSQL(sql: query, values: [])
+            var resQuery = try mDB.selectSQL(sql: query, values: [])
             if resQuery.count > 0 {
+                resQuery.removeFirst()
                 for ipos in 0..<resQuery.count {
                     if let mName = resQuery[ipos]["name"] as? String {
                         names.append("\(mName)")
@@ -128,8 +130,9 @@ class UtilsDrop {
         var query: String = "SELECT name FROM sqlite_master WHERE "
         query.append("type='index' AND name NOT LIKE 'sqlite_%';")
         do {
-            let resQuery = try mDB.selectSQL(sql: query, values: [])
+            var resQuery = try mDB.selectSQL(sql: query, values: [])
             if resQuery.count > 0 {
+                resQuery.removeFirst()
                 for ipos in 0..<resQuery.count {
                     if let mName = resQuery[ipos]["name"] as? String {
                         indexes.append("\(mName)")
@@ -174,8 +177,9 @@ class UtilsDrop {
         var query: String = "SELECT name FROM sqlite_master WHERE "
         query.append("type='trigger';")
         do {
-            let resQuery = try mDB.selectSQL(sql: query, values: [])
+            var resQuery = try mDB.selectSQL(sql: query, values: [])
             if resQuery.count > 0 {
+                resQuery.removeFirst()
                 for ipos in 0..<resQuery.count {
                     if let mName = resQuery[ipos]["name"] as? String {
                         triggers.append("\(mName)")

package/ios/Plugin/Utils/UtilsJson.swift

@@ -38,9 +38,14 @@ class UtilsJson {
         query.append(tableName)
         query.append("';")
         do {
-            let resQuery: [Any] = try UtilsSQLCipher
+            var resQuery: [Any] = try UtilsSQLCipher
                 .querySQL(mDB: mDB, sql: query, values: [])
-            if resQuery.count > 0 {ret = true}
+            if resQuery.count > 0 {
+                resQuery.removeFirst()
+                if resQuery.count == 1 {
+                    ret = true
+                }
+            }
         } catch UtilsSQLCipherError.querySQL(let message) {
             throw UtilsJsonError.tableNotExists(message: message)
         }
@@ -89,9 +94,14 @@ class UtilsJson {
         query.append(viewName)
         query.append("';")
         do {
-            let resQuery: [Any] = try UtilsSQLCipher
+            var resQuery: [Any] = try UtilsSQLCipher
                 .querySQL(mDB: mDB, sql: query, values: [])
-            if resQuery.count > 0 {ret = true}
+            if resQuery.count > 0 {
+                resQuery.removeFirst()
+                if resQuery.count == 1 {
+                    ret = true
+                }
+            }
         } catch UtilsSQLCipherError.querySQL(let message) {
             throw UtilsJsonError.viewNotExists(message: message)
         }
@@ -109,8 +119,9 @@ class UtilsJson {
         query.append(tableName)
         query.append(");")
         do {
-            let resQuery =  try mDB.selectSQL(sql: query, values: [])
+            var resQuery =  try mDB.selectSQL(sql: query, values: [])
             if resQuery.count > 0 {
+                resQuery.removeFirst()
                 var names: [String] = []
                 var types: [String] = []
                 for ipos in 0..<resQuery.count {
@@ -190,9 +201,12 @@ class UtilsJson {
             query.append("\(key);")
         }
         do {
-            let resQuery =  try mDB.selectSQL(sql: query, values: [])
-            if resQuery.count == 1 {
-                ret = true
+            var resQuery =  try mDB.selectSQL(sql: query, values: [])
+            if resQuery.count > 1 {
+                resQuery.removeFirst()
+                if resQuery.count == 1 {
+                    ret = true
+                }
             }
         } catch DatabaseError.selectSQL(let message) {
             throw UtilsJsonError.isIdExists(

package/ios/Plugin/Utils/UtilsSQLCipher.swift

@@ -266,10 +266,11 @@ class UtilsSQLCipher {
 
         let sqltr: String = "PRAGMA user_version;"
         do {
-            let resVersion =  try UtilsSQLCipher.querySQL(mDB: mDB,
+            var resVersion =  try UtilsSQLCipher.querySQL(mDB: mDB,
                                                           sql: sqltr,
                                                           values: [])
-            if resVersion.count > 0 {
+            if resVersion.count > 1 {
+                resVersion.removeFirst()
                 guard let res: Int64 = resVersion[0]["user_version"]
                         as? Int64 else {
                     throw UtilsSQLCipherError.getVersion(
@@ -504,10 +505,13 @@ class UtilsSQLCipher {
     // MARK: - FetchColumnInfo
 
     // swiftlint:disable function_body_length
+    // swiftlint:disable cyclomatic_complexity
     class func fetchColumnInfo(handle: OpaquePointer?)
     throws -> [[String: Any]] {
         var result: [[String: Any]] = []
         var columnCount: Int32 = 0
+        var columnNames: [String] = []
+        var columnData: [String: Any] = [:]
 
         while sqlite3_step(handle) == SQLITE_ROW {
             columnCount = sqlite3_column_count(handle)
@@ -521,6 +525,13 @@ class UtilsSQLCipher {
                     throw UtilsSQLCipherError
                     .fetchColumnInfo(message: message)
                 }
+                if columnNames.count <= columnCount {
+                    columnNames.append(String(cString: name))
+                    if columnNames.count == columnCount {
+                        columnData["ios_columns"] = columnNames
+                        result.append(columnData)
+                    }
+                }
                 switch sqlite3_column_type(handle, Int32(index)) {
                 case SQLITE_INTEGER:
                     let val: Int64 = sqlite3_column_int64(handle, index)
@@ -558,6 +569,7 @@ class UtilsSQLCipher {
         }
         return result
     }
+    // swiftlint:enable cyclomatic_complexity
     // swiftlint:enable function_body_length
 
     // MARK: - dbChanges

package/ios/Plugin/Utils/UtilsUpgrade.swift

@@ -307,9 +307,10 @@ class UtilsUpgrade {
         var retNames: [String] = []
         let query: String = "PRAGMA table_info('\(tableName)');"
         do {
-            let resColumns: [[String: Any]] =  try
+            var resColumns: [[String: Any]] =  try
                 mDB.selectSQL(sql: query, values: [])
             if resColumns.count > 0 {
+                resColumns.removeFirst()
                 for rColumn in resColumns {
                     guard let columnName: String = rColumn["name"] as?
                             String else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "3.4.2-2",
+  "version": "3.4.2-5",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -93,6 +93,6 @@
     }
   },
   "dependencies": {
-    "jeep-sqlite": "^1.3.7"
+    "jeep-sqlite": "^1.4.0"
   }
 }