Merge commit 'refs/pull/51/head' of https://github.com/hackolade/Avro

hackolade · Dec 20, 2021 · d2d447a · d2d447a
2 parents 21bc5b3 + 5adcbe5
commit d2d447a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/forward_engineering/api.js b/forward_engineering/api.js
@@ -696,14 +696,17 @@ const handleChoice = (schema, choice, udt) => {
 				multipleField.type.push(newField);
 			} else if (Object(newField.type) === newField.type) {
 				newField.name = newField.name || field.name || fieldName;
-				multipleField.type = multipleField.type.concat([newField]);
+				const type = _.isArray(newField.type)
+					? _.map(newField.type, type => _.assign({}, newField, { type }))
+					: [newField];
+				multipleField.type = multipleField.type.concat(type);
 			} else if (Array.isArray(filedType)) {
 				multipleField.type = multipleField.type.concat(filedType);
 			} else {
 				multipleField.type = multipleField.type.concat([filedType]);
 			}
 
-			multipleField.type = _.uniq(multipleField.type);
+			multipleField.type = _.uniqBy(multipleField.type, type => (_.isObject(type) ? type.type : type));
 			if (multipleField.type.length === 1) {
 				multipleField.type = _.first(multipleField.type);
 			}