fix fields with default value (can be NULL)

moneymanagerex · Sep 22, 2024 · 8ae491c · 8ae491c
1 parent 1a21982
commit 8ae491c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/MMEX/Models/Transaction.swift b/MMEX/Models/Transaction.swift
@@ -53,14 +53,14 @@ struct Transaction: ExportableEntity {
     var deletedTime: String?
     var followUpId: Int64?
     var toTransAmount: Double?
-    var color: Int64
+    var color: Int64?
 
     init(
         id: Int64, accountId: Int64, toAccountId: Int64? = nil, payeeId: Int64,
         transCode: Transcode, transAmount: Double, status: TransactionStatus,
         transactionNumber: String? = nil, notes: String? = nil, categId: Int64? = nil,
         transDate: String?, lastUpdatedTime: String? = nil, deletedTime: String? = nil,
-        followUpId: Int64? = nil, toTransAmount: Double? = nil, color: Int64 = -1
+        followUpId: Int64? = nil, toTransAmount: Double? = nil, color: Int64? = nil
     ) {
         self.id = id
         self.accountId = accountId

diff --git a/MMEX/Repositories/InfotableRepository.swift b/MMEX/Repositories/InfotableRepository.swift
@@ -62,7 +62,7 @@ extension InfotableRepository {
 
     // load specific keys into a dictionary
     func load(for keys: [InfoKey]) -> [InfoKey: Infotable] {
-        guard let db else { return [:] }
+        if db == nil { return [:] }
         var results: [InfoKey: Infotable] = [:]
         for key in keys {
             if let info = pluck(

diff --git a/MMEX/Repositories/PayeeRepository.swift b/MMEX/Repositories/PayeeRepository.swift
@@ -38,7 +38,7 @@ class PayeeRepository: RepositoryProtocol {
     static let col_website    = SQLite.Expression<String?>("WEBSITE")
     static let col_notes      = SQLite.Expression<String?>("NOTES")
     static let col_active     = SQLite.Expression<Int?>("ACTIVE")
-    static let col_pattern    = SQLite.Expression<String>("PATTERN")
+    static let col_pattern    = SQLite.Expression<String?>("PATTERN")
 
     static func selectQuery(from table: SQLite.Table) -> SQLite.Table {
         return table.select(
@@ -62,7 +62,7 @@ class PayeeRepository: RepositoryProtocol {
             website    : row[col_website],
             notes      : row[col_notes],
             active     : row[col_active] ?? 1,
-            pattern    : row[col_pattern]
+            pattern    : row[col_pattern] ?? ""
         )
     }
 

diff --git a/MMEX/Repositories/TransactionRepository.swift b/MMEX/Repositories/TransactionRepository.swift
@@ -54,7 +54,7 @@ class TransactionRepository: RepositoryProtocol {
     static let col_deletedTime       = SQLite.Expression<String?>("DELETEDTIME")
     static let col_followUpId        = SQLite.Expression<Int64?>("FOLLOWUPID")
     static let col_toTransAmount     = SQLite.Expression<Double?>("TOTRANSAMOUNT")
-    static let col_color             = SQLite.Expression<Int64>("COLOR")
+    static let col_color             = SQLite.Expression<Int64?>("COLOR")
 
     // cast NUMERIC to REAL
     static let cast_transAmount   = cast(col_transAmount)   as SQLite.Expression<Double>