Merge pull request #43 from tuken/swift4

Swift4

Author: noppoMan

.gitignore

@@ -2,3 +2,4 @@
 /.build
 /Packages
 /*.xcodeproj
+Package.resolved

.travis.yml

@@ -4,7 +4,7 @@ os:
 language: generic
 sudo: required
 dist: trusty
-osx_image: xcode8
+osx_image: xcode9
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh Scripts/install-mysql-5.7.sh; fi

Package.swift

@@ -1,13 +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",
-    targets: [
-        Target(name: "Mysql"),
-        Target(name: "SwiftKnex", dependencies: ["Mysql"]),
-        Target(name: "SwiftKnexMigration", dependencies: ["SwiftKnex", "Mysql"])
+    products: [
+        .library(name: "SwiftKnex", targets: ["SwiftKnex"]),
+        .executable(name: "SwiftKnexMigration", targets: ["SwiftKnexMigration"]),
     ],
     dependencies: [
-        .Package(url: "https://github.com/noppoMan/Prorsum.git", majorVersion: 0, minor: 1)
+        .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

@@ -3,8 +3,8 @@
 sudo service mysql stop || echo "mysql not stopped"
 sudo stop mysql-5.6 || echo "mysql-5.6 not stopped"
 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.7.3-1_all.deb
-sudo dpkg --install mysql-apt-config_0.7.3-1_all.deb
+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 apt-get update -q
 sudo apt-get install -q -y -o Dpkg::Options::=--force-confnew mysql-server
 sudo mysql_upgrade
@@ -13,7 +13,7 @@ set -x
 set -e
 sudo  mysqld_safe --skip-grant-tables &
 sleep 4
-sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
+sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where user='root'; update user set plugin='mysql_native_password'; FLUSH PRIVILEGES;"
 sudo kill -9 `sudo cat /var/lib/mysql/mysqld_safe.pid`
 sudo kill -9 `sudo cat /var/run/mysqld/mysqld.pid`
 sudo service mysql restart

Scripts/install-swift.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="3.0.1"
+VERSION="4.0.3"
 
 # Determine OS
 UNAME=`uname`;
@@ -11,11 +11,16 @@ else
     if [[ $UNAME == "Linux" ]];
     then
         UBUNTU_RELEASE=`lsb_release -a 2>/dev/null`;
-        if [[ $UBUNTU_RELEASE == *"15.10"* ]];
+        if [[ $UBUNTU_RELEASE == *"16.10"* ]];
         then
-            OS="ubuntu1510";
+            OS="ubuntu1610";
         else
-            OS="ubuntu1404";
+            if [[ $UBUNTU_RELEASE == *"16.04"* ]];
+            then
+                OS="ubuntu1604";
+            else
+                OS="ubuntu1404";
+            fi
         fi
     fi
 fi
@@ -24,11 +29,16 @@ if [[ $OS != "macos" ]];
 then
     sudo apt-get install -y clang libicu-dev uuid-dev
 
-    if [[ $OS == "ubuntu1510" ]];
+    if [[ $OS == "ubuntu1610" ]];
     then
-        SWIFTFILE="swift-$VERSION-RELEASE-ubuntu15.10";
+        SWIFTFILE="swift-$VERSION-RELEASE-ubuntu16.10";
     else
-        SWIFTFILE="swift-$VERSION-RELEASE-ubuntu14.04";
+        if [[ $OS == "ubuntu1604" ]];
+        then
+            SWIFTFILE="swift-$VERSION-RELEASE-ubuntu16.04";
+        else
+            SWIFTFILE="swift-$VERSION-RELEASE-ubuntu14.04";
+        fi
     fi
     wget https://swift.org/builds/swift-$VERSION-release/$OS/swift-$VERSION-RELEASE/$SWIFTFILE.tar.gz
     tar -zxf $SWIFTFILE.tar.gz

Sources/Mysql/Extensions/Bytes.swift

@@ -42,7 +42,7 @@
 
 import Foundation
 
-func arrayOfBytes<T: Integer>(_ value: T, length totalBytes: Int = MemoryLayout<T>.size) -> Array<UInt8> {
+func arrayOfBytes<T: BinaryInteger>(_ value: T, length totalBytes: Int = MemoryLayout<T>.size) -> Array<UInt8> {
     let valuePointer = UnsafeMutablePointer<T>.allocate(capacity: 1)
     valuePointer.pointee = value
 
@@ -137,7 +137,11 @@ extension Int {
             res |= Int(arr[arr.startIndex + i]) << Int(i*8)
         }
         //self = res
-        self = Int(arr[arr.startIndex + 3])<<24 | Int(arr[arr.startIndex + 2])<<16 | Int(arr[arr.startIndex + 1])<<8 | Int(arr[arr.startIndex])
+        let i4 = Int(arr[arr.startIndex + 3])<<24
+        let i3 = Int(arr[arr.startIndex + 2])<<16
+        let i2 = Int(arr[arr.startIndex + 1])<<8
+        let i1 = Int(arr[arr.startIndex])
+        self = i4 | i3 | i2 | i1
     }
 
     func array() ->[UInt8] {
@@ -216,15 +220,23 @@ extension Sequence where Iterator.Element == UInt8 {
             return elem
         }
 
-        return Int32(arr[3])<<24 | Int32(arr[2])<<16 | Int32(arr[1])<<8 | Int32(arr[0])
+        let i4 = Int32(arr[3])<<24
+        let i3 = Int32(arr[2])<<16
+        let i2 = Int32(arr[1])<<8
+        let i1 = Int32(arr[0])
+        return i4 | i3 | i2 | i1
     }
 
     func uInt32() -> UInt32 {
         let arr = self.map { (elem) -> UInt8 in
             return elem
         }
 
-        return UInt32(arr[3])<<24 | UInt32(arr[2])<<16 | UInt32(arr[1])<<8 | UInt32(arr[0])
+        let u4 = UInt32(arr[3])<<24
+        let u3 = UInt32(arr[2])<<16
+        let u2 = UInt32(arr[1])<<8
+        let u1 = UInt32(arr[0])
+        return u4 | u3 | u2 | u1
     }
 
     func uInt64() -> UInt64 {

Sources/Mysql/Mysql.swift

@@ -249,9 +249,15 @@ func lenEncInt(_ b: [UInt8]) -> (UInt64?, Int) {
 
     // 254: value of following 8
     case 0xfe:
-        return (UInt64(b[1]) | UInt64(b[2])<<8 | UInt64(b[3])<<16 |
-            UInt64(b[4])<<24 | UInt64(b[5])<<32 | UInt64(b[6])<<40 |
-            UInt64(b[7])<<48 | UInt64(b[8])<<56, 9)
+        let u1 = UInt64(b[1])
+        let u2 = UInt64(b[2])<<8
+        let u3 = UInt64(b[3])<<16
+        let u4 = UInt64(b[4])<<24
+        let u5 = UInt64(b[5])<<32
+        let u6 = UInt64(b[6])<<40
+        let u7 = UInt64(b[7])<<48
+        let u8 = UInt64(b[8])<<56
+        return (u1 | u2 | u3 | u4 | u5 | u6 | u7 | u8, 9)
     default:
         break
     }

Sources/SwiftKnex/Migration/Migrator.swift

@@ -60,11 +60,11 @@ func validateMigration(name: String) throws -> String {
     }
 
     let ts = segments[1]
-    if ts.characters.count != 14 {
+    if ts.count != 14 {
         throw MigrationError.timestampFormatShouldBe("yyyyMMddHHmmss")
     }
 
-    let year = ts.substring(to: ts.index(ts.startIndex, offsetBy: 4))
+    let year = ts[ts.startIndex...ts.index(ts.startIndex, offsetBy: 4)]
     let month = ts[ts.index(ts.startIndex, offsetBy: 4)..<ts.index(ts.startIndex, offsetBy: 6)]
     let day = ts[ts.index(ts.startIndex, offsetBy: 6)..<ts.index(ts.startIndex, offsetBy: 8)]
     let hour = ts[ts.index(ts.startIndex, offsetBy: 8)..<ts.index(ts.startIndex, offsetBy:10)]

Sources/SwiftKnex/QueryBuilder/BatchInsertQueryBuilder.swift

@@ -21,7 +21,7 @@ struct BatchInsertQueryBuilder: QueryBuildable {
 
     func build() throws -> (String, [Any]) {
         // TODO should throws Error
-        guard let fields = collection.max(by: { $0.0.count < $0.1.count }) else {
+        guard let fields = collection.max(by: { $0.count < $1.count }) else {
             throw QueryBuilderError.emptyValues
         }
 

Sources/SwiftKnexMigration/main.swift

@@ -73,7 +73,7 @@ case "create":
     let now = Date().toMigrationFileDateTimeString()
     let fileName = "\(now)_\(CommandLine.arguments[2])"
 
-    let root = #file.characters
+    let root = #file
         .split(separator: "/", omittingEmptySubsequences: false)
         .dropLast(3)
         .map { String($0) }