Streamline imports

jberkel · jberkel · commit 102f3e5a00b8 · 2026-01-11T20:20:12.000+01:00
diff --git a/Sources/SQLite/Core/Backup.swift b/Sources/SQLite/Core/Backup.swift
@@ -24,9 +24,9 @@
 
 import Foundation
 import Dispatch
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Sources/SQLite/Core/Connection+Aggregation.swift b/Sources/SQLite/Core/Connection+Aggregation.swift
@@ -1,7 +1,7 @@
 import Foundation
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Sources/SQLite/Core/Connection+Attach.swift b/Sources/SQLite/Core/Connection+Attach.swift
@@ -1,13 +1,4 @@
 import Foundation
-#if SQLITE_SWIFT_STANDALONE
-import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
-import SQLCipher
-#elseif canImport(SwiftToolchainCSQLite)
-import SwiftToolchainCSQLite
-#else
-import SQLite3
-#endif
 
 extension Connection {
     #if SQLITE_SWIFT_SQLCIPHER
diff --git a/Sources/SQLite/Core/Connection.swift b/Sources/SQLite/Core/Connection.swift
@@ -24,9 +24,9 @@
 
 import Foundation
 import Dispatch
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Sources/SQLite/Core/Result.swift b/Sources/SQLite/Core/Result.swift
@@ -1,6 +1,6 @@
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Sources/SQLite/Core/Statement.swift b/Sources/SQLite/Core/Statement.swift
@@ -22,9 +22,9 @@
 // THE SOFTWARE.
 //
 
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Sources/SQLite/Helpers.swift b/Sources/SQLite/Helpers.swift
@@ -22,9 +22,9 @@
 // THE SOFTWARE.
 //
 
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Tests/SQLiteTests/Core/Connection+AttachTests.swift b/Tests/SQLiteTests/Core/Connection+AttachTests.swift
@@ -2,9 +2,9 @@ import XCTest
 import Foundation
 @testable import SQLite
 
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Tests/SQLiteTests/Core/Connection+PragmaTests.swift b/Tests/SQLiteTests/Core/Connection+PragmaTests.swift
@@ -2,16 +2,6 @@ import XCTest
 import Foundation
 @testable import SQLite
 
-#if SQLITE_SWIFT_STANDALONE
-import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
-import SQLCipher
-#elseif canImport(SwiftToolchainCSQLite)
-import SwiftToolchainCSQLite
-#else
-import SQLite3
-#endif
-
 class ConnectionPragmaTests: SQLiteTestCase {
     func test_userVersion() {
         db.userVersion = 2
diff --git a/Tests/SQLiteTests/Core/ConnectionTests.swift b/Tests/SQLiteTests/Core/ConnectionTests.swift
@@ -3,9 +3,9 @@ import Foundation
 import Dispatch
 @testable import SQLite
 
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Tests/SQLiteTests/Core/ResultTests.swift b/Tests/SQLiteTests/Core/ResultTests.swift
@@ -2,9 +2,9 @@ import XCTest
 import Foundation
 @testable import SQLite
 
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Tests/SQLiteTests/Core/StatementTests.swift b/Tests/SQLiteTests/Core/StatementTests.swift
@@ -1,9 +1,9 @@
 import XCTest
 @testable import SQLite
 
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Tests/SQLiteTests/Extensions/FTSIntegrationTests.swift b/Tests/SQLiteTests/Extensions/FTSIntegrationTests.swift
@@ -1,13 +1,4 @@
 import XCTest
-#if SQLITE_SWIFT_STANDALONE
-import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
-import SQLCipher
-#elseif canImport(SwiftToolchainCSQLite)
-import SwiftToolchainCSQLite
-#else
-import SQLite3
-#endif
 @testable import SQLite
 
 class FTSIntegrationTests: SQLiteTestCase {
diff --git a/Tests/SQLiteTests/Typed/CustomAggregationTests.swift b/Tests/SQLiteTests/Typed/CustomAggregationTests.swift
@@ -3,16 +3,6 @@ import Foundation
 import Dispatch
 @testable import SQLite
 
-#if SQLITE_SWIFT_STANDALONE
-import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
-import SQLCipher
-#elseif canImport(SwiftToolchainCSQLite)
-import SwiftToolchainCSQLite
-#else
-import SQLite3
-#endif
-
 // https://github.com/stephencelis/SQLite.swift/issues/1071
 #if !(os(Linux) || os(Android))
 
diff --git a/Tests/SQLiteTests/Typed/QueryIntegrationTests.swift b/Tests/SQLiteTests/Typed/QueryIntegrationTests.swift
@@ -1,7 +1,7 @@
 import XCTest
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Tests/SQLiteTests/Typed/QueryTests.swift b/Tests/SQLiteTests/Typed/QueryTests.swift
@@ -1,13 +1,4 @@
 import XCTest
-#if SQLITE_SWIFT_STANDALONE
-import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
-import SQLCipher
-#elseif canImport(SwiftToolchainCSQLite)
-import SwiftToolchainCSQLite
-#else
-import SQLite3
-#endif
 @testable import SQLite
 
 class QueryTests: XCTestCase {
