fix non-int primary key; passing tests

Author: tanner0101

Sources/FluentPostgreSQL/PostgreSQLDatabase+QuerySupporting.swift

@@ -65,6 +65,7 @@ extension PostgreSQLDatabase: QuerySupporting {
                 values.append(row.value)
             }
             insert.values.append(values)
+            insert.returning.append(.all)
             query = .insert(insert)
         case ._select:
             var select: PostgreSQLSelect = .select()

Sources/FluentPostgreSQL/PostgreSQLDatabase+SchemaSupporting.swift

@@ -39,7 +39,6 @@ extension PostgreSQLDatabase: SchemaSupporting {
             constraints.append(.notNull)
         }
 
-        // FIXME: is array support
         let isArray: Bool
         if let array = type as? AnyArray.Type {
             type = array.anyElementType
@@ -56,19 +55,22 @@ extension PostgreSQLDatabase: SchemaSupporting {
 
         if isIdentifier {
             if _globalEnableIdentityColumns {
+                let pkDefault: PostgreSQLPrimaryKeyDefault?
+                // create a unique name for the primary key since it will be added
+                // as a separate index.
+                let unique: String
+                if let table = column.table {
+                    unique = table.identifier.string + "." + column.identifier.string
+                } else {
+                    unique = column.identifier.string
+                }
                 switch dataType {
                 case .smallint, .integer, .bigint:
-                    // create a unique name for the primary key since it will be added
-                    // as a separate index.
-                    let unique: String
-                    if let table = column.table {
-                        unique = table.identifier.string + "." + column.identifier.string
-                    } else {
-                        unique = column.identifier.string
-                    }
-                    constraints.append(.primaryKey(default: .generated(.byDefault), identifier: .identifier("pk:\(unique)")))
-                default: break
+                    pkDefault = .generated(.byDefault)
+                default:
+                    pkDefault = nil
                 }
+                constraints.append(.primaryKey(default: pkDefault, identifier: .identifier("pk:\(unique)")))
             } else {
                 switch dataType {
                 case .smallint: dataType = .smallserial
@@ -79,6 +81,10 @@ extension PostgreSQLDatabase: SchemaSupporting {
             }
         }
 
+        if isArray {
+            dataType = .array(dataType)
+        }
+        
         // FIXME: is array support
         return .columnDefinition(column, dataType, constraints)
     }

Tests/FluentPostgreSQLTests/FluentPostgreSQLTests.swift

@@ -169,7 +169,7 @@ class FluentPostgreSQLTests: XCTestCase {
             static func prepare(on conn: PostgreSQLConnection) -> EventLoopFuture<Void> {
                 return PostgreSQLDatabase.create(DefaultTest.self, on: conn) { builder in
                     builder.field(for: \.id, isIdentifier: true)
-                    builder.field(for: \.date, type: .timestamp(nil), .default(.function(.function("current_timestamp", []))))
+                    builder.field(for: \.date, type: .timestamp, .default(.literal(.numeric("current_timestamp"))))
                     builder.field(for: \.foo)
                 }
             }
@@ -386,7 +386,7 @@ struct Planet: PostgreSQLModel, PostgreSQLMigration, Equatable {
     }
 }
 
-extension PostgreSQLColumnType {
+extension PostgreSQLDataType {
     static var planetType: PostgreSQLDataType {
         return .custom("PLANET_TYPE")
     }