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

primitive types definitions handling
hackolade · Jan 20, 2021 · 9f4bffe · 9f4bffe
2 parents f0594dc + aac8a84
commit 9f4bffe
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/forward_engineering/api.js b/forward_engineering/api.js
@@ -690,7 +690,11 @@ const handleItems = (schema, avroSchema, udt) => {
 		});
 	avroSchema.items = getUniqueItemsInArray(items);
 	if(avroSchema.items.length === 1) {
-		avroSchema.items = avroSchema.items[0];
+		if (schema.items[0].$ref && !avroSchema.items[0].name) {
+			avroSchema.items = avroSchema.items[0].type;
+		} else {
+			avroSchema.items = avroSchema.items[0];
+		}
 	}
 };
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "Avro",
-    "version": "0.1.53",
-    "versionDate": "2021-01-15",
+    "version": "0.1.54",
+    "versionDate": "2021-01-20",
     "author": "hackolade",
     "engines": {
         "hackolade": "3.3.2",

diff --git a/reverse_engineering/api.js b/reverse_engineering/api.js
@@ -196,7 +196,7 @@ const handleType = (data, schema, parentSchema, definitions) => {
 	if (Array.isArray(data.type)) {
 		schema = handleMultipleTypes(data, schema, parentSchema, definitions);
 	} else if (typeof data.type === 'object') {
-		if (data.type.name) {		
+		if (data.type.name && ['record', 'enum', 'fixed'].includes(data.type.type)) {		
 			data.type = addDefinitions([data.type], definitions).pop();
 
 			handleRecursiveSchema(data, schema, {}, definitions);
@@ -452,6 +452,8 @@ const handleItems = (data, prop, schema, definitions) => {
 	} else if (typeof items === 'object') {
 		schema.items = {};
 		handleRecursiveSchema(items, schema.items, schema, definitions);
+	} else if (typeof items === 'string') {
+		schema.items = getType({}, data, items)
 	} else {
 		schema.items = {
 			type: items