File tree Expand file tree Collapse file tree 3 files changed +18
-4
lines changed Expand file tree Collapse file tree 3 files changed +18
-4
lines changed Original file line number Diff line number Diff line change @@ -272,7 +272,12 @@ extension Cursor : SequenceType {
272
272
public func generate( ) -> AnyGenerator < Binding ? > {
273
273
var idx = 0
274
274
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
+ }
276
281
}
277
282
}
278
283
Original file line number Diff line number Diff line change @@ -78,7 +78,15 @@ extension Expressible {
78
78
let expressed = expression
79
79
var idx = 0
80
80
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
82
90
}
83
91
}
84
92
Original file line number Diff line number Diff line change @@ -891,7 +891,7 @@ extension Connection {
891
891
let e = q. expression
892
892
var names = try self . prepare ( e. template, e. bindings) . columnNames. map { $0. quote ( ) }
893
893
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 }
895
895
}
896
896
}
897
897
@@ -914,7 +914,8 @@ extension Connection {
914
914
continue
915
915
}
916
916
917
- columnNames [ each . expression. template] = idx++
917
+ columnNames [ each . expression. template] = idx
918
+ idx += 1
918
919
}
919
920
return columnNames
920
921
} ( )
You can’t perform that action at this time.
0 commit comments