Swift4

.travis.yml

@@ -3,20 +3,24 @@ os:
   - osx
 language: generic
 sudo: required
-dist: trusty
-osx_image: xcode9
+dist: xenial
+osx_image: xcode9.4
+services:
+  - mysql
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh Scripts/install-mysql-5.7.sh; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install mysql; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mysql.server start; fi
-  - mysql -uroot -e 'CREATE DATABASE swift_knex_test;'
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install [email protected]; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew services start [email protected]; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link [email protected] --force; fi
+  - mysql -uroot -e 'CREATE DATABASE IF NOT EXISTS swift_knex_test;'
 
 install:
   - source Scripts/install-swift.sh
 
 script:
+  - mysql --version
+  - swift --version
   - swift build
   - swift build -c release
   - swift test

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -10,7 +10,7 @@ let package = Package(
         .executable(name: "SwiftKnexMigration", targets: ["SwiftKnexMigration"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/noppoMan/Prorsum.git", from: "0.3.0")
+        .package(url: "https://github.com/tuken/Prorsum.git", from: "0.5.0"),
     ],
     targets: [
         .target(name: "Mysql", dependencies: ["Prorsum"]),

Package@swift-4.0.swift

@@ -0,0 +1,21 @@
+// swift-tools-version:4.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "SwiftKnex",
+    products: [
+        .library(name: "SwiftKnex", targets: ["SwiftKnex"]),
+        .executable(name: "SwiftKnexMigration", targets: ["SwiftKnexMigration"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/noppoMan/Prorsum.git", from: "0.3.0"),
+    ],
+    targets: [
+        .target(name: "Mysql", dependencies: ["Prorsum"]),
+        .target(name: "SwiftKnex", dependencies: ["Mysql"]),
+        .target(name: "SwiftKnexMigration", dependencies: ["SwiftKnex", "Mysql"]),
+        .testTarget(name: "SwiftKnexTests", dependencies: ["SwiftKnex", "Mysql"]),
+    ]
+)

Scripts/install-mysql-5.7.sh

@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 
-sudo service mysql stop || echo "mysql not stopped"
-sudo stop mysql-5.6 || echo "mysql-5.6 not stopped"
+wget http://dev.mysql.com/get/mysql-apt-config_0.8.11-1_all.deb
 echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
-wget http://dev.mysql.com/get/mysql-apt-config_0.8.9-1_all.deb
-sudo dpkg --install mysql-apt-config_0.8.9-1_all.deb
+sudo dpkg -i mysql-apt-config_0.8.11-1_all.deb
 sudo apt-get update -q
 sudo apt-get install -q -y -o Dpkg::Options::=--force-confnew mysql-server
 sudo mysql_upgrade

Scripts/install-swift.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="4.0.3"
+VERSION="4.1.3"
 
 # Determine OS
 UNAME=`uname`;

Sources/Mysql/Connection.swift

@@ -9,15 +9,21 @@
 import Foundation
 
 public enum ConnectionError: Error {
+
     case failedToParseHandshakeOf(String)
+
     case wrongHandshake
 }
 
 // syncronous connection
 public final class Connection: ConnectionType {
+
     public let url: URL
+
     public let user: String
+
     public let password: String?
+
     public let database: String?
 
     private var _isClosed = true
@@ -50,11 +56,7 @@ public final class Connection: ConnectionType {
         let (handshakeBytes, packnr) = try self.stream.readPacket()
         let hp = try HandshakePacket(bytes: handshakeBytes)
 
-        let authPacket = hp.buildAuthPacket(
-            user: user,
-            password: password,
-            database: database
-        )
+        let authPacket = hp.buildAuthPacket(user: user, password: password, database: database)
 
         try stream.writePacket(authPacket, packnr: packnr)
         let (bytes, _) = try stream.readPacket()
@@ -65,6 +67,13 @@ public final class Connection: ConnectionType {
 
         _isClosed = false
     }
+
+    func reopen() throws {
+        stream.close()
+        isUsed = false
+        _isClosed = true
+        try self.open()
+    }
 
     func write(_ cmd: Commands, query: String) throws {
         try stream.writePacket([cmd.rawValue] + query.utf8, packnr: -1)
@@ -74,13 +83,13 @@ public final class Connection: ConnectionType {
         try stream.writePacket([cmd.rawValue], packnr: -1)
     }
 
-    func reserve(){
+    func reserve() {
         cond.mutex.lock()
         isUsed = true
         cond.mutex.unlock()
     }
 
-    func release(){
+    func release() {
         cond.mutex.lock()
         isUsed = false
         cond.mutex.unlock()
@@ -90,11 +99,13 @@ public final class Connection: ConnectionType {
         let (bytes, _) = try stream.readPacket()
         if let okPacket = try OKPacket(bytes: bytes) {
             return (0, okPacket)
-        } else {
+        }
+        else {
             let (_num, n) = lenEncInt(bytes)
             if let num = _num, (n - bytes.count) == 0 {
                 return (Int(num), nil)
-            } else {
+            }
+            else {
                 return (0, nil)
             }
         }
@@ -112,6 +123,7 @@ public final class Connection: ConnectionType {
     public func close() throws {
         try write(.quit)
         stream.close()
+        isUsed = false
         _isClosed = true
     }
 }

Sources/Mysql/ConnectionPool.swift

@@ -57,11 +57,55 @@ public final class ConnectionPool: ConnectionType {
         self.connections = try (0..<maxPoolSize).map { _ in
             return try Connection(url: url, user: user, password: password, database: database)
         }
+
+        #if os(Linux)
+        let _ = Timer.scheduledTimer(withTimeInterval: TimeInterval(3600), repeats: true) { _ in
+            print("timer! \"SELECT 1\"")
+            do {
+                for con in self.connections {
+                    if con.isUsed {
+                        continue
+                    }
+
+                    con.reserve()
+                    let _ = try con.query("SELECT 1")
+                    con.release()
+                }
+            }
+            catch {
+                print("failed to \"SELECT 1\"")
+            }
+        }
+        #endif
     }
 
     public func query(_ sql: String, bindParams params: [Any]) throws -> QueryResult {
         let con = try getConnection()
-        let result = try con.query(sql, bindParams: params)
+        var result: QueryResult
+        do {
+            result = try con.query(sql, bindParams: params)
+        }
+        catch {
+            if let e = error as? SocketError {
+                switch e {
+                case .alreadyClosed:
+                    try con.reopen()
+                    result = try con.query(sql, bindParams: params)
+                default: throw error
+                }
+            }
+            else if let e = error as? StreamError {
+                switch e {
+                case .alreadyClosed:
+                    try con.reopen()
+                    result = try con.query(sql, bindParams: params)
+                default: throw error
+                }
+            }
+            else {
+                throw error
+            }
+        }
 
         if !con.isTransacting {
             con.release()
@@ -72,7 +116,31 @@ public final class ConnectionPool: ConnectionType {
 
     public func query(_ sql: String) throws -> QueryResult {
         let con = try getConnection()
-        let result = try con.query(sql)
+        var result: QueryResult
+        do {
+            result = try con.query(sql)
+        }
+        catch {
+            if let e = error as? SocketError {
+                switch e {
+                case .alreadyClosed:
+                    try con.reopen()
+                    result = try con.query(sql)
+                default: throw error
+                }
+            }
+            else if let e = error as? StreamError {
+                switch e {
+                case .alreadyClosed:
+                    try con.reopen()
+                    result = try con.query(sql)
+                default: throw error
+                }
+            }
+            else {
+                throw error
+            }
+        }
 
         if !con.isTransacting {
             con.release()
@@ -83,10 +151,12 @@ public final class ConnectionPool: ConnectionType {
 
     func getConnection(_ retryCount: Int = 0) throws -> Connection {
         // TODO should implement timeout
-        if Double(retryCount) > (0.1*10)*5 {
+        if Double(retryCount) > (0.1 * 10) * 5 {
             throw ConnectionPoolError.failedToGetConnectionFromPool
         }
 
+        cond.mutex.lock()
+        defer { cond.mutex.unlock() }
         for con in connections {
             if con.isUsed {
                 continue
@@ -96,11 +166,9 @@ public final class ConnectionPool: ConnectionType {
             return con
         }
 
-        cond.mutex.lock()
         _ = cond.wait(timeout: 0.1)
-        cond.mutex.unlock()
 
-        return try getConnection(retryCount+1)
+        return try getConnection(retryCount + 1)
     }
 
     public func close () throws {

Sources/Mysql/Extensions/Bytes.swift

@@ -52,8 +52,8 @@ func arrayOfBytes<T: BinaryInteger>(_ value: T, length totalBytes: Int = MemoryL
         bytes[totalBytes - 1 - j] = (bytesPointer + j).pointee
     }
 
-    valuePointer.deinitialize()
-    valuePointer.deallocate(capacity: 1)
+    valuePointer.deinitialize(count: 1)
+    valuePointer.deallocate()
 
     return bytes
 }