Skip to content

Commit 3393080

Browse files
coenttbgithub-actions[bot]
authored andcommitted
Run swift-format
1 parent e7410ac commit 3393080

File tree

300 files changed

+45434
-45277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

300 files changed

+45434
-45277
lines changed

Sources/StructuredQueriesCore/Bind.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
/// It is not common to interact with this type directly. A value of this type is returned from the
44
/// `#bind` macro.
55
public struct BindQueryExpression<QueryValue: QueryBindable>: QueryExpression {
6-
public let base: QueryValue
6+
public let base: QueryValue
77

8-
public init(
9-
_ queryOutput: QueryValue.QueryOutput,
10-
as queryValueType: QueryValue.Type = QueryValue.self
11-
) {
12-
self.base = QueryValue(queryOutput: queryOutput)
13-
}
8+
public init(
9+
_ queryOutput: QueryValue.QueryOutput,
10+
as queryValueType: QueryValue.Type = QueryValue.self
11+
) {
12+
self.base = QueryValue(queryOutput: queryOutput)
13+
}
1414

15-
public var queryFragment: QueryFragment {
16-
base.queryFragment
17-
}
15+
public var queryFragment: QueryFragment {
16+
base.queryFragment
17+
}
1818
}
Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
1-
21
/// A collating sequence name.
32
///
43
/// Values of this type are supplied to ``QueryExpression/collate(_:)`` to describe how a string
54
/// should be compared in a query.
65
public struct Collation: QueryExpression, Sendable {
7-
public typealias QueryValue = Never
6+
public typealias QueryValue = Never
87

9-
/// Initializes a collating sequence name from a query fragment.
10-
///
11-
/// ```swift
12-
/// extension Collation {
13-
/// static let fr_FR = Self(rawValue: "fr_FR")
14-
/// }
15-
///
16-
/// Reminder.order { $0.title.collate(.fr_FR) }
17-
/// // SELECT … FROM "reminders"
18-
/// // ORDER BY "reminders"."title" COLLATE "fr_FR"
19-
/// ```
20-
///
21-
/// - Parameter rawValue: A query fragment of the sequence name.
22-
public init(rawValue: String) {
23-
self.queryFragment = "\(quote: rawValue)"
24-
}
8+
/// Initializes a collating sequence name from a query fragment.
9+
///
10+
/// ```swift
11+
/// extension Collation {
12+
/// static let fr_FR = Self(rawValue: "fr_FR")
13+
/// }
14+
///
15+
/// Reminder.order { $0.title.collate(.fr_FR) }
16+
/// // SELECT … FROM "reminders"
17+
/// // ORDER BY "reminders"."title" COLLATE "fr_FR"
18+
/// ```
19+
///
20+
/// - Parameter rawValue: A query fragment of the sequence name.
21+
public init(rawValue: String) {
22+
self.queryFragment = "\(quote: rawValue)"
23+
}
2524

26-
public let queryFragment: QueryFragment
25+
public let queryFragment: QueryFragment
2726
}

