Skip to content

Commit

Permalink
rename to mysql-nio (#6)
Browse files Browse the repository at this point in the history
* rename to mysql-nio

* install openssl

* regen linuxmain
  • Loading branch information
tanner0101 committed Aug 1, 2019
1 parent 5f4bbe9 commit 7475715
Show file tree
Hide file tree
Showing 50 changed files with 96 additions and 36 deletions.
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Binary file not shown.
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>mysql-nio.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>CMySQLOpenSSL</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>MySQLNIO</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>MySQLNIOTests</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
12 changes: 6 additions & 6 deletions Package.swift
Expand Up @@ -2,13 +2,13 @@
import PackageDescription

let package = Package(
name: "nio-mysql",
name: "mysql-nio",
products: [
.library(name: "NIOMySQL", targets: ["NIOMySQL"]),
.library(name: "MySQLNIO", targets: ["MySQLNIO"]),
],
dependencies: [
.package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0-convergence"),
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.0.0-convergence"),
.package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0"),
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.0.0"),
],
targets: [
.systemLibrary(
Expand All @@ -19,7 +19,7 @@ let package = Package(
.brew(["openssl"])
]
),
.target(name: "NIOMySQL", dependencies: ["CMySQLOpenSSL", "NIO", "NIOSSL"]),
.testTarget(name: "NIOMySQLTests", dependencies: ["NIOMySQL"]),
.target(name: "MySQLNIO", dependencies: ["CMySQLOpenSSL", "NIO", "NIOSSL"]),
.testTarget(name: "MySQLNIOTests", dependencies: ["MySQLNIO"]),
]
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions Tests/LinuxMain.swift
@@ -1,8 +1,8 @@
import XCTest

import NIOMySQLTests
import MySQLNIOTests

var tests = [XCTestCaseEntry]()
tests += NIOMySQLTests.__allTests()
tests += MySQLNIOTests.__allTests()

XCTMain(tests)
@@ -1,5 +1,5 @@
import XCTest
@testable import NIOMySQL
@testable import MySQLNIO

final class NIOMySQLTests: XCTestCase {
private var group: EventLoopGroup!
Expand Down
@@ -1,16 +1,14 @@
import NIOMySQL
import MySQLNIO
import NIOSSL

extension MySQLConnection {
static func test(on eventLoop: EventLoop) -> EventLoopFuture<MySQLConnection> {
do {
let address: SocketAddress
// socket:
// try .init(unixDomainSocketPath: "/tmp/mysqld.sock")
#if os(Linux)
address = try .makeAddressResolvingHost("mysql", port: 3306)
#else
address = try .init(ipAddress: "127.0.0.1", port: 3306)
address = try .makeAddressResolvingHost("localhost", port: 3306)
#endif
let tlsConfiguration: TLSConfiguration?
#if TEST_TLS
Expand Down
Expand Up @@ -6,6 +6,8 @@ extension NIOMySQLTests {
// `swift test --generate-linuxmain`
// to regenerate.
static let __allTests__NIOMySQLTests = [
("testDate_before1970", testDate_before1970),
("testDate_conversion", testDate_conversion),
("testPerformance_parseDatetime", testPerformance_parseDatetime),
("testPerformance_simpleSelects", testPerformance_simpleSelects),
("testQuery_datetime", testQuery_datetime),
Expand Down
59 changes: 36 additions & 23 deletions circle.yml
@@ -1,15 +1,39 @@
version: 2

jobs:
linux:
8_0-bionic:
docker:
- image: vapor/swift:5.0
- image: swift:5.0-bionic
- image: circleci/mysql:8.0
name: mysql
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
MYSQL_DATABASE: vapor_database
MYSQL_USER: vapor_username
MYSQL_PASSWORD: vapor_password
steps:
- checkout
- run: apt-get -y install openssl libssl-dev
- run: swift build -Xswiftc -DTEST_TLS
- run: swift test -Xswiftc -DTEST_TLS
5_7-bionic:
docker:
- image: swift:5.0-bionic
- image: circleci/mysql:5.7
name: mysql
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
MYSQL_DATABASE: vapor_database
MYSQL_USER: vapor_username
MYSQL_PASSWORD: vapor_password
steps:
- checkout
- run: apt-get -y install openssl libssl-dev
- run: swift build
8_0-linux:
- run: swift test
8_0-xenial:
docker:
- image: vapor/swift:5.0
- image: swift:5.0-xenial
- image: circleci/mysql:8.0
name: mysql
environment:
Expand All @@ -19,11 +43,12 @@ jobs:
MYSQL_PASSWORD: vapor_password
steps:
- checkout
- run: apt-get -y install openssl libssl-dev
- run: swift build -Xswiftc -DTEST_TLS
- run: swift test -Xswiftc -DTEST_TLS
5_7-linux:
5_7-xenial:
docker:
- image: vapor/swift:5.0
- image: swift:5.0-xenial
- image: circleci/mysql:5.7
name: mysql
environment:
Expand All @@ -33,26 +58,14 @@ jobs:
MYSQL_PASSWORD: vapor_password
steps:
- checkout
- run: apt-get -y install openssl libssl-dev
- run: swift build
- run: swift test
linux-release:
docker:
- image: vapor/swift:5.0
steps:
- checkout
- run: swift build -c release
workflows:
version: 2
tests:
jobs:
- linux
- 8_0-linux:
requires:
- linux
- 5_7-linux:
requires:
- linux
- linux-release:
requires:
- 8_0-linux
- 5_7-linux
- 8_0-bionic
- 5_7-bionic
- 8_0-xenial
- 5_7-xenial

0 comments on commit 7475715

Please sign in to comment.