Merge pull request #128 from moneymanagerex/txn

Bundle resource is not scoped and refine statement to lead sample database
moneymanagerex · Oct 8, 2024 · f409ce4 · f409ce4
2 parents 8154ef3 + 7c2232d
commit f409ce4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/MMEX/App/ContentView.swift b/MMEX/App/ContentView.swift
@@ -97,7 +97,7 @@ struct ContentView: View {
             .controlSize(.large)
 
             Button(action: { isNewDocumentPickerPresented = true; isSampleDocument = true }) {
-                Label("Use Sample Database", systemImage: "doc.text.fill")
+                Label("Create and Use Sample Database", systemImage: "doc.text.fill")
             }
             .buttonStyle(.bordered)
             .controlSize(.large)

diff --git a/MMEX/App/EnvironmentManager.swift b/MMEX/App/EnvironmentManager.swift
@@ -84,22 +84,15 @@ extension EnvironmentManager {
         openDatabase(at: url, isNew: true)
         guard let db else { return }
 
-        guard let tables = Bundle.main.url(forResource: "tables.sql", withExtension: "") else {
+        guard let tables = Bundle.main.url(forResource: "tables", withExtension: "sql") else {
             log.error("Cannot find tables.sql")
             closeDatabase()
             return
         }
 
-        if tables.startAccessingSecurityScopedResource() {
-            defer { tables.stopAccessingSecurityScopedResource() }
-            let repository = Repository(db)
-            repository.setUserVersion (19)
-            guard repository.execute(url: tables) else {
-                closeDatabase()
-                return
-            }
-        } else {
-            log.error("Failed to access security-scoped resource: \(tables.path)")
+        let repository = Repository(db)
+        repository.setUserVersion (19)
+        guard repository.execute(url: tables) else {
             closeDatabase()
             return
         }