@@ -35,8 +35,7 @@ class KotlinSqlCursor: SqlCursor {
3535 }
3636
3737 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) )
4039 }
4140
4241 func getDouble( index: Int ) throws -> Double {
@@ -58,8 +57,7 @@ class KotlinSqlCursor: SqlCursor {
5857 }
5958
6059 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) )
6361 }
6462
6563 func getInt( index: Int ) throws -> Int {
@@ -81,8 +79,7 @@ class KotlinSqlCursor: SqlCursor {
8179 }
8280
8381 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) )
8683 }
8784
8885 func getInt64( index: Int ) throws -> Int64 {
@@ -104,8 +101,7 @@ class KotlinSqlCursor: SqlCursor {
104101 }
105102
106103 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) )
109105 }
110106
111107 func getString( index: Int ) throws -> String {
@@ -127,11 +123,7 @@ class KotlinSqlCursor: SqlCursor {
127123 }
128124
129125 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) )
135127 }
136128
137129 @discardableResult
0 commit comments