Merge branch 'develop'

Author: helje5

Sources/PostgreSQLAdaptor/PostgreSQLAdaptorChannel.swift

@@ -697,14 +697,14 @@ fileprivate func decodeTextArray(from buffer: UnsafeRawBufferPointer) -> Any? {
 
   do { // one dimension
     let count      = readInt32()
-    assert(count >= 0 && count <= 100_000_000_000)
+    assert(count >= 0 && count <= 1_000_000_000)
     if count <= 0 { return Array<String>() }
 
     let lowerBound = readInt32()
     assert(lowerBound == 1, "unexpected lower bound")
 
     if hasNull {
-      var result = [ String? ](); result.reserveCapacity(count)
+      var result = [ String? ](); result.reserveCapacity(Int(count))
 
       for _ in 0..<count {
         let len = Int(readInt32().bigEndian)
@@ -714,13 +714,13 @@ fileprivate func decodeTextArray(from buffer: UnsafeRawBufferPointer) -> Any? {
         else {
           let strData = UnsafeRawBufferPointer(start: cursor, count: len)
           cursor += len
-          result.append(String(data: strData, encoding: .utf8)!)
+          result.append(String(decoding: strData, as: UTF8.self))
         }
       }
       return result
     }
     else {
-      var result = [ String ](); result.reserveCapacity(count)
+      var result = [ String ](); result.reserveCapacity(Int(count))
 
       for _ in 0..<count {
         let len = Int(readInt32().bigEndian)
@@ -731,7 +731,7 @@ fileprivate func decodeTextArray(from buffer: UnsafeRawBufferPointer) -> Any? {
         else {
           let strData = UnsafeRawBufferPointer(start: cursor, count: len)
           cursor += len
-          result.append(String(data: strData, encoding: .utf8)!)
+          result.append(String(decoding: strData, as: UTF8.self))
         }
       }
       return result

ZeeQL3PG.xcodeproj/project.pbxproj

@@ -3,13 +3,14 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		E80CE01F1EA1811E00347D7B /* libZeeQL.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E80CE01E1EA1811E00347D7B /* libZeeQL.dylib */; };
 		E80CE0221EA1871900347D7B /* PostgreSQLModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E80CE0211EA1871900347D7B /* PostgreSQLModelTests.swift */; };
 		E80CE0241EA1897400347D7B /* PostgreSQLModelFetch.swift in Sources */ = {isa = PBXBuildFile; fileRef = E80CE0231EA1897400347D7B /* PostgreSQLModelFetch.swift */; };
+		E84D18042E97F46A00038603 /* ZeeQL in Frameworks */ = {isa = PBXBuildFile; productRef = E84D18032E97F46A00038603 /* ZeeQL */; };
 		E85E927025C31FE1006CEB40 /* libpq.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E85E926F25C31FE1006CEB40 /* libpq.a */; };
 		E870FC391E9BA1E800A038AF /* PostgreSQLAdaptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E870FC361E9BA1E800A038AF /* PostgreSQLAdaptor.swift */; };
 		E870FC3A1E9BA1E800A038AF /* PostgreSQLAdaptorChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E870FC371E9BA1E800A038AF /* PostgreSQLAdaptorChannel.swift */; };
@@ -78,6 +79,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E84D18042E97F46A00038603 /* ZeeQL in Frameworks */,
 				E85E927025C31FE1006CEB40 /* libpq.a in Frameworks */,
 				E8D95FC91E91A7AD0072FF09 /* libZeeQL.dylib in Frameworks */,
 			);
@@ -268,6 +270,9 @@
 				Base,
 			);
 			mainGroup = E8D2794A1E5504FA00453BBE;
+			packageReferences = (
+				E84D18022E97F46A00038603 /* XCRemoteSwiftPackageReference "ZeeQL3" */,
+			);
 			productRefGroup = E8D279541E5504FA00453BBE /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -365,7 +370,8 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				REEXPORTED_LIBRARY_PATHS = "";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 			};
 			name = Release;
 		};
@@ -455,6 +461,25 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		E84D18022E97F46A00038603 /* XCRemoteSwiftPackageReference "ZeeQL3" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/ZeeQL/ZeeQL3.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.9.38;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		E84D18032E97F46A00038603 /* ZeeQL */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = E84D18022E97F46A00038603 /* XCRemoteSwiftPackageReference "ZeeQL3" */;
+			productName = ZeeQL;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = E8D2794B1E5504FA00453BBE /* Project object */;
 }