Skip to content

Allow 'find' to work with query expressions. #86

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
mbrandonw merged 1 commit into from
Jun 17, 2025
Merged

Allow 'find' to work with query expressions. #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 16 additions & 14 deletions Sources/StructuredQueriesCore/PrimaryKeyed.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ extension PrimaryKeyedTable {
///
/// - Parameter primaryKey: A primary key identifying a table row.
/// - Returns: A `WHERE` clause.
public static func find(_ primaryKey: TableColumns.PrimaryKey.QueryOutput) -> Where<Self> {
Self.where { $0.primaryKey.eq(TableColumns.PrimaryKey(queryOutput: primaryKey)) }
public static func find(
_ primaryKey: some QueryExpression<TableColumns.PrimaryKey>
) -> Where<Self> {
Self.where { $0.primaryKey.eq(primaryKey) }
}
}

Expand All @@ -92,12 +94,10 @@ extension TableDraft {
/// - Parameter primaryKey: A primary key identifying a table row.
/// - Returns: A `WHERE` clause.
public static func find(
_ primaryKey: PrimaryTable.TableColumns.PrimaryKey.QueryOutput
_ primaryKey: some QueryExpression<PrimaryTable.TableColumns.PrimaryKey>
) -> Where<Self> {
Self.where { _ in
PrimaryTable.columns.primaryKey.eq(
PrimaryTable.TableColumns.PrimaryKey(queryOutput: primaryKey)
)
PrimaryTable.columns.primaryKey.eq(primaryKey)
}
}
}
Expand All @@ -107,8 +107,8 @@ extension Where where From: PrimaryKeyedTable {
///
/// - Parameter primaryKey: A primary key.
/// - Returns: A where clause with the added primary key.
public func find(_ primaryKey: From.TableColumns.PrimaryKey.QueryOutput) -> Self {
self.where { $0.primaryKey.eq(From.TableColumns.PrimaryKey(queryOutput: primaryKey)) }
public func find(_ primaryKey: some QueryExpression<From.TableColumns.PrimaryKey>) -> Self {
self.where { $0.primaryKey.eq(primaryKey) }
}
}

Expand All @@ -131,7 +131,7 @@ extension Select where From: PrimaryKeyedTable {
///
/// - Parameter primaryKey: A primary key identifying a table row.
/// - Returns: A select statement filtered by the given key.
public func find(_ primaryKey: From.TableColumns.PrimaryKey.QueryOutput) -> Self {
public func find(_ primaryKey: some QueryExpression<From.TableColumns.PrimaryKey>) -> Self {
self.and(From.find(primaryKey))
}
}
Expand All @@ -141,7 +141,9 @@ extension Select where From: TableDraft {
///
/// - Parameter primaryKey: A primary key identifying a table row.
/// - Returns: A select statement filtered by the given key.
public func find(_ primaryKey: From.PrimaryTable.TableColumns.PrimaryKey.QueryOutput) -> Self {
public func find(
_ primaryKey: some QueryExpression<From.PrimaryTable.TableColumns.PrimaryKey>
) -> Self {
self.and(From.find(primaryKey))
}
}
Expand All @@ -151,8 +153,8 @@ extension Update where From: PrimaryKeyedTable {
///
/// - Parameter primaryKey: A primary key identifying a table row.
/// - Returns: An update statement filtered by the given key.
public func find(_ primaryKey: From.TableColumns.PrimaryKey.QueryOutput) -> Self {
self.where { $0.primaryKey.eq(From.TableColumns.PrimaryKey(queryOutput: primaryKey)) }
public func find(_ primaryKey: some QueryExpression<From.TableColumns.PrimaryKey>) -> Self {
self.where { $0.primaryKey.eq(primaryKey) }
}
}

Expand All @@ -175,8 +177,8 @@ extension Delete where From: PrimaryKeyedTable {
///
/// - Parameter primaryKey: A primary key identifying a table row.
/// - Returns: A delete statement filtered by the given key.
public func find(_ primaryKey: From.TableColumns.PrimaryKey.QueryOutput) -> Self {
self.where { $0.primaryKey.eq(From.TableColumns.PrimaryKey(queryOutput: primaryKey)) }
public func find(_ primaryKey: some QueryExpression<From.TableColumns.PrimaryKey>) -> Self {
self.where { $0.primaryKey.eq(primaryKey) }
}
}

Expand Down