add compiler flags + update circle.yml

Author: tanner0101

Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift

@@ -8,15 +8,17 @@ class PostgreSQLConnectionTests: XCTestCase {
     }
 
     func testBenchmark() throws {
+        #if !TEST_NO_GENERATED_AS_IDENTITY
         let conn = try PostgreSQLConnection.makeTest()
         let benchmarker = SQLBenchmarker(on: conn)
         try benchmarker.run()
+        #endif
     }
 
     func testVersion() throws {
         let client = try PostgreSQLConnection.makeTest()
         let results = try client.select().column(.function("version", [])).all(decoding: VersionMetadata.self).wait()
-        XCTAssertTrue(results[0].version.contains("10."))
+        XCTAssertTrue(results[0].version.contains("."))
     }
 
     func testSelectTypes() throws {
@@ -113,10 +115,17 @@ class PostgreSQLConnectionTests: XCTestCase {
         defer {
             _ = try? client.drop(table: Foo.self).ifExists().run().wait()
         }
+        #if TEST_NO_GENERATED_AS_IDENTITY
+        try client.create(table: Foo.self)
+            .column(for: \Foo.id, type: .bigserial, .primaryKey(identifier: nil))
+            .column(for: \Foo.dict)
+            .run().wait()
+        #else
         try client.create(table: Foo.self)
             .column(for: \Foo.id, .primaryKey)
             .column(for: \Foo.dict)
             .run().wait()
+        #endif
 
         let hello = Hello(message: "Hello, world!")
         try client.insert(into: Foo.self).value(Foo(id: nil, dict: hello)).run().wait()
@@ -141,29 +150,45 @@ class PostgreSQLConnectionTests: XCTestCase {
         defer {
             try? conn.drop(table: Nulltest.self).ifExists().run().wait()
         }
+        
+        #if TEST_NO_GENERATED_AS_IDENTITY
+        try conn.create(table: Nulltest.self)
+            .column(for: \Nulltest.i, type: .bigserial, .primaryKey(default: nil))
+            .column(for: \Nulltest.d)
+            .run().wait()
+        #else
         try conn.create(table: Nulltest.self)
             .column(for: \Nulltest.i, .primaryKey)
             .column(for: \Nulltest.d)
             .run().wait()
+        #endif
 
         try conn.insert(into: Nulltest.self).value(Nulltest(i: nil, d: nil)).run().wait()
     }
 
     func testGH24() throws {
         /// PREPARE
         let client = try PostgreSQLConnection.makeTest()
+        
+        let idtype: String
+        
+        #if TEST_NO_GENERATED_AS_IDENTITY
+        idtype = "BIGSERIAL"
+        #else
+        idtype = "BIGINT GENERATED BY DEFAULT AS IDENTITY"
+        #endif
 
         /// CREATE
         let _ = try client.query("""
         CREATE TABLE "users" ("id" UUID PRIMARY KEY, "name" TEXT NOT NULL, "username" TEXT NOT NULL)
         """).wait()
         defer { _ = try! client.simpleQuery("DROP TABLE users").wait() }
         let _ = try client.query("""
-        CREATE TABLE "acronyms" ("id" BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, "short" TEXT NOT NULL, "long" TEXT NOT NULL, "userID" UUID NOT NULL, FOREIGN KEY ("userID") REFERENCES "users" ("id"), FOREIGN KEY ("userID") REFERENCES "users" ("id"))
+        CREATE TABLE "acronyms" ("id" \(idtype) PRIMARY KEY, "short" TEXT NOT NULL, "long" TEXT NOT NULL, "userID" UUID NOT NULL, FOREIGN KEY ("userID") REFERENCES "users" ("id"), FOREIGN KEY ("userID") REFERENCES "users" ("id"))
         """).wait()
         defer { _ = try! client.simpleQuery("DROP TABLE acronyms").wait() }
         let _ = try client.query("""
-        CREATE TABLE "categories" ("id" BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, "name" TEXT NOT NULL)
+        CREATE TABLE "categories" ("id" \(idtype) PRIMARY KEY, "name" TEXT NOT NULL)
         """).wait()
         defer { _ = try! client.simpleQuery("DROP TABLE categories").wait() }
         let _ = try client.query("""
@@ -542,7 +567,7 @@ extension PostgreSQLConnection {
     /// Creates a test connection.
     static func makeTest() throws -> PostgreSQLConnection {
         let transport: PostgreSQLConnection.TransportConfig
-        #if TEST_SSL
+        #if TEST_USE_UNVERIFIED_TLS
         transport = .unverifiedTLS
         #else
         transport = .cleartext

circle.yml

@@ -41,7 +41,7 @@ jobs:
           command: swift build
       - run: 
           name: Run unit tests
-          command: swift test
+          command: swift test -Xswiftc -DTEST_USE_UNVERIFIED_TLS
   10-linux-fluent:
     docker:
       - image: codevapor/swift:4.1
@@ -80,7 +80,7 @@ jobs:
           command: swift build
       - run: 
           name: Run unit tests
-          command: swift test
+          command: swift test -Xswiftc -DTEST_NO_GENERATED_AS_IDENTITY
   9-linux-fluent:
     docker:
       - image: codevapor/swift:4.1

docker-compose.yml

@@ -10,7 +10,7 @@ services:
     ports:
       - 5432:5432
   psql-9:
-    image: postgres:10
+    image: postgres:9
     environment:
       POSTGRES_USER: vapor_username
       POSTGRES_DB: vapor_database