Detect odd inputs to key/value builders

...

Author: helje5

Sources/ZeeQL/Access/AccessDataSource.swift

@@ -285,7 +285,7 @@ public extension AccessDataSourceType {
                     _ firstKey: String, _ firstValue: Any,
                     _ keysAndValues: Any...) throws -> [ Object ]
   {
-    var binds = [ String: Any ].createArgs(keysAndValues)
+    var binds = try [ String: Any ].createArgs(keysAndValues)
     binds[firstKey] = firstValue
     return try fetchObjects(fetchSpecificationName, binds)
   }

Sources/ZeeQL/Access/AccessDataSourceFinders.swift

@@ -284,7 +284,7 @@ public extension AccessDataSource { // Finders
   func find(_ name: String, _ firstBinding: String, _ firstValue: Any,
             _ bindings: Any...) throws -> Object?
   {
-    var bindings = [ String: Any ].createArgs(bindings)
+    var bindings = try [ String: Any ].createArgs(bindings)
     assert(bindings[firstBinding] == nil, "Duplicate binding.")
     bindings[firstBinding] = firstValue
     return try find(name, bindings)

Sources/ZeeQL/Foundation/Dictionary+Extensions.swift

@@ -5,14 +5,22 @@
 //  Created by Helge Heß on 24.11.24.
 //
 
+enum DictionaryArgumentError: Error, Equatable {
+
+  case oddArgumentCount(Int)
+}
+
 extension Dictionary where Key == String, Value == Any {
 
   /**
    * This method creates a new `Dictionary` from a set of given array containing
    * key/value arguments.
    */
-  static func createArgs(_ values: [ Any ]) -> Self {
+  static func createArgs(_ values: [ Any ]) throws -> Self {
     guard !values.isEmpty else { return [:] }
+    guard values.count.isMultiple(of: 2) else {
+      throw DictionaryArgumentError.oddArgumentCount(values.count)
+    }
     var me = Self()
     me.reserveCapacity(values.count / 2 + 1)
 

Tests/ZeeQLTests/AccessDataSourceFinderTests.swift

@@ -29,6 +29,24 @@ final class AccessDataSourceFinderTests: XCTestCase {
     XCTAssertEqual(qualifier.qualifiers.count, 2)
   }
 
+  func testVariadicFinderRejectsOddBindingArguments() throws {
+    let dataSource = makeCompositeDataSource()
+
+    XCTAssertThrowsError(
+      try dataSource.find("named", "first", 1, "dangling")) { error in
+      XCTAssertEqual(error as? DictionaryArgumentError, .oddArgumentCount(1))
+    }
+  }
+
+  func testVariadicFetchRejectsOddBindingArguments() throws {
+    let dataSource = makeCompositeDataSource()
+
+    XCTAssertThrowsError(
+      try dataSource.fetchObjects("named", "first", 1, "dangling")) { error in
+      XCTAssertEqual(error as? DictionaryArgumentError, .oddArgumentCount(1))
+    }
+  }
+
   private func makeCompositeDataSource() -> AdaptorDataSource {
     let entity = ModelEntity(name: "LocalizedItem")
     entity.attributes = [