mirror of
https://github.com/groue/GRDB.swift
synced 2026-11-22 04:00:39 +00:00
1 parent
fe774b3537
commit
9858de3249
4 files changed
+12
-7
No files matched your search
@@ -147,7 +147,10 @@ public struct DatabaseValue: Hashable {
|
||||
case SQLITE_FLOAT:
|
||||
storage = .double(sqlite3_value_double(sqliteValue))
|
||||
case SQLITE_TEXT:
|
||||
storage = .string(String(cString: sqlite3_value_text(sqliteValue)!))
|
||||
let text = sqlite3_value_text(sqliteValue)
|
||||
let byteCount = Int(sqlite3_value_bytes(sqliteValue))
|
||||
let string = String(decoding: UnsafeBufferPointer(start: text, count: byteCount), as: UTF8.self)
|
||||
storage = .string(string)
|
||||
case SQLITE_BLOB:
|
||||
if let bytes = sqlite3_value_blob(sqliteValue) {
|
||||
let count = Int(sqlite3_value_bytes(sqliteValue))
|
||||
@@ -171,7 +174,8 @@ public struct DatabaseValue: Hashable {
|
||||
case SQLITE_FLOAT:
|
||||
storage = .double(sqlite3_column_double(sqliteStatement, index))
|
||||
case SQLITE_TEXT:
|
||||
storage = .string(String(cString: sqlite3_column_text(sqliteStatement, index)))
|
||||
let string = String(sqliteStatement: sqliteStatement, index: index)
|
||||
storage = .string(string)
|
||||
case SQLITE_BLOB:
|
||||
if let bytes = sqlite3_column_blob(sqliteStatement, index) {
|
||||
let count = Int(sqlite3_column_bytes(sqliteStatement, index))
|
||||
|
||||
@@ -56,9 +56,8 @@ extension Decimal: StatementColumnConvertible {
|
||||
case SQLITE_FLOAT:
|
||||
self.init(sqlite3_column_double(sqliteStatement, index))
|
||||
case SQLITE_TEXT:
|
||||
self.init(
|
||||
string: String(cString: sqlite3_column_text(sqliteStatement, index)!),
|
||||
locale: _posixLocale)
|
||||
let string = String(sqliteStatement: sqliteStatement, index: index)
|
||||
self.init(string: string, locale: _posixLocale)
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ extension UUID: StatementColumnConvertible {
|
||||
public init?(sqliteStatement: SQLiteStatement, index: CInt) {
|
||||
switch sqlite3_column_type(sqliteStatement, index) {
|
||||
case SQLITE_TEXT:
|
||||
let string = String(cString: sqlite3_column_text(sqliteStatement, index)!)
|
||||
let string = String(sqliteStatement: sqliteStatement, index: index)
|
||||
guard let uuid = UUID(uuidString: string) else {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -592,7 +592,9 @@ extension String: DatabaseValueConvertible, StatementColumnConvertible {
|
||||
/// - sqliteStatement: A pointer to an SQLite statement.
|
||||
/// - index: The column index.
|
||||
public init(sqliteStatement: SQLiteStatement, index: CInt) {
|
||||
self = String(cString: sqlite3_column_text(sqliteStatement, index)!)
|
||||
let text = sqlite3_column_text(sqliteStatement, index)
|
||||
let byteCount = Int(sqlite3_column_bytes(sqliteStatement, index))
|
||||
self = String(decoding: UnsafeBufferPointer(start: text, count: byteCount), as: UTF8.self)
|
||||
}
|
||||
|
||||
/// Returns a TEXT database value.
|
||||
|
||||
Reference in new issue
Block a user