Merge pull request #42 from qutheory/travis

travis

.travis.yml

@@ -0,0 +1,15 @@
+os:
+  - linux
+  - osx
+language: generic
+sudo: required
+dist: trusty
+osx_image: xcode7.3
+install:
+  - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"
+script:
+  # Build Fluent
+  - swift build
+  - swift build --configuration release
+  # Test Fluent
+  - swift test

Sources/Comparison.swift

@@ -31,3 +31,26 @@ extension Filter.Comparison: CustomStringConvertible {
         }
     }
 }
+
+/// Temporarily not in SQL.swift file
+extension Filter.Comparison {
+    /**
+     Translates a `Comparison` to SQL.
+     */
+    var sql: String {
+        switch self {
+        case .equals:
+            return "="
+        case .greaterThan:
+            return ">"
+        case .lessThan:
+            return "<"
+        case .greaterThanOrEquals:
+            return ">="
+        case .lessThanOrEquals:
+            return "<="
+        case .notEquals:
+            return "!="
+        }
+    }
+}

Sources/SQL.swift

@@ -164,19 +164,6 @@ extension Action {
     }
 }
 
-extension Filter.Scope {
-    /**
-        Translates a scope to SQL.
-    */
-    var sql: String {
-        switch self {
-        case .in:
-            return "IN"
-        case .notIn:
-            return "NOT IN"
-        }
-    }
-}
 
 /**
     Allows optionals to be targeted
@@ -231,24 +218,3 @@ extension Limit {
     }
 }
 
-extension Filter.Comparison {
-    /**
-        Translates a `Comparison` to SQL.
-    */
-    var sql: String {
-        switch self {
-        case .equals:
-            return "="
-        case .greaterThan:
-            return ">"
-        case .lessThan:
-            return "<"
-        case .greaterThanOrEquals:
-            return ">="
-        case .lessThanOrEquals:
-            return "<="
-        case .notEquals:
-            return "!="
-        }
-    }
-}

Sources/Scope.swift

@@ -13,3 +13,18 @@ extension Filter.Scope: CustomStringConvertible {
         return self == .in ? "in" : "not in"
     }
 }
+
+/// Temporarily not in SQL.swift file
+extension Filter.Scope {
+    /**
+     Translates a scope to SQL.
+     */
+    var sql: String {
+        switch self {
+        case .in:
+            return "IN"
+        case .notIn:
+            return "NOT IN"
+        }
+    }
+}

Tests/LinuxMain.swift

@@ -5,6 +5,7 @@ import XCTest
 
 XCTMain([
     testCase(ModelFindTests.allTests),
+    testCase(QueryFiltersTests.allTests),
 ])
 
 #endif