Skip to content

Commit 77c634c

Browse files
stephencelisstephencelis
committed
wip
1 parent 6f981ee commit 77c634c

File tree

2 files changed

+108
-36
lines changed

2 files changed

+108
-36
lines changed

‎Tests/StructuredQueriesMacrosTests/TableMacroTests.swift‎

Lines changed: 105 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ extension SnapshotTests {
2828
}
2929
3030
extension Foo: StructuredQueriesCore.Table {
31-
public static let columns = TableColumns()
31+
public static var columns: TableColumns {
32+
TableColumns()
33+
}
3234
public static let tableName = "foos"
3335
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
3436
let bar = try decoder.decode(Int.self)
@@ -92,7 +94,9 @@ extension SnapshotTests {
9294
[QueryValue.columns.id, QueryValue.columns.email, QueryValue.columns.age]
9395
}
9496
}
95-
public static let columns = TableColumns()
97+
public static var columns: TableColumns {
98+
TableColumns()
99+
}
96100
97101
public static let tableName = User.tableName
98102
@@ -124,7 +128,9 @@ extension SnapshotTests {
124128
}
125129
126130
extension User: StructuredQueriesCore.Table, StructuredQueriesCore.PrimaryKeyedTable {
127-
public static let columns = TableColumns()
131+
public static var columns: TableColumns {
132+
TableColumns()
133+
}
128134
public static let tableName = "users"
129135
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
130136
let id = try decoder.decode(Int.self)
@@ -167,7 +173,9 @@ extension SnapshotTests {
167173
}
168174
169175
extension Foo: StructuredQueriesCore.Table {
170-
public static let columns = TableColumns()
176+
public static var columns: TableColumns {
177+
TableColumns()
178+
}
171179
public static let tableName = "foo"
172180
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
173181
let bar = try decoder.decode(Int.self)
@@ -244,7 +252,9 @@ extension SnapshotTests {
244252
}
245253
246254
extension Bar: StructuredQueriesCore.Table {
247-
public static let columns = TableColumns()
255+
public static var columns: TableColumns {
256+
TableColumns()
257+
}
248258
public static let tableName = "bar"
249259
public static let schemaName: Swift.String? = "foo"
250260
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
@@ -331,7 +341,9 @@ extension SnapshotTests {
331341
}
332342
333343
extension Foo: StructuredQueriesCore.Table {
334-
public static let columns = TableColumns()
344+
public static var columns: TableColumns {
345+
TableColumns()
346+
}
335347
public static let tableName = "foos"
336348
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
337349
self.c1 = try decoder.decode(Swift.Bool.self) ?? true
@@ -368,7 +380,9 @@ extension SnapshotTests {
368380
}
369381
370382
extension Foo: StructuredQueriesCore.Table {
371-
public static let columns = TableColumns()
383+
public static var columns: TableColumns {
384+
TableColumns()
385+
}
372386
public static let tableName = "foos"
373387
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
374388
let bar = try decoder.decode(Int.self)
@@ -450,7 +464,9 @@ extension SnapshotTests {
450464
}
451465
452466
extension Foo: StructuredQueriesCore.Table {
453-
public static let columns = TableColumns()
467+
public static var columns: TableColumns {
468+
TableColumns()
469+
}
454470
public static let tableName = "foos"
455471
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
456472
let bar = try decoder.decode(Date.UnixTimeRepresentation.self)
@@ -489,7 +505,9 @@ extension SnapshotTests {
489505
}
490506
491507
extension Foo: StructuredQueriesCore.Table {
492-
public static let columns = TableColumns()
508+
public static var columns: TableColumns {
509+
TableColumns()
510+
}
493511
public static let tableName = "foos"
494512
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
495513
let bar = try decoder.decode(Int.self)
@@ -528,7 +546,9 @@ extension SnapshotTests {
528546
}
529547
530548
extension Foo: StructuredQueriesCore.Table {
531-
public static let columns = TableColumns()
549+
public static var columns: TableColumns {
550+
TableColumns()
551+
}
532552
public static let tableName = "foos"
533553
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
534554
let bar = try decoder.decode(Int.self)
@@ -565,7 +585,9 @@ extension SnapshotTests {
565585
}
566586
567587
extension Foo: StructuredQueriesCore.Table {
568-
public static let columns = TableColumns()
588+
public static var columns: TableColumns {
589+
TableColumns()
590+
}
569591
public static let tableName = "foos"
570592
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
571593
let `bar` = try decoder.decode(Int.self)
@@ -602,7 +624,9 @@ extension SnapshotTests {
602624
}
603625
604626
extension Foo: StructuredQueriesCore.Table {
605-
public static let columns = TableColumns()
627+
public static var columns: TableColumns {
628+
TableColumns()
629+
}
606630
public static let tableName = "foos"
607631
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
608632
let bar = try decoder.decode(ID<Foo>.self)
@@ -639,7 +663,9 @@ extension SnapshotTests {
639663
}
640664
641665
extension Foo: StructuredQueriesCore.Table {
642-
public static let columns = TableColumns()
666+
public static var columns: TableColumns {
667+
TableColumns()
668+
}
643669
public static let tableName = "foos"
644670
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
645671
self.bar = try decoder.decode() ?? ID<Foo>()
@@ -690,7 +716,9 @@ extension SnapshotTests {
690716
[QueryValue.columns.id, QueryValue.columns.referrerID]
691717
}
692718
}
693-
public static let columns = TableColumns()
719+
public static var columns: TableColumns {
720+
TableColumns()
721+
}
694722
695723
public static let tableName = User.tableName
696724
@@ -714,7 +742,9 @@ extension SnapshotTests {
714742
}
715743
716744
extension User: StructuredQueriesCore.Table, StructuredQueriesCore.PrimaryKeyedTable {
717-
public static let columns = TableColumns()
745+
public static var columns: TableColumns {
746+
TableColumns()
747+
}
718748
public static let tableName = "users"
719749
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
720750
let id = try decoder.decode(ID<User, UUID.BytesRepresentation>.self)
@@ -754,7 +784,9 @@ extension SnapshotTests {
754784
}
755785
756786
extension SyncUp: StructuredQueriesCore.Table {
757-
public static let columns = TableColumns()
787+
public static var columns: TableColumns {
788+
TableColumns()
789+
}
758790
public static let tableName = "syncUps"
759791
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
760792
let name = try decoder.decode(String.self)
@@ -809,7 +841,9 @@ extension SnapshotTests {
809841
[QueryValue.columns.id, QueryValue.columns.name]
810842
}
811843
}
812-
public static let columns = TableColumns()
844+
public static var columns: TableColumns {
845+
TableColumns()
846+
}
813847
814848
public static let tableName = SyncUp.tableName
815849
@@ -837,7 +871,9 @@ extension SnapshotTests {
837871
}
838872
839873
extension SyncUp: StructuredQueriesCore.Table, StructuredQueriesCore.PrimaryKeyedTable {
840-
public static let columns = TableColumns()
874+
public static var columns: TableColumns {
875+
TableColumns()
876+
}
841877
public static let tableName = "syncUps"
842878
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
843879
let id = try decoder.decode(Int.self)
@@ -911,7 +947,9 @@ extension SnapshotTests {
911947
[QueryValue.columns.id, QueryValue.columns.seconds]
912948
}
913949
}
914-
public static let columns = TableColumns()
950+
public static var columns: TableColumns {
951+
TableColumns()
952+
}
915953
916954
public static let tableName = SyncUp.tableName
917955
@@ -935,7 +973,9 @@ extension SnapshotTests {
935973
}
936974
937975
extension SyncUp: StructuredQueriesCore.Table, StructuredQueriesCore.PrimaryKeyedTable {
938-
public static let columns = TableColumns()
976+
public static var columns: TableColumns {
977+
TableColumns()
978+
}
939979
public static let tableName = "syncUps"
940980
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
941981
let id = try decoder.decode(Int.self)
@@ -995,7 +1035,9 @@ extension SnapshotTests {
9951035
[QueryValue.columns.id, QueryValue.columns.color, QueryValue.columns.name]
9961036
}
9971037
}
998-
public static let columns = TableColumns()
1038+
public static var columns: TableColumns {
1039+
TableColumns()
1040+
}
9991041
10001042
public static let tableName = RemindersList.tableName
10011043
@@ -1023,7 +1065,9 @@ extension SnapshotTests {
10231065
}
10241066
10251067
extension RemindersList: StructuredQueriesCore.Table, StructuredQueriesCore.PrimaryKeyedTable {
1026-
public static let columns = TableColumns()
1068+
public static var columns: TableColumns {
1069+
TableColumns()
1070+
}
10271071
public static let tableName = "remindersLists"
10281072
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
10291073
let id = try decoder.decode(Int.self)
@@ -1085,7 +1129,9 @@ extension SnapshotTests {
10851129
}
10861130
10871131
extension Foo: StructuredQueriesCore.Table {
1088-
public static let columns = TableColumns()
1132+
public static var columns: TableColumns {
1133+
TableColumns()
1134+
}
10891135
public static let tableName = "foos"
10901136
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
10911137
let name = try decoder.decode(String.self)
@@ -1135,7 +1181,9 @@ extension SnapshotTests {
11351181
[QueryValue.columns.id]
11361182
}
11371183
}
1138-
public static let columns = TableColumns()
1184+
public static var columns: TableColumns {
1185+
TableColumns()
1186+
}
11391187
11401188
public static let tableName = Foo.tableName
11411189
@@ -1155,7 +1203,9 @@ extension SnapshotTests {
11551203
}
11561204
11571205
extension Foo: StructuredQueriesCore.Table, StructuredQueriesCore.PrimaryKeyedTable {
1158-
public static let columns = TableColumns()
1206+
public static var columns: TableColumns {
1207+
TableColumns()
1208+
}
11591209
public static let tableName = "foos"
11601210
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
11611211
let id = try decoder.decode(Int.self)
@@ -1228,7 +1278,9 @@ extension SnapshotTests {
12281278
}
12291279
12301280
extension Foo.Draft: StructuredQueriesCore.Table {
1231-
public static let columns = TableColumns()
1281+
public static var columns: TableColumns {
1282+
TableColumns()
1283+
}
12321284
public static let tableName = Foo.tableName
12331285
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
12341286
let id = try decoder.decode(Int.self)
@@ -1292,7 +1344,9 @@ extension SnapshotTests {
12921344
[QueryValue.columns.id, QueryValue.columns.name]
12931345
}
12941346
}
1295-
public static let columns = TableColumns()
1347+
public static var columns: TableColumns {
1348+
TableColumns()
1349+
}
12961350
12971351
public static let tableName = Foo.tableName
12981352
@@ -1320,7 +1374,9 @@ extension SnapshotTests {
13201374
}
13211375
13221376
extension Foo: StructuredQueriesCore.Table, StructuredQueriesCore.PrimaryKeyedTable {
1323-
public static let columns = TableColumns()
1377+
public static var columns: TableColumns {
1378+
TableColumns()
1379+
}
13241380
public static let tableName = "foos"
13251381
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
13261382
let id = try decoder.decode(Int.self)
@@ -1389,7 +1445,9 @@ extension SnapshotTests {
13891445
[QueryValue.columns.id, QueryValue.columns.title, QueryValue.columns.date, QueryValue.columns.priority]
13901446
}
13911447
}
1392-
public static let columns = TableColumns()
1448+
public static var columns: TableColumns {
1449+
TableColumns()
1450+
}
13931451
13941452
public static let tableName = Reminder.tableName
13951453
@@ -1421,7 +1479,9 @@ extension SnapshotTests {
14211479
}
14221480
14231481
extension Reminder: StructuredQueriesCore.Table, StructuredQueriesCore.PrimaryKeyedTable {
1424-
public static let columns = TableColumns()
1482+
public static var columns: TableColumns {
1483+
TableColumns()
1484+
}
14251485
public static let tableName = "reminders"
14261486
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
14271487
let id = try decoder.decode(Int.self)
@@ -1473,7 +1533,9 @@ extension SnapshotTests {
14731533
[QueryValue.columns.id]
14741534
}
14751535
}
1476-
public static let columns = TableColumns()
1536+
public static var columns: TableColumns {
1537+
TableColumns()
1538+
}
14771539
14781540
public static let tableName = Reminder.tableName
14791541
@@ -1493,7 +1555,9 @@ extension SnapshotTests {
14931555
}
14941556
14951557
extension Reminder: StructuredQueriesCore.Table, StructuredQueriesCore.PrimaryKeyedTable {
1496-
public static let columns = TableColumns()
1558+
public static var columns: TableColumns {
1559+
TableColumns()
1560+
}
14971561
public static let tableName = "reminders"
14981562
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
14991563
let id = try decoder.decode(UUID.BytesRepresentation.self)
@@ -1531,7 +1595,9 @@ extension SnapshotTests {
15311595
}
15321596
15331597
extension Reminder: StructuredQueriesCore.Table {
1534-
public static let columns = TableColumns()
1598+
public static var columns: TableColumns {
1599+
TableColumns()
1600+
}
15351601
public static let tableName = "reminders"
15361602
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
15371603
let id = try decoder.decode(Int.self)
@@ -1584,7 +1650,9 @@ extension SnapshotTests {
15841650
[QueryValue.columns.id, QueryValue.columns.title]
15851651
}
15861652
}
1587-
public static let columns = TableColumns()
1653+
public static var columns: TableColumns {
1654+
TableColumns()
1655+
}
15881656
15891657
public static let tableName = Reminder.tableName
15901658
@@ -1608,7 +1676,9 @@ extension SnapshotTests {
16081676
}
16091677
16101678
extension Reminder: StructuredQueriesCore.Table, StructuredQueriesCore.PrimaryKeyedTable {
1611-
public static let columns = TableColumns()
1679+
public static var columns: TableColumns {
1680+
TableColumns()
1681+
}
16121682
public static let tableName = "reminders"
16131683
public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
16141684
self.id = try decoder.decode(Int.self)

‎Tests/StructuredQueriesMacrosTests/TableSelectionMacroTests.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ extension SnapshotTests {
4646
extension ReminderListWithCount: StructuredQueriesCore.Table, StructuredQueriesCore.PartialSelectStatement {
4747
public typealias QueryValue = Self
4848
public typealias From = Swift.Never
49-
public static let columns = TableColumns()
49+
public static var columns: TableColumns {
50+
TableColumns()
51+
}
5052
public static let tableName = "reminderListWithCounts"
5153
}
5254

0 commit comments

Comments
 (0)