Add SQLiteAPI and retroactive implementations in SQLiteInterfaceSupport

GRDB/Core/DatabaseFunction.swift

@@ -278,7 +278,7 @@ public final class DatabaseFunction: Identifiable, Sendable {
 
     /// A function kind: an "SQL function" or an "aggregate".
     /// See <http://sqlite.org/capi3ref.html#sqlite3_create_function>
-    private enum Kind: Sendable {
+    /* SQLInterface FIXME: should be private*/ enum Kind: Sendable {
         /// A regular function: SELECT f(1)
         case function(@Sendable (CInt, UnsafeMutablePointer<OpaquePointer?>?) throws -> (any DatabaseValueConvertible)?)
 

GRDB/Core/DatabaseValue.swift

@@ -136,18 +136,18 @@ public struct DatabaseValue: Hashable {
 
     // SQLite function argument
     init(sqliteValue: SQLiteValue) {
-        switch sqlite3_value_type(sqliteValue) {
+        switch SQLite3.sqlite3_value_type(sqliteValue) {
         case SQLITE_NULL:
             storage = .null
         case SQLITE_INTEGER:
-            storage = .int64(sqlite3_value_int64(sqliteValue))
+            storage = .int64(SQLite3.sqlite3_value_int64(sqliteValue))
         case SQLITE_FLOAT:
-            storage = .double(sqlite3_value_double(sqliteValue))
+            storage = .double(SQLite3.sqlite3_value_double(sqliteValue))
         case SQLITE_TEXT:
-            storage = .string(String(cString: sqlite3_value_text(sqliteValue)!))
+            storage = .string(String(cString: SQLite3.sqlite3_value_text(sqliteValue)!))
         case SQLITE_BLOB:
-            if let bytes = sqlite3_value_blob(sqliteValue) {
-                let count = Int(sqlite3_value_bytes(sqliteValue))
+            if let bytes = SQLite3.sqlite3_value_blob(sqliteValue) {
+                let count = Int(SQLite3.sqlite3_value_bytes(sqliteValue))
                 storage = .blob(Data(bytes: bytes, count: count)) // copy bytes
             } else {
                 storage = .blob(Data())
@@ -160,18 +160,18 @@ public struct DatabaseValue: Hashable {
 
     /// Creates a `DatabaseValue` initialized from a raw SQLite statement pointer.
     public init(sqliteStatement: SQLiteStatement, index: CInt) {
-        switch sqlite3_column_type(sqliteStatement, index) {
+        switch SQLite3.sqlite3_column_type(sqliteStatement, index) {
         case SQLITE_NULL:
             storage = .null
         case SQLITE_INTEGER:
-            storage = .int64(sqlite3_column_int64(sqliteStatement, index))
+            storage = .int64(SQLite3.sqlite3_column_int64(sqliteStatement, index))
         case SQLITE_FLOAT:
-            storage = .double(sqlite3_column_double(sqliteStatement, index))
+            storage = .double(SQLite3.sqlite3_column_double(sqliteStatement, index))
         case SQLITE_TEXT:
-            storage = .string(String(cString: sqlite3_column_text(sqliteStatement, index)))
+            storage = .string(String(cString: SQLite3.sqlite3_column_text(sqliteStatement, index)))
         case SQLITE_BLOB:
-            if let bytes = sqlite3_column_blob(sqliteStatement, index) {
-                let count = Int(sqlite3_column_bytes(sqliteStatement, index))
+            if let bytes = SQLite3.sqlite3_column_blob(sqliteStatement, index) {
+                let count = Int(SQLite3.sqlite3_column_bytes(sqliteStatement, index))
                 storage = .blob(Data(bytes: bytes, count: count)) // copy bytes
             } else {
                 storage = .blob(Data())

GRDB/Core/Row.swift

@@ -221,7 +221,7 @@ public final class Row {
         self.statement = statement
         self.sqliteStatement = statement.sqliteStatement
         self.impl = StatementRowImpl(sqliteStatement: statement.sqliteStatement, statement: statement)
-        self.count = Int(sqlite3_column_count(sqliteStatement))
+        self.count = Int(SQLite3.sqlite3_column_count(sqliteStatement))
     }
 
     /// Creates a row that maps an SQLite statement. Further calls to
@@ -230,7 +230,7 @@ public final class Row {
         self.statement = nil
         self.sqliteStatement = sqliteStatement
         self.impl = SQLiteStatementRowImpl(sqliteStatement: sqliteStatement)
-        self.count = Int(sqlite3_column_count(sqliteStatement))
+        self.count = Int(SQLite3.sqlite3_column_count(sqliteStatement))
     }
 
     /// Creates a row that contain a copy of the current state of the
@@ -2474,14 +2474,14 @@ extension ArrayRowImpl: Sendable { }
 
 // TODO: merge with ArrayRowImpl eventually?
 /// See Row.init(copiedFromStatementRef:sqliteStatement:)
-private struct StatementCopyRowImpl: RowImpl {
+/* SQLInterface FIXME: should be private*/ struct StatementCopyRowImpl: RowImpl {
     let dbValues: ContiguousArray<DatabaseValue>
     let columnNames: [String]
 
     init(sqliteStatement: SQLiteStatement, columnNames: [String]) {
         let sqliteStatement = sqliteStatement
         self.dbValues = ContiguousArray(
-            (0..<sqlite3_column_count(sqliteStatement))
+            (0..<SQLite3.sqlite3_column_count(sqliteStatement))
                 .map { DatabaseValue(sqliteStatement: sqliteStatement, index: $0) }
                 as [DatabaseValue])
         self.columnNames = columnNames
@@ -2510,7 +2510,7 @@ private struct StatementCopyRowImpl: RowImpl {
 }
 
 /// See Row.init(statement:)
-private struct StatementRowImpl: RowImpl {
+/* SQLInterface FIXME: should be private*/ struct StatementRowImpl: RowImpl {
     let statement: Statement
     let sqliteStatement: SQLiteStatement
     let lowercaseColumnIndexes: [String: Int]
@@ -2519,8 +2519,8 @@ private struct StatementRowImpl: RowImpl {
         self.statement = statement
         self.sqliteStatement = sqliteStatement
         // Optimize row[columnName]
-        let lowercaseColumnNames = (0..<sqlite3_column_count(sqliteStatement))
-            .map { String(cString: sqlite3_column_name(sqliteStatement, CInt($0))).lowercased() }
+        let lowercaseColumnNames = (0..<SQLite3.sqlite3_column_count(sqliteStatement))
+            .map { String(cString: SQLite3.sqlite3_column_name(sqliteStatement, CInt($0))).lowercased() }
         self.lowercaseColumnIndexes = Dictionary(
             lowercaseColumnNames
                 .enumerated()
@@ -2584,7 +2584,7 @@ private struct StatementRowImpl: RowImpl {
 }
 
 // This one is not optimized at all, since it is only used in fatal conversion errors, so far
-private struct SQLiteStatementRowImpl: RowImpl {
+/* SQLInterface FIXME: should be private*/ struct SQLiteStatementRowImpl: RowImpl {
     let sqliteStatement: SQLiteStatement
     var count: Int { Int(sqlite3_column_count(sqliteStatement)) }
     var isFetched: Bool { true }

GRDB/Core/RowDecodingError.swift

@@ -146,7 +146,7 @@ struct RowDecodingContext {
         } else if let sqliteStatement = row.sqliteStatement {
             self.key = key
             self.row = row.copy()
-            self.sql = String(cString: sqlite3_sql(sqliteStatement)).trimmedSQLStatement
+            self.sql = String(cString: SQLite3.sqlite3_sql(sqliteStatement)).trimmedSQLStatement
             self.statementArguments = nil // Can't rebuild them
         } else {
             self.key = key

GRDB/Core/Statement.swift

@@ -139,7 +139,7 @@ public final class Statement {
         authorizer.reset()
 
         var sqliteStatement: SQLiteStatement? = nil
-        let code = sqlite3_prepare_v3(
+        let code = SQLite3.sqlite3_prepare_v3(
             database.sqliteConnection, statementStart, -1, prepFlags,
             &sqliteStatement, statementEnd)
 

GRDB/Core/Support/Foundation/Data.swift

@@ -12,8 +12,8 @@ import Foundation
 /// Data is convertible to and from DatabaseValue.
 extension Data: DatabaseValueConvertible, StatementColumnConvertible {
     public init(sqliteStatement: SQLiteStatement, index: CInt) {
-        if let bytes = sqlite3_column_blob(sqliteStatement, index) {
-            let count = Int(sqlite3_column_bytes(sqliteStatement, index))
+        if let bytes = SQLite3.sqlite3_column_blob(sqliteStatement, index) {
+            let count = Int(SQLite3.sqlite3_column_bytes(sqliteStatement, index))
             self.init(bytes: bytes, count: count) // copy bytes
         } else {
             self.init()

GRDB/Core/Support/Foundation/DatabaseDateComponents.swift

@@ -79,10 +79,10 @@ extension DatabaseDateComponents: StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        guard let cString = sqlite3_column_text(sqliteStatement, index) else {
+        guard let cString = SQLite3.sqlite3_column_text(sqliteStatement, index) else {
             return nil
         }
-        let length = Int(sqlite3_column_bytes(sqliteStatement, index)) // avoid an strlen
+        let length = Int(SQLite3.sqlite3_column_bytes(sqliteStatement, index)) // avoid an strlen
         let components = cString.withMemoryRebound(
             to: CChar.self,
             capacity: length + 1 /* trailing \0 */) { cString in

GRDB/Core/Support/Foundation/Date.swift

@@ -134,9 +134,9 @@ extension Date: StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        switch sqlite3_column_type(sqliteStatement, index) {
+        switch SQLite3.sqlite3_column_type(sqliteStatement, index) {
         case SQLITE_INTEGER, SQLITE_FLOAT:
-            self.init(timeIntervalSince1970: sqlite3_column_double(sqliteStatement, index))
+            self.init(timeIntervalSince1970: SQLite3.sqlite3_column_double(sqliteStatement, index))
         case SQLITE_TEXT:
             guard let components = DatabaseDateComponents(sqliteStatement: sqliteStatement, index: index),
                   let date = Date(databaseDateComponents: components)

GRDB/Core/Support/Foundation/Decimal.swift

@@ -48,14 +48,14 @@ extension Decimal: StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        switch sqlite3_column_type(sqliteStatement, index) {
+        switch SQLite3.sqlite3_column_type(sqliteStatement, index) {
         case SQLITE_INTEGER:
-            self.init(sqlite3_column_int64(sqliteStatement, index))
+            self.init(SQLite3.sqlite3_column_int64(sqliteStatement, index))
         case SQLITE_FLOAT:
-            self.init(sqlite3_column_double(sqliteStatement, index))
+            self.init(SQLite3.sqlite3_column_double(sqliteStatement, index))
         case SQLITE_TEXT:
             self.init(
-                string: String(cString: sqlite3_column_text(sqliteStatement, index)!),
+                string: String(cString: SQLite3.sqlite3_column_text(sqliteStatement, index)!),
                 locale: _posixLocale)
         default:
             return nil

GRDB/Core/Support/Foundation/UUID.swift

@@ -79,16 +79,16 @@ extension UUID: StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        switch sqlite3_column_type(sqliteStatement, index) {
+        switch SQLite3.sqlite3_column_type(sqliteStatement, index) {
         case SQLITE_TEXT:
-            let string = String(cString: sqlite3_column_text(sqliteStatement, index)!)
+            let string = String(cString: SQLite3.sqlite3_column_text(sqliteStatement, index)!)
             guard let uuid = UUID(uuidString: string) else {
                 return nil
             }
             self.init(uuid: uuid.uuid)
         case SQLITE_BLOB:
-            guard sqlite3_column_bytes(sqliteStatement, index) == 16,
-                  let blob = sqlite3_column_blob(sqliteStatement, index) else
+            guard SQLite3.sqlite3_column_bytes(sqliteStatement, index) == 16,
+                  let blob = SQLite3.sqlite3_column_blob(sqliteStatement, index) else
             {
                 return nil
             }

GRDB/Core/Support/StandardLibrary/StandardLibrary.swift

@@ -18,7 +18,7 @@ extension Bool: DatabaseValueConvertible, StatementColumnConvertible {
     ///     - sqliteStatement: A pointer to an SQLite statement.
     ///     - index: The column index.
     public init(sqliteStatement: SQLiteStatement, index: CInt) {
-        self = sqlite3_column_int64(sqliteStatement, index) != 0
+        self = SQLite3.sqlite3_column_int64(sqliteStatement, index) != 0
     }
 
     /// Returns an INTEGER database value.
@@ -115,7 +115,7 @@ extension Int: DatabaseValueConvertible, StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        let int64 = sqlite3_column_int64(sqliteStatement, index)
+        let int64 = SQLite3.sqlite3_column_int64(sqliteStatement, index)
         guard let v = Int(exactly: int64) else { return nil }
         self = v
     }
@@ -154,7 +154,7 @@ extension Int8: DatabaseValueConvertible, StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        let int64 = sqlite3_column_int64(sqliteStatement, index)
+        let int64 = SQLite3.sqlite3_column_int64(sqliteStatement, index)
         guard let v = Int8(exactly: int64) else { return nil }
         self = v
     }
@@ -193,7 +193,7 @@ extension Int16: DatabaseValueConvertible, StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        let int64 = sqlite3_column_int64(sqliteStatement, index)
+        let int64 = SQLite3.sqlite3_column_int64(sqliteStatement, index)
         guard let v = Int16(exactly: int64) else { return nil }
         self = v
     }
@@ -232,7 +232,7 @@ extension Int32: DatabaseValueConvertible, StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        let int64 = sqlite3_column_int64(sqliteStatement, index)
+        let int64 = SQLite3.sqlite3_column_int64(sqliteStatement, index)
         guard let v = Int32(exactly: int64) else { return nil }
         self = v
     }
@@ -269,7 +269,7 @@ extension Int64: DatabaseValueConvertible, StatementColumnConvertible {
     ///     - sqliteStatement: A pointer to an SQLite statement.
     ///     - index: The column index.
     public init(sqliteStatement: SQLiteStatement, index: CInt) {
-        self = sqlite3_column_int64(sqliteStatement, index)
+        self = SQLite3.sqlite3_column_int64(sqliteStatement, index)
     }
 
     /// Returns an INTEGER database value.
@@ -314,7 +314,7 @@ extension UInt: DatabaseValueConvertible, StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        let int64 = sqlite3_column_int64(sqliteStatement, index)
+        let int64 = SQLite3.sqlite3_column_int64(sqliteStatement, index)
         guard let v = UInt(exactly: int64) else { return nil }
         self = v
     }
@@ -353,7 +353,7 @@ extension UInt8: DatabaseValueConvertible, StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        let int64 = sqlite3_column_int64(sqliteStatement, index)
+        let int64 = SQLite3.sqlite3_column_int64(sqliteStatement, index)
         guard let v = UInt8(exactly: int64) else { return nil }
         self = v
     }
@@ -392,7 +392,7 @@ extension UInt16: DatabaseValueConvertible, StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        let int64 = sqlite3_column_int64(sqliteStatement, index)
+        let int64 = SQLite3.sqlite3_column_int64(sqliteStatement, index)
         guard let v = UInt16(exactly: int64) else { return nil }
         self = v
     }
@@ -431,7 +431,7 @@ extension UInt32: DatabaseValueConvertible, StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        let int64 = sqlite3_column_int64(sqliteStatement, index)
+        let int64 = SQLite3.sqlite3_column_int64(sqliteStatement, index)
         guard let v = UInt32(exactly: int64) else { return nil }
         self = v
     }
@@ -470,7 +470,7 @@ extension UInt64: DatabaseValueConvertible, StatementColumnConvertible {
     @inline(__always)
     @inlinable
     public init?(sqliteStatement: SQLiteStatement, index: CInt) {
-        let int64 = sqlite3_column_int64(sqliteStatement, index)
+        let int64 = SQLite3.sqlite3_column_int64(sqliteStatement, index)
         guard let v = UInt64(exactly: int64) else { return nil }
         self = v
     }
@@ -507,7 +507,7 @@ extension Double: DatabaseValueConvertible, StatementColumnConvertible {
     ///     - sqliteStatement: A pointer to an SQLite statement.
     ///     - index: The column index.
     public init(sqliteStatement: SQLiteStatement, index: CInt) {
-        self = sqlite3_column_double(sqliteStatement, index)
+        self = SQLite3.sqlite3_column_double(sqliteStatement, index)
     }
 
     /// Returns a REAL database value.
@@ -547,7 +547,7 @@ extension Float: DatabaseValueConvertible, StatementColumnConvertible {
     ///     - sqliteStatement: A pointer to an SQLite statement.
     ///     - index: The column index.
     public init(sqliteStatement: SQLiteStatement, index: CInt) {
-        self = Float(sqlite3_column_double(sqliteStatement, index))
+        self = Float(SQLite3.sqlite3_column_double(sqliteStatement, index))
     }
 
     /// Returns a REAL database value.
@@ -587,7 +587,7 @@ 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)!)
+        self = String(cString: SQLite3.sqlite3_column_text(sqliteStatement, index)!)
     }
 
     /// Returns a TEXT database value.

GRDB/FTS/FTS5Tokenizer.swift

@@ -33,7 +33,7 @@ public struct FTS5Tokenization: OptionSet, Sendable {
     }
 
     /// `FTS5_TOKENIZE_QUERY`
-    public static let query = FTS5Tokenization(rawValue: FTS5_TOKENIZE_QUERY)
+    public static lazy var query = FTS5Tokenization(rawValue: FTS5_TOKENIZE_QUERY)
 
     /// `FTS5_TOKENIZE_PREFIX`
     public static let prefix = FTS5Tokenization(rawValue: FTS5_TOKENIZE_PREFIX)