@aws-amplify/datastore 3.7.4-custom-pk.88 → 3.7.4-custom-pk.92

package/dist/aws-amplify-datastore.js

@@ -82863,7 +82863,7 @@ function () {
 
     this.query = function (modelConstructor, identifierOrCriteria, paginationProducer) {
       return __awaiter(_this, void 0, void 0, function () {
-        var msg, modelDefinition, keyFields, predicate, pagination, result, isSingleFieldIdentifier, returnOne;
+        var msg, modelDefinition, keyFields, predicate, msg, pagination, result, returnOne;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
@@ -82893,6 +82893,14 @@ function () {
               keyFields = Object(_util__WEBPACK_IMPORTED_MODULE_12__["extractPrimaryKeyFieldNames"])(modelDefinition);
 
               if (isQueryOne(identifierOrCriteria)) {
+                if (keyFields.length > 1) {
+                  msg = _util__WEBPACK_IMPORTED_MODULE_12__["errorMessages"].queryByPkWithCompositeKeyPresent;
+                  logger.error(msg, {
+                    keyFields: keyFields
+                  });
+                  throw new Error(msg);
+                }
+
                 predicate = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForSingleField(modelDefinition, keyFields[0], identifierOrCriteria);
               } else {
                 // Object is being queried using object literal syntax
@@ -82921,8 +82929,7 @@ function () {
 
             case 2:
               result = _a.sent();
-              isSingleFieldIdentifier = keyFields.length === 1;
-              returnOne = isSingleFieldIdentifier && (isQueryOne(identifierOrCriteria) || Object(_types__WEBPACK_IMPORTED_MODULE_11__["isIdentifierObject"])(identifierOrCriteria, modelDefinition));
+              returnOne = isQueryOne(identifierOrCriteria) || Object(_types__WEBPACK_IMPORTED_MODULE_11__["isIdentifierObject"])(identifierOrCriteria, modelDefinition);
               return [2
               /*return*/
               , returnOne ? result[0] : result];
@@ -97495,7 +97502,8 @@ var __values = undefined && undefined.__values || function (o) {
 
 var ID = 'id';
 var errorMessages = {
-  idEmptyString: 'An index field cannot contain an empty string value'
+  idEmptyString: 'An index field cannot contain an empty string value',
+  queryByPkWithCompositeKeyPresent: 'Models with composite primary keys cannot by queried by a single key value. Use object literal syntax for composite keys instead: https://docs.amplify.aws/lib/datastore/advanced-workflows/q/platform/js/#querying-records-with-custom-primary-keys'
 };
 function extractKeyIfExists(modelDefinition) {
   var _c;
@@ -97980,13 +97988,15 @@ var traverseModel = function traverseModel(srcModelName, instance, namespace, mo
   return result;
 };
 var getIndex = function getIndex(rel, src) {
-  var index = '';
+  var indexName;
   rel.some(function (relItem) {
     if (relItem.modelName === src) {
-      index = relItem.targetName;
+      var targetNames = extractTargetNamesFromSrc(relItem);
+      indexName = targetNames && indexNameFromKeys(targetNames);
+      return true;
     }
   });
-  return index;
+  return indexName;
 };
 var getIndexFromAssociation = function getIndexFromAssociation(indexes, src) {
   var indexName;