alpha (#59)

* update circle + add swiftpm ignore

* remove collate + rename to execute(sql:)

* update readme

* bump

.gitignore

@@ -4,4 +4,5 @@
 /*.xcodeproj
 Package.resolved
 DerivedData
+.swiftpm
 

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Qutheory, LLC
+Copyright (c) 2019 Qutheory, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -1,18 +1,18 @@
 <p align="center">
-    <img src="https://user-images.githubusercontent.com/1342803/39145428-9f6e8328-4701-11e8-9955-663bbbe3e9b4.png" height="64" alt="SQL">
+    <img src="https://user-images.githubusercontent.com/1342803/58835528-3523e400-8624-11e9-8128-4925c7c9cf08.png" alt="SQLKit">
     <br>
     <br>
-    <a href="http://docs.vapor.codes/3.0/sql/getting-started/">
-        <img src="http://img.shields.io/badge/read_the-docs-2196f3.svg" alt="Documentation">
+    <a href="https://api.vapor.codes/sql/master/SQLKit/index.html">
+        <img src="http://img.shields.io/badge/api-docs-2196f3.svg" alt="Documentation">
     </a>
     <a href="https://discord.gg/vapor">
         <img src="https://img.shields.io/discord/431917998102675485.svg" alt="Team Chat">
     </a>
     <a href="LICENSE">
         <img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT License">
     </a>
-    <a href="https://circleci.com/gh/vapor/sql">
-        <img src="https://circleci.com/gh/vapor/sql.svg?style=shield" alt="Continuous Integration">
+    <a href="https://circleci.com/gh/vapor/sql-kit">
+        <img src="https://circleci.com/gh/vapor/sql-kit.svg?style=shield" alt="Continuous Integration">
     </a>
     <a href="https://swift.org">
         <img src="http://img.shields.io/badge/swift-5-brightgreen.svg" alt="Swift 5">

Sources/SQLKit/Builders/SQLAlterTableBuilder.swift

@@ -1,10 +1,3 @@
-/// Builds `ALTER TABLE` queries.
-///
-///     conn.alter(table: Planet.self)
-///         .column(for: \.name)
-///         .run()
-///
-/// See `SQLColumnBuilder` for more information.
 public final class SQLAlterTableBuilder: SQLQueryBuilder, SQLColumnBuilder {
     /// `SQLAlterTable` query being built.
     public var alterTable: SQLAlterTable

Sources/SQLKit/Builders/SQLQueryBuilder.swift

@@ -19,6 +19,6 @@ extension SQLQueryBuilder {
     ///
     /// - returns: A future signaling completion.
     public func run() -> EventLoopFuture<Void> {
-        return self.database.sqlQuery(self.query) { _ in }
+        return self.database.execute(sql: self.query) { _ in }
     }
 }

Sources/SQLKit/Builders/SQLQueryFetcher.swift

@@ -39,7 +39,7 @@ extension SQLQueryFetcher {
     ///
     /// The returned future will signal completion of the query.
     public func run(_ handler: @escaping (SQLRow) throws -> ()) -> EventLoopFuture<Void> {
-        return self.database.sqlQuery(self.query) { row in
+        return self.database.execute(sql: self.query) { row in
             try handler(row)
         }
     }

Sources/SQLKit/Query/SQLConstraintAlgorithm.swift

@@ -12,13 +12,13 @@ public enum SQLConstraintAlgorithm: SQLExpression {
     /// `COLLATE` constraint.
     case check(SQLExpression)
 
-    case collate(SQLCollation)
+    case collate(SQLExpression)
 
     /// `DEFAULT` constraint.
     case `default`(SQLExpression)
 
     /// `FOREIGN KEY` constraint.
-    case foreignKey(SQLForeignKey)
+    case foreignKey(SQLExpression)
 
     public func serialize(to serializer: inout SQLSerializer) {
         switch self {

Sources/SQLKit/SQLDatabase.swift

@@ -1,6 +1,6 @@
 public protocol SQLDatabase {
-    func sqlQuery(
-        _ query: SQLExpression,
+    func execute(
+        sql query: SQLExpression,
         _ onRow: @escaping (SQLRow) throws -> ()
     ) -> EventLoopFuture<Void>
 }

Tests/SQLKitTests/Utilities.swift

@@ -9,7 +9,7 @@ final class TestDatabase: SQLDatabase {
         self.results = []
     }
 
-    func sqlQuery(_ query: SQLExpression, _ onRow: @escaping (SQLRow) throws -> ()) -> EventLoopFuture<Void> {
+    func execute(sql query: SQLExpression, _ onRow: @escaping (SQLRow) throws -> ()) -> EventLoopFuture<Void> {
         var serializer = SQLSerializer(dialect: GenericDialect())
         query.serialize(to: &serializer)
         results.append(serializer.sql)

circle.yml

@@ -1,22 +1,53 @@
 version: 2
 
 jobs:
-  linux:
+  macos:
+    macos:
+      xcode: "10.2.0"
+    steps:
+      - checkout
+      - run: swift build
+      - run: swift test
+  macos-release:
+    macos:
+      xcode: "10.2.0"
+    steps:
+      - checkout
+      - run: swift build -c release
+  bionic:
     docker:
-      - image: vapor/swift:5.0
+      - image: swift:5.0-bionic
     steps:
       - checkout
       - run: swift build
       - run: swift test
-  linux-release:
+  bionic-release:
     docker:
-      - image: vapor/swift:5.0
+      - image: swift:5.0-bionic
     steps:
       - checkout
       - run: swift build -c release
+  xenial:
+    docker:
+      - image: swift:5.0-xenial
+    steps:
+      - checkout
+      - run: swift build
+      - run: swift test
+  xenial-release:
+    docker:
+      - image: swift:5.0-xenial
+    steps:
+      - checkout
+      - run: swift build -c release
+
 workflows:
   version: 2
   tests:
     jobs:
-      - linux
-      - linux-release
+      - macos
+      - macos-release
+      - bionic
+      - bionic-release
+      - xenial
+      - xenial-release