Sources/StructuredQueriesCore/ColumnGroup.swift

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -5,86 +5,86 @@
55
@dynamicMemberLookup
66
public struct ColumnGroup<Root: Table, Values: Table>: _TableColumnExpression
77
where Values.QueryOutput == Values {
8-
public typealias Value = Values
8+
public typealias Value = Values
99

10-
public var _names: [String] { Values.TableColumns.allColumns.map(\.name) }
10+
public var _names: [String] { Values.TableColumns.allColumns.map(\.name) }
1111

12-
public typealias QueryValue = Values
12+
public typealias QueryValue = Values
1313

14-
public let keyPath: KeyPath<Root, Values>
14+
public let keyPath: KeyPath<Root, Values>
1515

16-
public init(keyPath: KeyPath<Root, Values>) {
17-
self.keyPath = keyPath
18-
}
16+
public init(keyPath: KeyPath<Root, Values>) {
17+
self.keyPath = keyPath
18+
}
1919

20-
public var queryFragment: QueryFragment {
21-
_allColumns.map(\.queryFragment).joined(separator: ", ")
22-
}
20+
public var queryFragment: QueryFragment {
21+
_allColumns.map(\.queryFragment).joined(separator: ", ")
22+
}
2323

24-
public subscript<Member>(
25-
dynamicMember keyPath: KeyPath<Values.TableColumns, TableColumn<Values, Member>>
26-
) -> TableColumn<Root, Member> {
27-
let column = Values.columns[keyPath: keyPath]
28-
return TableColumn<Root, Member>(
29-
column.name,
30-
keyPath: self.keyPath.appending(path: column.keyPath),
31-
default: column.defaultValue
32-
)
33-
}
24+
public subscript<Member>(
25+
dynamicMember keyPath: KeyPath<Values.TableColumns, TableColumn<Values, Member>>
26+
) -> TableColumn<Root, Member> {
27+
let column = Values.columns[keyPath: keyPath]
28+
return TableColumn<Root, Member>(
29+
column.name,
30+
keyPath: self.keyPath.appending(path: column.keyPath),
31+
default: column.defaultValue
32+
)
33+
}
3434

35-
public subscript<Member>(
36-
dynamicMember keyPath: KeyPath<Values.TableColumns, GeneratedColumn<Values, Member>>
37-
) -> GeneratedColumn<Root, Member> {
38-
let column = Values.columns[keyPath: keyPath]
39-
return GeneratedColumn<Root, Member>(
40-
column.name,
41-
keyPath: self.keyPath.appending(path: column.keyPath),
42-
default: column.defaultValue
43-
)
44-
}
35+
public subscript<Member>(
36+
dynamicMember keyPath: KeyPath<Values.TableColumns, GeneratedColumn<Values, Member>>
37+
) -> GeneratedColumn<Root, Member> {
38+
let column = Values.columns[keyPath: keyPath]
39+
return GeneratedColumn<Root, Member>(
40+
column.name,
41+
keyPath: self.keyPath.appending(path: column.keyPath),
42+
default: column.defaultValue
43+
)
44+
}
4545

46-
public subscript<Member>(
47-
dynamicMember keyPath: KeyPath<Values.TableColumns, ColumnGroup<Values, Member>>
48-
) -> ColumnGroup<Root, Member> {
49-
let column = Values.columns[keyPath: keyPath]
50-
return ColumnGroup<Root, Member>(
51-
keyPath: self.keyPath.appending(path: column.keyPath)
52-
)
53-
}
46+
public subscript<Member>(
47+
dynamicMember keyPath: KeyPath<Values.TableColumns, ColumnGroup<Values, Member>>
48+
) -> ColumnGroup<Root, Member> {
49+
let column = Values.columns[keyPath: keyPath]
50+
return ColumnGroup<Root, Member>(
51+
keyPath: self.keyPath.appending(path: column.keyPath)
52+
)
53+
}
5454

55-
public var _allColumns: [any TableColumnExpression] {
56-
Values.TableColumns.allColumns.map { column in
57-
func open<R, V>(
58-
_ column: some TableColumnExpression<R, V>
59-
) -> any TableColumnExpression {
60-
let keyPath = keyPath.appending(
61-
path: unsafeDowncast(column.keyPath, to: KeyPath<Values, V.QueryOutput>.self)
62-
)
63-
return TableColumn<Root, V>(
64-
column.name,
65-
keyPath: keyPath,
66-
default: column.defaultValue
67-
)
68-
}
69-
return open(column)
70-
}
55+
public var _allColumns: [any TableColumnExpression] {
56+
Values.TableColumns.allColumns.map { column in
57+
func open<R, V>(
58+
_ column: some TableColumnExpression<R, V>
59+
) -> any TableColumnExpression {
60+
let keyPath = keyPath.appending(
61+
path: unsafeDowncast(column.keyPath, to: KeyPath<Values, V.QueryOutput>.self)
62+
)
63+
return TableColumn<Root, V>(
64+
column.name,
65+
keyPath: keyPath,
66+
default: column.defaultValue
67+
)
68+
}
69+
return open(column)
7170
}
71+
}
7272

73-
public var _writableColumns: [any WritableTableColumnExpression] {
74-
Values.TableColumns.writableColumns.map { column in
75-
func open<R, V>(
76-
_ column: some WritableTableColumnExpression<R, V>
77-
) -> any WritableTableColumnExpression {
78-
let keyPath = keyPath.appending(
79-
path: unsafeDowncast(column.keyPath, to: KeyPath<Values, V.QueryOutput>.self)
80-
)
81-
return TableColumn<Root, V>(
82-
column.name,
83-
keyPath: keyPath,
84-
default: column.defaultValue
85-
)
86-
}
87-
return open(column)
88-
}
73+
public var _writableColumns: [any WritableTableColumnExpression] {
74+
Values.TableColumns.writableColumns.map { column in
75+
func open<R, V>(
76+
_ column: some WritableTableColumnExpression<R, V>
77+
) -> any WritableTableColumnExpression {
78+
let keyPath = keyPath.appending(
79+
path: unsafeDowncast(column.keyPath, to: KeyPath<Values, V.QueryOutput>.self)
80+
)
81+
return TableColumn<Root, V>(
82+
column.name,
83+
keyPath: keyPath,
84+
default: column.defaultValue
85+
)
86+
}
87+
return open(column)
8988
}
89+
}
9090
}

0 commit comments

Comments
 (0)