Merge branch 'develop'

Author: helje5

.github/workflows/swift.yml

@@ -14,7 +14,8 @@ jobs:
       matrix:
         image:
           - swift:5.3.2-xenial
-          - swift:5.3.2-bionic
+          - swift:5.5.0-focal
+          - swift:5.6.1-bionic
     container: ${{ matrix.image }}
     steps:
       - name: Install SQLite
@@ -35,7 +36,7 @@ jobs:
       - name: Select latest available Xcode
         uses: maxim-lobanov/setup-xcode@v1.2.1
         with:
-          xcode-version: 12.2
+          xcode-version: 13.2.1
       - name: Checkout Repository
         uses: actions/checkout@v2
       - name: Build Xcode Project

Sources/ZeeQL/Control/NotQualifier.swift

@@ -3,7 +3,7 @@
 //  ZeeQL
 //
 //  Created by Helge Hess on 28/02/17.
-//  Copyright © 2017 ZeeZide GmbH. All rights reserved.
+//  Copyright © 2017-2022 ZeeZide GmbH. All rights reserved.
 //
 
 public struct NotQualifier : Qualifier, Equatable {
@@ -35,7 +35,9 @@ public struct NotQualifier : Qualifier, Equatable {
   public func qualifierWith(bindings: Any?, requiresAll: Bool) throws
               -> Qualifier?
   {
-    return try qualifierWith(bindings: bindings, requiresAll: requiresAll)?.not
+    return try qualifier
+      .qualifierWith(bindings: bindings, requiresAll: requiresAll)?
+      .not
   }
 
 

Tests/ZeeQLTests/AdaptorActiveRecordTestCase.swift

@@ -81,7 +81,7 @@ class AdapterActiveRecordTests: XCTestCase {
       try person.save()
     }
     catch {
-      XCTAssert(false, "save failed: \(error)")
+      XCTFail("save failed: \(error)")
     }
     if verbose { print("after save: \(person)") }
 
@@ -116,7 +116,7 @@ class AdapterActiveRecordTests: XCTestCase {
       try refetch?.delete()
     }
     catch {
-      XCTAssert(false, "delete failed: \(error)")
+      XCTFail("delete failed: \(error)")
     }
   }
 

Tests/ZeeQLTests/CodableModelTests.swift

@@ -900,7 +900,7 @@ class CodableModelTests: XCTestCase {
   }
 
   func testSchemaWithToOneInlineCycle() {
-    // TODO: this needs to throw - w/o optional this can't create
+    // This needs to throw - w/o optional this can't create
 
     class Person : CodableObjectType {
       var firstname  : String
@@ -919,25 +919,27 @@ class CodableModelTests: XCTestCase {
       }
     #else
       do {
-        try reflector.add(Person .self)
-        XCTAssert(false, "did not throw error")
+        try reflector.add(Person.self)
+        XCTFail("did not throw error")
       }
       catch let error as CodableModelDecoder.Error {
         if case .reflectionDepthExceeded = error {
           // good
+          return
         }
         else {
-          XCTAssert(false, "unexpected error: \(error)")
+          XCTFail("unexpected error: \(error)")
         }
       }
       catch {
-        XCTAssert(false, "unexpected error")
+        XCTFail("unexpected error")
       }
     #endif
 
     // we should never get here
     let model = reflector.buildModel()
-    model.dump()
+    model.dump() // crashes on unowned reference in -description
+    XCTFail("Reached unexpected point")
   }
 
   func testSchemaWithOptionalToOneInlineCycle() {

Tests/ZeeQLTests/QualifierParserTests.swift

@@ -173,28 +173,28 @@ class QualifierParserTests: XCTestCase {
       XCTAssertEqual(v, "lastname = ", "1st raw value doesn't match")
     }
     else {
-      XCTAssertTrue(false, "first part is not a SQL value: \(parts[0])")
+      XCTFail("first part is not a SQL value: \(parts[0])")
     }
 
     if case .QualifierVariable(let id) = parts[1] {
       XCTAssertEqual(id, "lastname", "2nd part qvar doesn't match")
     }
     else {
-      XCTAssertTrue(false, "2nd part is not a QualifierVariable: \(parts[1])")
+      XCTFail("2nd part is not a QualifierVariable: \(parts[1])")
     }
 
     if case .RawSQLValue(let v) = parts[2] {
       XCTAssertEqual(v, " AND balance = ", "3rd raw value doesn't match")
     }
     else {
-      XCTAssertTrue(false, "3rd part is not a SQL value: \(parts[2])")
+      XCTFail("3rd part is not a SQL value: \(parts[2])")
     }
 
     if case .QualifierVariable(let id) = parts[3] {
       XCTAssertEqual(id, "balance", "4th part qvar doesn't match")
     }
     else {
-      XCTAssertTrue(false, "4th part is not a QualifierVariable: \(parts[3])")
+      XCTFail("4th part is not a QualifierVariable: \(parts[3])")
     }
   }
 

ZeeQL3.xcodeproj/project.pbxproj

@@ -1085,7 +1085,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1100;
-				LastUpgradeCheck = 1250;
+				LastUpgradeCheck = 1330;
 				ORGANIZATIONNAME = "ZeeZide GmbH";
 				TargetAttributes = {
 					E8263C541E93B1E100508276 = {

ZeeQL3.xcodeproj/xcshareddata/xcschemes/MobileZeeQL.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1330"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ZeeQL3.xcodeproj/xcshareddata/xcschemes/WatchZeeQL.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1330"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ZeeQL3.xcodeproj/xcshareddata/xcschemes/ZeeQL.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1330"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"