Skip to content

Commit be24c38

Browse files
Fix suffix incremental operator deprecation warnings
1 parent 89e3bfc commit be24c38

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

SQLite/Core/Statement.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,12 @@ extension Cursor : SequenceType {
272272
public func generate() -> AnyGenerator<Binding?> {
273273
var idx = 0
274274
return AnyGenerator {
275-
idx >= self.columnCount ? Optional<Binding?>.None : self[idx++]
275+
if idx >= self.columnCount {
276+
return Optional<Binding?>.None
277+
} else {
278+
idx += 1
279+
return self[idx - 1]
280+
}
276281
}
277282
}
278283

SQLite/Typed/Expression.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,15 @@ extension Expressible {
7878
let expressed = expression
7979
var idx = 0
8080
return expressed.template.characters.reduce("") { template, character in
81-
return template + (character == "?" ? transcode(expressed.bindings[idx++]) : String(character))
81+
let transcoded: String
82+
83+
if character == "?" {
84+
transcoded = transcode(expressed.bindings[idx])
85+
idx += 1
86+
} else {
87+
transcoded = String(character)
88+
}
89+
return template + transcoded
8290
}
8391
}
8492

SQLite/Typed/Query.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ extension Connection {
891891
let e = q.expression
892892
var names = try self.prepare(e.template, e.bindings).columnNames.map { $0.quote() }
893893
if namespace { names = names.map { "\(query.tableName().expression.template).\($0)" } }
894-
for name in names { columnNames[name] = idx++ }
894+
for name in names { columnNames[name] = idx; idx += 1 }
895895
}
896896
}
897897

@@ -914,7 +914,8 @@ extension Connection {
914914
continue
915915
}
916916

917-
columnNames[each.expression.template] = idx++
917+
columnNames[each.expression.template] = idx
918+
idx += 1
918919
}
919920
return columnNames
920921
}()

0 commit comments

Comments
 (0)