From 6575a9bb62cae4f2d72f21f60bdd33bedee3fa64 Mon Sep 17 00:00:00 2001
From: Lukas Korba <lukas.korba@seznam.cz>
Date: Tue, 17 Sep 2024 07:48:18 +0200
Subject: [PATCH] [#1488] Resolve build issues with SQLight

- SQLight's Expression conflicted with the swift's expressions, solved by adding a namespace so it's clear which one is which
---
 Package.swift                                 |  4 +-
 .../DAO/TransactionDao.swift                  |  4 +-
 .../Entity/TransactionEntity.swift            | 48 +++++++++----------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Package.swift b/Package.swift
index 62258e6f..9c97098b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -14,8 +14,8 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.19.1"),
-        .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.14.1"),
+        .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.23.0"),
+        .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.3"),
         .package(url: "https://github.com/zcash-hackworks/zcash-light-client-ffi", exact: "0.9.1")
     ],
     targets: [
diff --git a/Sources/ZcashLightClientKit/DAO/TransactionDao.swift b/Sources/ZcashLightClientKit/DAO/TransactionDao.swift
index dfbc435b..70c12e49 100644
--- a/Sources/ZcashLightClientKit/DAO/TransactionDao.swift
+++ b/Sources/ZcashLightClientKit/DAO/TransactionDao.swift
@@ -10,8 +10,8 @@ import SQLite
 
 class TransactionSQLDAO: TransactionRepository {
     enum NotesTableStructure {
-        static let transactionID = Expression<Int>("tx")
-        static let memo = Expression<Blob>("memo")
+        static let transactionID = SQLite.Expression<Int>("tx")
+        static let memo = SQLite.Expression<Blob>("memo")
     }
 
     let dbProvider: ConnectionProvider
diff --git a/Sources/ZcashLightClientKit/Entity/TransactionEntity.swift b/Sources/ZcashLightClientKit/Entity/TransactionEntity.swift
index 2fcccdae..b8eee585 100644
--- a/Sources/ZcashLightClientKit/Entity/TransactionEntity.swift
+++ b/Sources/ZcashLightClientKit/Entity/TransactionEntity.swift
@@ -102,15 +102,15 @@ public enum ZcashTransaction {
 
 extension ZcashTransaction.Output {
     enum Column {
-        static let rawID = Expression<Blob>("txid")
-        static let pool = Expression<Int>("output_pool")
-        static let index = Expression<Int>("output_index")
-        static let toAccount = Expression<Int?>("to_account_id")
-        static let fromAccount = Expression<Int?>("from_account_id")
-        static let toAddress = Expression<String?>("to_address")
-        static let value = Expression<Int64>("value")
-        static let isChange = Expression<Bool>("is_change")
-        static let memo = Expression<Blob?>("memo")
+        static let rawID = SQLite.Expression<Blob>("txid")
+        static let pool = SQLite.Expression<Int>("output_pool")
+        static let index = SQLite.Expression<Int>("output_index")
+        static let toAccount = SQLite.Expression<Int?>("to_account_id")
+        static let fromAccount = SQLite.Expression<Int?>("from_account_id")
+        static let toAddress = SQLite.Expression<String?>("to_address")
+        static let value = SQLite.Expression<Int64>("value")
+        static let isChange = SQLite.Expression<Bool>("is_change")
+        static let memo = SQLite.Expression<Blob?>("memo")
     }
 
     init(row: Row) throws {
@@ -146,21 +146,21 @@ extension ZcashTransaction.Output {
 
 extension ZcashTransaction.Overview {
     enum Column {
-        static let accountId = Expression<Int>("account_id")
-        static let minedHeight = Expression<BlockHeight?>("mined_height")
-        static let index = Expression<Int?>("tx_index")
-        static let rawID = Expression<Blob>("txid")
-        static let expiryHeight = Expression<BlockHeight?>("expiry_height")
-        static let raw = Expression<Blob?>("raw")
-        static let value = Expression<Int64>("account_balance_delta")
-        static let fee = Expression<Int64?>("fee_paid")
-        static let hasChange = Expression<Bool>("has_change")
-        static let sentNoteCount = Expression<Int>("sent_note_count")
-        static let receivedNoteCount = Expression<Int>("received_note_count")
-        static let isShielding = Expression<Bool>("is_shielding")
-        static let memoCount = Expression<Int>("memo_count")
-        static let blockTime = Expression<Int64?>("block_time")
-        static let expiredUnmined = Expression<Bool?>("expired_unmined")
+        static let accountId = SQLite.Expression<Int>("account_id")
+        static let minedHeight = SQLite.Expression<BlockHeight?>("mined_height")
+        static let index = SQLite.Expression<Int?>("tx_index")
+        static let rawID = SQLite.Expression<Blob>("txid")
+        static let expiryHeight = SQLite.Expression<BlockHeight?>("expiry_height")
+        static let raw = SQLite.Expression<Blob?>("raw")
+        static let value = SQLite.Expression<Int64>("account_balance_delta")
+        static let fee = SQLite.Expression<Int64?>("fee_paid")
+        static let hasChange = SQLite.Expression<Bool>("has_change")
+        static let sentNoteCount = SQLite.Expression<Int>("sent_note_count")
+        static let receivedNoteCount = SQLite.Expression<Int>("received_note_count")
+        static let isShielding = SQLite.Expression<Bool>("is_shielding")
+        static let memoCount = SQLite.Expression<Int>("memo_count")
+        static let blockTime = SQLite.Expression<Int64?>("block_time")
+        static let expiredUnmined = SQLite.Expression<Bool?>("expired_unmined")
     }
 
     init(row: Row) throws {