Raise minimum Swift version to 5.5 (vapor#310)

Author: fabianfett

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.4
+// swift-tools-version:5.5
 import PackageDescription
 
 let package = Package(

README.md

@@ -5,7 +5,7 @@
 [![Team Chat](https://img.shields.io/discord/431917998102675485.svg)][Team Chat]
 [![MIT License](http://img.shields.io/badge/license-MIT-brightgreen.svg)][MIT License]
 [![Continuous Integration](https://github.com/vapor/postgres-nio/actions/workflows/test.yml/badge.svg)][Continuous Integration]
-[![Swift 5.4](http://img.shields.io/badge/swift-5.4-brightgreen.svg)][Swift 5.4]
+[![Swift 5.5](http://img.shields.io/badge/swift-5.5-brightgreen.svg)][Swift 5.5]
 <br>
 <br>
 
@@ -191,7 +191,7 @@ Please see [SECURITY.md] for details on the security process.
 [Team Chat]: https://discord.gg/vapor
 [MIT License]: LICENSE
 [Continuous Integration]: https://github.com/vapor/postgres-nio/actions
-[Swift 5.4]: https://swift.org
+[Swift 5.5]: https://swift.org
 [Security.md]: https://github.com/vapor/.github/blob/main/SECURITY.md
 
 [`PostgresConnection`]: https://api.vapor.codes/postgres-nio/main/PostgresNIO/PostgresConnection/

Sources/PostgresNIO/Connection/PostgresConnection.swift

@@ -449,7 +449,7 @@ extension PostgresConnection {
 
 // MARK: Async/Await Interface
 
-#if swift(>=5.5) && canImport(_Concurrency)
+#if canImport(_Concurrency)
 extension PostgresConnection {
 
     /// Creates a new connection to a Postgres server.

Sources/PostgresNIO/New/PSQLRowStream.swift

@@ -22,7 +22,7 @@ final class PSQLRowStream {
         case waitingForAll([PostgresRow], EventLoopPromise<[PostgresRow]>, PSQLRowsDataSource)
         case consumed(Result<String, Error>)
 
-        #if swift(>=5.5) && canImport(_Concurrency)
+        #if canImport(_Concurrency)
         case asyncSequence(AsyncStreamConsumer, PSQLRowsDataSource)
         #endif
     }
@@ -63,7 +63,7 @@ final class PSQLRowStream {
 
     // MARK: Async Sequence
 
-    #if swift(>=5.5) && canImport(_Concurrency)
+    #if canImport(_Concurrency)
     func asyncSequence() -> PostgresRowSequence {
         self.eventLoop.preconditionInEventLoop()
 
@@ -304,7 +304,7 @@ final class PSQLRowStream {
             // immediately request more
             dataSource.request(for: self)
 
-        #if swift(>=5.5) && canImport(_Concurrency)
+        #if canImport(_Concurrency)
         case .asyncSequence(let consumer, _):
             consumer.receive(newRows)
         #endif
@@ -344,7 +344,7 @@ final class PSQLRowStream {
             self.downstreamState = .consumed(.success(commandTag))
             promise.succeed(rows)
 
-        #if swift(>=5.5) && canImport(_Concurrency)
+        #if canImport(_Concurrency)
         case .asyncSequence(let consumer, _):
             consumer.receive(completion: .success(commandTag))
             self.downstreamState = .consumed(.success(commandTag))
@@ -371,7 +371,7 @@ final class PSQLRowStream {
             self.downstreamState = .consumed(.failure(error))
             promise.fail(error)
 
-        #if swift(>=5.5) && canImport(_Concurrency)
+        #if canImport(_Concurrency)
         case .asyncSequence(let consumer, _):
             consumer.receive(completion: .failure(error))
             self.downstreamState = .consumed(.failure(error))

Sources/PostgresNIO/New/PostgresRowSequence-multi-decode.swift

@@ -1,6 +1,6 @@
 /// NOTE: THIS FILE IS AUTO-GENERATED BY dev/generate-postgresrowsequence-multi-decode.sh
 
-#if swift(>=5.5) && canImport(_Concurrency)
+#if canImport(_Concurrency)
 extension AsyncSequence where Element == PostgresRow {
     @inlinable
     @_alwaysEmitIntoClient

Sources/PostgresNIO/New/PostgresRowSequence.swift

@@ -1,7 +1,7 @@
 import NIOCore
 import NIOConcurrencyHelpers
 
-#if swift(>=5.5) && canImport(_Concurrency)
+#if canImport(_Concurrency)
 /// An async sequence of ``PostgresRow``s.
 ///
 /// - Note: This is a struct to allow us to move to a move only type easily once they become available.

Tests/IntegrationTests/AsyncTests.swift

@@ -5,7 +5,7 @@ import PostgresNIO
 import NIOTransportServices
 #endif
 
-#if swift(>=5.5.2)
+#if canImport(_Concurrency)
 final class AsyncPostgresConnectionTests: XCTestCase {
 
     func test1kRoundTrips() async throws {
@@ -64,6 +64,60 @@ final class AsyncPostgresConnectionTests: XCTestCase {
         }
     }
 
+    func testBindMaximumParameters() async throws {
+        let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
+        defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) }
+        let eventLoop = eventLoopGroup.next()
+
+        try await withTestConnection(on: eventLoop) { connection in
+            // Max binds limit is UInt16.max which is 65535 which is 3 * 5 * 17 * 257
+            // Max columns limit is 1664, so we will only make 5 * 257 columns which is less
+            // Then we will insert 3 * 17 rows
+            // In the insertion, there will be a total of 3 * 17 * 5 * 257 == UInt16.max bindings
+            // If the test is successful, it means Postgres supports UInt16.max bindings
+            let columnsCount = 5 * 257
+            let rowsCount = 3 * 17
+
+            let createQuery = PostgresQuery(
+                unsafeSQL: """
+                CREATE TABLE table1 (
+                \((0..<columnsCount).map({ #""int\#($0)" int NOT NULL"# }).joined(separator: ", "))
+                );
+                """
+            )
+            try await connection.query(createQuery, logger: .psqlTest)
+
+            var binds = PostgresBindings(capacity: Int(UInt16.max))
+            for _ in (0..<rowsCount) {
+                for num in (0..<columnsCount) {
+                    try binds.append(num, context: .default)
+                }
+            }
+            XCTAssertEqual(binds.count, Int(UInt16.max))
+
+            let insertionValues = (0..<rowsCount).map { rowIndex in
+                let indices = (0..<columnsCount).map { columnIndex -> String in
+                    "$\(rowIndex * columnsCount + columnIndex + 1)"
+                }
+                return "(\(indices.joined(separator: ", ")))"
+            }.joined(separator: ", ")
+            let insertionQuery = PostgresQuery(
+                unsafeSQL: "INSERT INTO table1 VALUES \(insertionValues)",
+                binds: binds
+            )
+            try await connection.query(insertionQuery, logger: .psqlTest)
+
+            let countQuery = PostgresQuery(unsafeSQL: "SELECT COUNT(*) FROM table1")
+            let countRows = try await connection.query(countQuery, logger: .psqlTest)
+            var countIterator = countRows.makeAsyncIterator()
+            let insertedRowsCount = try await countIterator.next()?.decode(Int.self, context: .default)
+            XCTAssertEqual(rowsCount, insertedRowsCount)
+
+            let dropQuery = PostgresQuery(unsafeSQL: "DROP TABLE table1")
+            try await connection.query(dropQuery, logger: .psqlTest)
+        }
+    }
+
     #if canImport(Network)
     func testSelect10kRowsNetworkFramework() async throws {
         let eventLoopGroup = NIOTSEventLoopGroup()

Tests/IntegrationTests/PSQLIntegrationTests.swift

@@ -330,59 +330,4 @@ final class IntegrationTests: XCTestCase {
         }
     }
 
-#if swift(>=5.5.2)
-    func testBindMaximumParameters() async throws {
-        let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
-        defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) }
-        let eventLoop = eventLoopGroup.next()
-        
-        try await withTestConnection(on: eventLoop) { connection in
-            // Max binds limit is UInt16.max which is 65535 which is 3 * 5 * 17 * 257
-            // Max columns limit is 1664, so we will only make 5 * 257 columns which is less
-            // Then we will insert 3 * 17 rows
-            // In the insertion, there will be a total of 3 * 17 * 5 * 257 == UInt16.max bindings
-            // If the test is successful, it means Postgres supports UInt16.max bindings
-            let columnsCount = 5 * 257
-            let rowsCount = 3 * 17
-            
-            let createQuery = PostgresQuery(
-                unsafeSQL: """
-                CREATE TABLE table1 (
-                \((0..<columnsCount).map({ #""int\#($0)" int NOT NULL"# }).joined(separator: ", "))
-                );
-                """
-            )
-            try await connection.query(createQuery, logger: .psqlTest)
-            
-            var binds = PostgresBindings(capacity: Int(UInt16.max))
-            for _ in (0..<rowsCount) {
-                for num in (0..<columnsCount) {
-                    try binds.append(num, context: .default)
-                }
-            }
-            XCTAssertEqual(binds.count, Int(UInt16.max))
-            
-            let insertionValues = (0..<rowsCount).map { rowIndex in
-                let indices = (0..<columnsCount).map { columnIndex -> String in
-                    "$\(rowIndex * columnsCount + columnIndex + 1)"
-                }
-                return "(\(indices.joined(separator: ", ")))"
-            }.joined(separator: ", ")
-            let insertionQuery = PostgresQuery(
-                unsafeSQL: "INSERT INTO table1 VALUES \(insertionValues)",
-                binds: binds
-            )
-            try await connection.query(insertionQuery, logger: .psqlTest)
-            
-            let countQuery = PostgresQuery(unsafeSQL: "SELECT COUNT(*) FROM table1")
-            let countRows = try await connection.query(countQuery, logger: .psqlTest)
-            var countIterator = countRows.makeAsyncIterator()
-            let insertedRowsCount = try await countIterator.next()?.decode(Int.self, context: .default)
-            XCTAssertEqual(rowsCount, insertedRowsCount)
-            
-            let dropQuery = PostgresQuery(unsafeSQL: "DROP TABLE table1")
-            try await connection.query(dropQuery, logger: .psqlTest)
-        }
-    }
-#endif
 }

Tests/PostgresNIOTests/New/PostgresRowSequenceTests.swift

@@ -4,7 +4,7 @@ import Dispatch
 import XCTest
 @testable import PostgresNIO
 
-#if swift(>=5.5.2)
+#if canImport(_Concurrency)
 final class PostgresRowSequenceTests: XCTestCase {
 
     func testBackpressureWorks() async throws {

dev/generate-postgresrowsequence-multi-decode.sh

@@ -96,7 +96,7 @@ cat <<"EOF"
 EOF
 echo
 
-echo "#if swift(>=5.5) && canImport(_Concurrency)"
+echo "#if canImport(_Concurrency)"
 echo "extension AsyncSequence where Element == PostgresRow {"
 
 # note: