Skip to content

Commit d6676eb

Browse files
committed
Fully clear up NIO and get the tests passing
1 parent 6944355 commit d6676eb

3 files changed

Lines changed: 0 additions & 36 deletions

File tree

Package.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ let package = Package(
1616
dependencies: [
1717
.package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0"),
1818
.package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
19-
.package(url: "https://github.com/apple/swift-nio.git", from: "2.84.0"),
2019
],
2120
targets: [
2221
.target(
@@ -37,8 +36,6 @@ let package = Package(
3736
.testTarget(
3837
name: "SQLKitTests",
3938
dependencies: [
40-
.product(name: "NIOCore", package: "swift-nio"),
41-
.product(name: "NIOEmbedded", package: "swift-nio"),
4239
.target(name: "SQLKit"),
4340
.target(name: "SQLKitBenchmark"),
4441
],

Tests/SQLKitTests/BaseTests.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
@testable import SQLKit
22
import struct Logging.Logger
3-
import protocol NIOCore.EventLoop
4-
import class NIOCore.EventLoopFuture
53
import SQLKitBenchmark
64
import Testing
75

@@ -171,11 +169,6 @@ struct BaseTests {
171169
#expect(db.queryLogLevel == db.queryLogLevel)
172170
await #expect(throws: Never.self) { try await db.execute(sql: SQLRaw("TEST"), { _ in }) }
173171
}
174-
175-
@Test("database default async impl")
176-
func databaseDefaultAsyncImpl() async throws {
177-
await #expect(throws: Never.self) { try await TestNoAsyncDatabase().execute(sql: SQLRaw("TEST"), { _ in }) }
178-
}
179172

180173
@Test("database version")
181174
func databaseVersion() {

Tests/SQLKitTests/TestMocks.swift

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
import OrderedCollections
22
public import SQLKit
3-
import protocol NIOCore.EventLoop
4-
import class NIOCore.EventLoopFuture
5-
import class NIOEmbedded.NIOAsyncTestingEventLoop
63
import Logging
7-
#if canImport(Dispatch)
8-
import class Dispatch.DispatchQueue
9-
#endif
104

115
extension SQLQueryBuilder {
126
/// Serialize this builder's query and return the textual SQL, discarding any bindings.
@@ -28,23 +22,11 @@ extension SQLQueryBuilder {
2822
/// its internal arrays of accumulated "results". Most things about its dialect are mutable.
2923
final class TestDatabase: SQLDatabase, @unchecked Sendable {
3024
let logger: Logger = { var l = Logger(label: "codes.vapor.sql.test"); l.logLevel = .debug; return l }()
31-
let eventLoop: any EventLoop = NIOAsyncTestingEventLoop()
3225
var results: [String] = []
3326
var bindResults: [[any Encodable & Sendable]] = []
3427
var outputs: [any SQLRow] = []
3528
var dialect: any SQLDialect { self._dialect }
3629
var _dialect: GenericDialect = .init()
37-
38-
func execute(sql query: any SQLExpression, _ onRow: @escaping (any SQLRow) -> ()) -> EventLoopFuture<Void> {
39-
let (sql, binds) = self.serialize(query)
40-
41-
self.results.append(sql)
42-
self.bindResults.append(binds)
43-
while let row = self.outputs.popLast() {
44-
onRow(row)
45-
}
46-
return self.eventLoop.makeSucceededFuture(())
47-
}
4830

4931
func execute(sql query: any SQLExpression, _ onRow: @escaping (any SQLRow) -> ()) async throws {
5032
let (sql, binds) = self.serialize(query)
@@ -145,11 +127,3 @@ extension SQLKit.SQLDataType: Swift.Equatable {
145127
}
146128
}
147129
}
148-
149-
/// Used when testing defaulted async implementations
150-
struct TestNoAsyncDatabase: SQLDatabase {
151-
func execute(sql query: any SQLExpression, _ onRow: @escaping @Sendable (any SQLRow) -> ()) -> EventLoopFuture<Void> { self.eventLoop.makeSucceededVoidFuture() }
152-
var logger: Logger { .init(label: "l") }
153-
var eventLoop: any EventLoop { NIOAsyncTestingEventLoop() }
154-
var dialect: any SQLDialect { GenericDialect() }
155-
}

0 commit comments

Comments
 (0)