Skip to content

Commit c479529

Browse files
committed
Fix CI build failure
1 parent 3b1130e commit c479529

1 file changed

Lines changed: 31 additions & 31 deletions

File tree

Sources/CoreDataRepository/AggregateRepository.swift

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -116,22 +116,22 @@ public final class AggregateRepository {
116116
entityDesc: NSEntityDescription) -> AnyPublisher<Success<Value>, Failure>
117117
{
118118
Deferred { Future { [weak self] callback in
119-
let request = NSFetchRequest<NSDictionary>(entityName: entityDesc.name ?? "")
120-
request.predicate = predicate
121-
request
119+
let _request = NSFetchRequest<NSDictionary>(entityName: entityDesc.name ?? "")
120+
_request.predicate = predicate
121+
_request
122122
.sortDescriptors =
123123
[NSSortDescriptor(key: entityDesc.attributesByName.values.first!.name, ascending: true)]
124124
guard let self = self
125-
else { return callback(.failure(Failure(function: .count, request: request, error: .unknown))) }
125+
else { return callback(.failure(Failure(function: .count, request: _request, error: .unknown))) }
126126
do {
127-
let count = try self.context.count(for: request)
127+
let count = try self.context.count(for: _request)
128128
callback(.success(Success(
129129
function: .count,
130130
result: [["countOf\(entityDesc.name ?? "")": Value(exactly: count) ?? Value.zero]],
131-
request: request
131+
request: _request
132132
)))
133133
} catch {
134-
callback(.failure(Failure(function: .count, request: request, error: .cocoa(error as NSError))))
134+
callback(.failure(Failure(function: .count, request: _request, error: .cocoa(error as NSError))))
135135
}
136136

137137
}}.eraseToAnyPublisher()
@@ -152,25 +152,25 @@ public final class AggregateRepository {
152152
attributeDesc: NSAttributeDescription,
153153
groupBy: NSAttributeDescription? = nil
154154
) -> AnyPublisher<Success<Value>, Failure> {
155-
let request = request(
155+
let _request = request(
156156
function: .sum,
157157
predicate: predicate,
158158
entityDesc: entityDesc,
159159
attributeDesc: attributeDesc,
160160
groupBy: groupBy
161161
)
162162
guard entityDesc == attributeDesc.entity else {
163-
return Fail(error: Failure(function: .sum, request: request, error: .propertyDoesNotMatchEntity))
163+
return Fail(error: Failure(function: .sum, request: _request, error: .propertyDoesNotMatchEntity))
164164
.eraseToAnyPublisher()
165165
}
166166
return Deferred { Future { [weak self] callback in
167167
guard let self = self
168-
else { return callback(.failure(Failure(function: .sum, request: request, error: .unknown))) }
168+
else { return callback(.failure(Failure(function: .sum, request: _request, error: .unknown))) }
169169
do {
170-
let result: [[String: Value]] = try self.aggregate(request: request)
171-
callback(.success(Success(function: .sum, result: result, request: request)))
170+
let result: [[String: Value]] = try self.aggregate(request: _request)
171+
callback(.success(Success(function: .sum, result: result, request: _request)))
172172
} catch {
173-
callback(.failure(Failure(function: .sum, request: request, error: .cocoa(error as NSError))))
173+
callback(.failure(Failure(function: .sum, request: _request, error: .cocoa(error as NSError))))
174174
}
175175
}}.eraseToAnyPublisher()
176176
}
@@ -190,25 +190,25 @@ public final class AggregateRepository {
190190
attributeDesc: NSAttributeDescription,
191191
groupBy: NSAttributeDescription? = nil
192192
) -> AnyPublisher<Success<Value>, Failure> {
193-
let request = request(
193+
let _request = request(
194194
function: .average,
195195
predicate: predicate,
196196
entityDesc: entityDesc,
197197
attributeDesc: attributeDesc,
198198
groupBy: groupBy
199199
)
200200
guard entityDesc == attributeDesc.entity else {
201-
return Fail(error: Failure(function: .average, request: request, error: .propertyDoesNotMatchEntity))
201+
return Fail(error: Failure(function: .average, request: _request, error: .propertyDoesNotMatchEntity))
202202
.eraseToAnyPublisher()
203203
}
204204
return Deferred { Future { [weak self] callback in
205205
guard let self = self
206-
else { return callback(.failure(Failure(function: .average, request: request, error: .unknown))) }
206+
else { return callback(.failure(Failure(function: .average, request: _request, error: .unknown))) }
207207
do {
208-
let result: [[String: Value]] = try self.aggregate(request: request)
209-
callback(.success(Success(function: .average, result: result, request: request)))
208+
let result: [[String: Value]] = try self.aggregate(request: _request)
209+
callback(.success(Success(function: .average, result: result, request: _request)))
210210
} catch {
211-
callback(.failure(Failure(function: .average, request: request, error: .cocoa(error as NSError))))
211+
callback(.failure(Failure(function: .average, request: _request, error: .cocoa(error as NSError))))
212212
}
213213
}}.eraseToAnyPublisher()
214214
}
@@ -228,25 +228,25 @@ public final class AggregateRepository {
228228
attributeDesc: NSAttributeDescription,
229229
groupBy: NSAttributeDescription? = nil
230230
) -> AnyPublisher<Success<Value>, Failure> {
231-
let request = request(
231+
let _request = request(
232232
function: .min,
233233
predicate: predicate,
234234
entityDesc: entityDesc,
235235
attributeDesc: attributeDesc,
236236
groupBy: groupBy
237237
)
238238
guard entityDesc == attributeDesc.entity else {
239-
return Fail(error: Failure(function: .min, request: request, error: .propertyDoesNotMatchEntity))
239+
return Fail(error: Failure(function: .min, request: _request, error: .propertyDoesNotMatchEntity))
240240
.eraseToAnyPublisher()
241241
}
242242
return Deferred { Future { [weak self] callback in
243243
guard let self = self
244-
else { return callback(.failure(Failure(function: .min, request: request, error: .unknown))) }
244+
else { return callback(.failure(Failure(function: .min, request: _request, error: .unknown))) }
245245
do {
246-
let result: [[String: Value]] = try self.aggregate(request: request)
247-
callback(.success(Success(function: .min, result: result, request: request)))
246+
let result: [[String: Value]] = try self.aggregate(request: _request)
247+
callback(.success(Success(function: .min, result: result, request: _request)))
248248
} catch {
249-
callback(.failure(Failure(function: .min, request: request, error: .cocoa(error as NSError))))
249+
callback(.failure(Failure(function: .min, request: _request, error: .cocoa(error as NSError))))
250250
}
251251
}}.eraseToAnyPublisher()
252252
}
@@ -266,25 +266,25 @@ public final class AggregateRepository {
266266
attributeDesc: NSAttributeDescription,
267267
groupBy: NSAttributeDescription? = nil
268268
) -> AnyPublisher<Success<Value>, Failure> {
269-
let request = request(
269+
let _request = request(
270270
function: .max,
271271
predicate: predicate,
272272
entityDesc: entityDesc,
273273
attributeDesc: attributeDesc,
274274
groupBy: groupBy
275275
)
276276
guard entityDesc == attributeDesc.entity else {
277-
return Fail(error: Failure(function: .max, request: request, error: .propertyDoesNotMatchEntity))
277+
return Fail(error: Failure(function: .max, request: _request, error: .propertyDoesNotMatchEntity))
278278
.eraseToAnyPublisher()
279279
}
280280
return Deferred { Future { [weak self] callback in
281281
guard let self = self
282-
else { return callback(.failure(Failure(function: .max, request: request, error: .unknown))) }
282+
else { return callback(.failure(Failure(function: .max, request: _request, error: .unknown))) }
283283
do {
284-
let result: [[String: Value]] = try self.aggregate(request: request)
285-
callback(.success(Success(function: .max, result: result, request: request)))
284+
let result: [[String: Value]] = try self.aggregate(request: _request)
285+
callback(.success(Success(function: .max, result: result, request: _request)))
286286
} catch {
287-
callback(.failure(Failure(function: .max, request: request, error: .cocoa(error as NSError))))
287+
callback(.failure(Failure(function: .max, request: _request, error: .cocoa(error as NSError))))
288288
}
289289
}}.eraseToAnyPublisher()
290290
}

0 commit comments

Comments
 (0)