Merge pull request #33 from vapor/fluent-17

fluent updates
vapor · Mar 15, 2017 · dbc0154 · dbc0154
2 parents 85ffe07 + 5e9bd94
commit dbc0154
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Sources/FluentMySQL/MySQLDriver.swift b/Sources/FluentMySQL/MySQLDriver.swift
@@ -137,7 +137,6 @@ extension MySQL.Connection: Fluent.Connection {
     public func schema(_ schema: Schema) throws {
         let serializer = MySQLSerializer(sql: schema.sql)
         let (statement, values) = serializer.serialize()
-
         try mysql(statement, values)
     }
 

diff --git a/Sources/FluentMySQL/MySQLSerializer.swift b/Sources/FluentMySQL/MySQLSerializer.swift
@@ -31,8 +31,10 @@ public final class MySQLSerializer: GeneralSQLSerializer {
             return "DOUBLE"
         case .bool:
             return "TINYINT(1) UNSIGNED"
-        case .data:
+        case .bytes:
             return "BLOB"
+        case .date:
+            return "DATETIME"
         case .custom(let type):
             return type
         }

diff --git a/circle.yml b/circle.yml
@@ -3,4 +3,5 @@ machine:
     - mysql
 test:
   override:
-    - eval "$(curl -sL swift.vapor.sh/ci-3.1)"
+     - sudo sed -i 's/-fabi-version=2 -fno-omit-frame-pointer/ /g' /usr/lib/x86_64-linux-gnu/pkgconfig/mysqlclient.pc; 
+     - eval "$(curl -sL swift.vapor.sh/ci-3.1)"