#171: Missing upgrades to the new ResultCode APIs

groue · Mar 1, 2017 · fe05ac9 · fe05ac9
1 parent b873162
commit fe05ac9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/GRDB/FTS/FTS5CustomTokenizer.swift b/GRDB/FTS/FTS5CustomTokenizer.swift
@@ -81,7 +81,7 @@
                         tokenizerHandle.pointee = tokenizerPointer
                         return SQLITE_OK
                     } catch let error as DatabaseError {
-                        return error.code
+                        return error.extendedResultCode.rawValue
                     } catch {
                         return SQLITE_ERROR
                     }
@@ -134,7 +134,7 @@
             }
             guard code == SQLITE_OK else {
                 // Assume a GRDB bug: there is no point throwing any error.
-                fatalError(DatabaseError(resultCode: code, message: lastErrorMessage).description)
+                fatalError(DatabaseError(resultCode: ResultCode(rawValue: code), message: lastErrorMessage).description)
             }
         }
     }

diff --git a/GRDB/FTS/FTS5Pattern.swift b/GRDB/FTS/FTS5Pattern.swift
@@ -67,7 +67,7 @@
                 }
             } catch let error as DatabaseError {
                 // Remove private SQL & arguments from the thrown error
-                throw DatabaseError(resultCode: error.code, message: error.message, sql: nil, arguments: nil)
+                throw DatabaseError(resultCode: error.extendedResultCode, message: error.message, sql: nil, arguments: nil)
             }
 
             // Pattern is valid

diff --git a/GRDB/FTS/FTS5Tokenizer.swift b/GRDB/FTS/FTS5Tokenizer.swift
@@ -87,7 +87,7 @@
                         return SQLITE_OK
                     })
                     if (code != SQLITE_OK) {
-                        throw DatabaseError(resultCode: code)
+                        throw DatabaseError(resultCode: ResultCode(rawValue: code))
                     }
                 }
                 return context.tokens
@@ -147,13 +147,13 @@
                 }
 
                 guard code == SQLITE_OK else {
-                    throw DatabaseError(resultCode: code, message: "failed fts5_tokenizer.xCreate")
+                    throw DatabaseError(resultCode: ResultCode(rawValue: code), message: "failed fts5_tokenizer.xCreate")
                 }
 
                 if let tokenizerPointer = tokenizerPointer {
                     self.tokenizerPointer = tokenizerPointer
                 } else {
-                    throw DatabaseError(resultCode: code, message: "nil tokenizer")
+                    throw DatabaseError(resultCode: ResultCode(rawValue: code), message: "nil tokenizer")
                 }
             }
 
@@ -205,7 +205,7 @@
                 xTokenizerPointer)
 
             guard code == SQLITE_OK else {
-                throw DatabaseError(resultCode: code)
+                throw DatabaseError(resultCode: ResultCode(rawValue: code))
             }
 
             let contextPointer = contextHandle.pointee

diff --git a/GRDB/FTS/FTS5WrapperTokenizer.swift b/GRDB/FTS/FTS5WrapperTokenizer.swift
@@ -123,14 +123,14 @@
                                     // Inject token bytes into SQLite
                                     let code = tokenCallback(context, flags.rawValue, pToken, nToken, iStart, iEnd)
                                     guard code == SQLITE_OK else {
-                                        throw DatabaseError(resultCode: code, message: "token callback failed")
+                                        throw DatabaseError(resultCode: ResultCode(rawValue: code), message: "token callback failed")
                                     }
                                 }
                         })
 
                         return SQLITE_OK
                     } catch let error as DatabaseError {
-                        return error.code
+                        return error.extendedResultCode.rawValue
                     } catch {
                         return SQLITE_ERROR
                     }