fix: revert CPK has-one associatedFields (#2750)

Author: lawmicha

Amplify/Categories/DataStore/Model/Internal/Schema/ModelField+Association.swift

@@ -88,7 +88,7 @@ import Foundation
 ///   directly by host applications. The behavior of this may change without warning.
 public enum ModelAssociation {
     case hasMany(associatedFieldName: String?, associatedFieldNames: [String] = [])
-    case hasOne(associatedFieldName: String?, associatedFieldNames: [String] = [], targetNames: [String])
+    case hasOne(associatedFieldName: String?, targetNames: [String])
     case belongsTo(associatedFieldName: String?, targetNames: [String])
 
     public static let belongsTo: ModelAssociation = .belongsTo(associatedFieldName: nil, targetNames: [])
@@ -104,19 +104,14 @@ public enum ModelAssociation {
                         associatedFieldNames: associatedFields.map { $0.stringValue })
     }
 
-    @available(*, deprecated, message: "Use hasOne(associatedWith:associatedFields:targetNames:)")
-    public static func hasOne(associatedWith: CodingKey?,
-                              targetName: String? = nil) -> ModelAssociation {
+    @available(*, deprecated, message: "Use hasOne(associatedWith:targetNames:)")
+    public static func hasOne(associatedWith: CodingKey?, targetName: String? = nil) -> ModelAssociation {
         let targetNames = targetName.map { [$0] } ?? []
         return .hasOne(associatedWith: associatedWith, targetNames: targetNames)
     }
 
-    public static func hasOne(associatedWith: CodingKey? = nil,
-                              associatedFields: [CodingKey] = [],
-                              targetNames: [String] = []) -> ModelAssociation {
-        return .hasOne(associatedFieldName: associatedWith?.stringValue,
-                       associatedFieldNames: associatedFields.map { $0.stringValue },
-                       targetNames: targetNames)
+    public static func hasOne(associatedWith: CodingKey?, targetNames: [String] = []) -> ModelAssociation {
+        return .hasOne(associatedFieldName: associatedWith?.stringValue, targetNames: targetNames)
     }
 
     @available(*, deprecated, message: "Use belongsTo(associatedWith:targetNames:)")
@@ -242,7 +237,7 @@ extension ModelField {
             let associatedModel = requiredAssociatedModelName
             switch association {
             case .belongsTo(let associatedKey, _),
-                    .hasOne(let associatedKey, _, _),
+                    .hasOne(let associatedKey, _),
                     .hasMany(let associatedKey, _):
                 // TODO handle modelName casing (convert to camelCase)
                 let key = associatedKey ?? associatedModel

Amplify/Categories/DataStore/Model/Internal/Schema/ModelSchema+Definition.swift

@@ -280,21 +280,6 @@ public enum ModelFieldDefinition {
                       association: .hasOne(associatedWith: associatedKey, targetNames: targetNames))
     }
 
-    public static func hasOne(_ key: CodingKey,
-                              is nullability: ModelFieldNullability = .required,
-                              isReadOnly: Bool = false,
-                              ofType type: Model.Type,
-                              associatedFields associatedKeys: [CodingKey],
-                              targetNames: [String]) -> ModelFieldDefinition {
-        return .field(key,
-                      is: nullability,
-                      isReadOnly: isReadOnly,
-                      ofType: .model(type: type),
-                      association: .hasOne(associatedWith: associatedKeys.first,
-                                           associatedFields: associatedKeys,
-                                           targetNames: targetNames))
-    }
-
     public static func belongsTo(_ key: CodingKey,
                                  is nullability: ModelFieldNullability = .required,
                                  isReadOnly: Bool = false,

AmplifyPlugins/Core/AWSPluginsCore/Model/Support/Model+GraphQL.swift

@@ -207,7 +207,7 @@ extension Model {
         let defaultFieldName = modelName.camelCased() + modelField.name.pascalCased() + "Id"
         if case let .belongsTo(_, targetNames) = modelField.association, !targetNames.isEmpty {
             return targetNames
-        } else if case let .hasOne(_, _, targetNames) = modelField.association,
+        } else if case let .hasOne(_, targetNames) = modelField.association,
                   !targetNames.isEmpty {
             return targetNames
         }

AmplifyPlugins/Core/AWSPluginsCore/Model/Support/QueryPredicate+GraphQL.swift

@@ -131,7 +131,7 @@ extension QueryPredicateOperation: GraphQLFilterConvertible {
             }
             let targetName = targetNames.first ?? defaultFieldName
             return targetName
-        case .hasOne(_, _, let targetNames):
+        case .hasOne(_, let targetNames):
             guard targetNames.count == 1 else {
                 preconditionFailure("QueryPredicate not supported on associated field with composite key: \(field)")
             }

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Storage/SQLite/ModelSchema+SQLite.swift

@@ -82,7 +82,7 @@ extension ModelField: SQLColumn {
     var sqlName: String {
         if case let .belongsTo(_, targetNames) = association {
             return foreignKeySqlName(withAssociationTargets: targetNames)
-        } else if case let .hasOne(_, _, targetNames) = association {
+        } else if case let .hasOne(_, targetNames) = association {
             return foreignKeySqlName(withAssociationTargets: targetNames)
         }
         return name

AmplifyTests/CategoryTests/DataStore/ModelFieldAssociationTests.swift

@@ -37,7 +37,7 @@ class ModelFieldAssociationTests: XCTestCase {
 
     func testHasOneWithCodingKeys() {
         let hasOne = ModelAssociation.hasOne(associatedWith: Comment.keys.post, targetName: nil)
-        guard case .hasOne(let fieldName, _, let target) = hasOne else {
+        guard case .hasOne(let fieldName, let target) = hasOne else {
             XCTFail("Should create hasOne association")
             return
         }
@@ -47,7 +47,7 @@ class ModelFieldAssociationTests: XCTestCase {
 
     func testHasOneWithCodingKeysWithTargetName() {
         let hasOne = ModelAssociation.hasOne(associatedWith: Comment.keys.post, targetName: "postID")
-        guard case .hasOne(let fieldName, _, let target) = hasOne else {
+        guard case .hasOne(let fieldName, let target) = hasOne else {
             XCTFail("Should create hasOne association")
             return
         }