Skip to content

Commit 538f015

Browse files
updated swift and dart tests
1 parent abaab11 commit 538f015

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

templates/swift/Sources/Query.swift.twig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ enum QueryValue: Codable {
66
case double(Double)
77
case bool(Bool)
88
case query(Query)
9+
case array([QueryValue])
910

1011
init(from decoder: Decoder) throws {
1112
let container = try decoder.singleValueContainer()
@@ -86,7 +87,7 @@ public struct Query : Codable, CustomStringConvertible {
8687
case let queryValue as Query:
8788
return [.query(queryValue)]
8889
case let anyArray as [Any]:
89-
return anyArray.flatMap { convertToQueryValueArray($0) ?? [] }
90+
return return [.array(anyArray.compactMap { convertToQueryValueArray($0).map { .array($0) } })]
9091
default:
9192
return nil
9293
}

tests/languages/dart/tests.dart

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,6 @@ void main() async {
160160
print(Query.createdAfter("2023-01-01"));
161161
print(Query.updatedBefore("2023-01-01"));
162162
print(Query.updatedAfter("2023-01-01"));
163-
164-
print(Query.or([
165-
Query.equal("released", true),
166-
Query.lessThan("releasedYear", 1990)
167-
]));
168-
print(Query.and([
169-
Query.equal("released", false),
170-
Query.greaterThan("releasedYear", 2015)
171-
]));
172163

173164
// Spatial Distance query tests
174165
print(Query.distanceEqual("location", [40.7128, -74], 1000));
@@ -194,7 +185,11 @@ void main() async {
194185
Query.equal("released", true),
195186
Query.lessThan("releasedYear", 1990)
196187
]));
197-
188+
print(Query.and([
189+
Query.equal("released", false),
190+
Query.greaterThan("releasedYear", 2015)
191+
]));
192+
198193
// Permission & Role helper tests
199194
print(Permission.read(Role.any()));
200195
print(Permission.write(Role.user(ID.custom('userid'))));

0 commit comments

Comments
 (0)