@@ -35,8 +35,7 @@ class KotlinSqlCursor: SqlCursor {
35
35
}
36
36
37
37
func getBooleanOptional( name: String ) throws -> Bool ? {
38
- try guardColumnName ( name)
39
- return try base. getBooleanOptional ( name: name) ? . boolValue
38
+ return getBooleanOptional ( index: try guardColumnName ( name) )
40
39
}
41
40
42
41
func getDouble( index: Int ) throws -> Double {
@@ -58,8 +57,7 @@ class KotlinSqlCursor: SqlCursor {
58
57
}
59
58
60
59
func getDoubleOptional( name: String ) throws -> Double ? {
61
- try guardColumnName ( name)
62
- return try base. getDoubleOptional ( name: name) ? . doubleValue
60
+ return getDoubleOptional ( index: try guardColumnName ( name) )
63
61
}
64
62
65
63
func getInt( index: Int ) throws -> Int {
@@ -81,8 +79,7 @@ class KotlinSqlCursor: SqlCursor {
81
79
}
82
80
83
81
func getIntOptional( name: String ) throws -> Int ? {
84
- try guardColumnName ( name)
85
- return try base. getLongOptional ( name: name) ? . intValue
82
+ return getIntOptional ( index: try guardColumnName ( name) )
86
83
}
87
84
88
85
func getInt64( index: Int ) throws -> Int64 {
@@ -104,8 +101,7 @@ class KotlinSqlCursor: SqlCursor {
104
101
}
105
102
106
103
func getInt64Optional( name: String ) throws -> Int64 ? {
107
- try guardColumnName ( name)
108
- return try base. getLongOptional ( name: name) ? . int64Value
104
+ return getInt64Optional ( index: try guardColumnName ( name) )
109
105
}
110
106
111
107
func getString( index: Int ) throws -> String {
@@ -127,11 +123,7 @@ class KotlinSqlCursor: SqlCursor {
127
123
}
128
124
129
125
func getStringOptional( name: String ) throws -> String ? {
130
- /// For some reason this method is not exposed from the Kotlin side
131
- guard let columnIndex = columnNames [ name] else {
132
- throw SqlCursorError . columnNotFound ( name)
133
- }
134
- return getStringOptional ( index: columnIndex)
126
+ return getStringOptional ( index: try guardColumnName ( name) )
135
127
}
136
128
137
129
@discardableResult
0 commit comments