Fix getDatabaseList & getMigratableDbList iOS/Android

capacitor-community · Dec 30, 2023 · dc32b4c · dc32b4c
1 parent eb39d81
commit dc32b4c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 5.5.1-4 (2023-12-30)
+
+### Bug Fixes
+
+ - iOS Fix getDatabaseList & getMigratableDbList
+ - Android Fix getDatabaseList & getMigratableDbList
+
 # 5.5.1-3 (2023-12-29)
 
 ### Bug Fixes

diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/android/src/main/java/com/getcapacitor/community/database/sqlite/CapacitorSQLite.java b/android/src/main/java/com/getcapacitor/community/database/sqlite/CapacitorSQLite.java
@@ -799,8 +799,10 @@ public JSArray getDatabaseList() throws Exception {
         String[] listFiles = uFile.getListOfFiles(context);
         JSArray retArray = new JSArray();
         for (String file : listFiles) {
-            retArray.put(file);
-        }
+            if (file.contains("SQLite")) {
+                retArray.put(file);
+              }
+            }
         if (retArray.length() > 0) {
             return retArray;
         } else {
@@ -819,7 +821,9 @@ public JSArray getMigratableDbList(String folderPath) throws Exception {
         String[] listFiles = uMigrate.getMigratableList(context, folderPath);
         JSArray retArray = new JSArray();
         for (String file : listFiles) {
-            retArray.put(file);
+            if (!file.contains("SQLite")) {
+                retArray.put(file);
+            }
         }
         if (retArray.length() > 0) {
             return retArray;

diff --git a/ios/Plugin/CapacitorSQLite.swift b/ios/Plugin/CapacitorSQLite.swift
@@ -1547,7 +1547,10 @@ enum CapacitorSQLiteError: Error {
             let aPath: String = try (UtilsFile.getFolderURL(folderPath: databaseLocation)).path
             // get the database files
             let dbList: [String] = try UtilsFile.getFileList(path: aPath, ext: ".db")
-            return dbList
+            // filter for db including SQLite
+            let dbWithSQLite = dbList.filter { $0.contains("SQLite") }
+
+            return dbWithSQLite
 
         } catch let error {
             let msg: String = "\(error)"
@@ -1564,7 +1567,10 @@ enum CapacitorSQLiteError: Error {
         do {
             let dbList: [String] = try UtilsMigrate
                 .getMigratableList(folderPath: folderPath)
-            return dbList
+            // filter for db not including SQLite
+            let dbNoSQLite = dbList.filter { !$0.contains("SQLite") }
+
+            return dbNoSQLite
 
         } catch UtilsMigrateError.getMigratableList(let message) {
             var msg: String = "getMigratableList:"