From 104d414e24ef34780e73ccaf59a6b3a740362ec4 Mon Sep 17 00:00:00 2001 From: JeffZhou215 Date: Tue, 17 Oct 2023 00:28:54 -0400 Subject: [PATCH] fixing issue#99, added API and removed EventLoopGroup in README --- Package.swift | 2 +- README.md | 2 -- Tests/MySQLNIOTests/Utilities.swift | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index a18e545..da8175b 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-crypto.git", "1.0.0" ..< "3.0.0"), .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"), - .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0"), + .package(url: "https://github.com/apple/swift-nio.git", from: "2.58.0"), .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.14.0"), ], targets: [ diff --git a/README.md b/README.md index 2400196..55976a0 100644 --- a/README.md +++ b/README.md @@ -90,13 +90,11 @@ The first step to making a query is creating a new `MySQLConnection`. The minimu ```swift import MySQLNIO -let eventLoop: any EventLoop = ... let conn = try await MySQLConnection( to: .makeAddressResolvingHost("my.mysql.server", port: 3306), username: "test_username", database: "test_database", password: "test_password", - on: eventLoop ).get() ``` diff --git a/Tests/MySQLNIOTests/Utilities.swift b/Tests/MySQLNIOTests/Utilities.swift index 7ab8362..d75e3a0 100644 --- a/Tests/MySQLNIOTests/Utilities.swift +++ b/Tests/MySQLNIOTests/Utilities.swift @@ -26,6 +26,26 @@ extension MySQLConnection { on: eventLoop ) } + + static func connect( + to socketAddress: SocketAddress, + username: String, + database: String, + password: String? = nil, + tlsConfiguration: TLSConfiguration? = .makeClientConfiguration(), + serverHostname: String? = nil, + logger: Logger = .init(label: "codes.vapor.mysql") + ) -> EventLoopFuture { + Self.connect( + to: socketAddress, + username: username, + database: database, + password: password, + tlsConfiguration: tlsConfiguration, + serverHostname: serverHostname, + on: MultiThreadedEventLoopGroup.singleton.any() + ) + } } let isLoggingConfigured: Bool = {