Skip to content

fixed uint count #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
viaszkadi merged 2 commits into from
Apr 18, 2024
Merged

fixed uint count #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fc9842
fixed uint count
viaszkadi Apr 18, 2024
1368a2b
formatted
viaszkadi Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Sources/FeatherDatabase/Database/Query/DatabaseQueryCount.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,17 @@ extension DatabaseQueryCount {
on db: Database
) async throws -> UInt {
try await db.run { sql in
try await sql
let value =
try await sql
.select()
.from(Row.tableName)
.column(SQLFunction("COUNT", args: SQLLiteral.all), as: "count")
.column(
SQLFunction("COUNT", args: SQLLiteral.all),
as: "count"
)
.applyFilter(filter)
.first(decodingColumn: "count", as: UInt.self) ?? 0
.first(decodingColumn: "count", as: Int.self) ?? 0
return UInt(value)
}
}
}
4 changes: 2 additions & 2 deletions Sources/FeatherDatabase/Database/Query/DatabaseQueryList.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ extension DatabaseQueryList {
.column(SQLFunction("COUNT", args: SQLLiteral.all), as: "count")
.applyFilter(query.filter)
.applyOrders(query.orders)
.first(decodingColumn: "count", as: UInt.self) ?? 0
.first(decodingColumn: "count", as: Int.self) ?? 0

let items =
try await sql
Expand All @@ -41,7 +41,7 @@ extension DatabaseQueryList {
.applyPage(query.page)
.all(decoding: Row.self)

return .init(items: items, total: total)
return .init(items: items, total: UInt(total))
}
}
}