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

Resolve recusrsive references
hackolade · Jan 14, 2021 · 52ae041 · 52ae041
2 parents d0fd404 + 6929ad8
commit 52ae041
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "Avro",
-    "version": "0.1.51",
-    "versionDate": "2021-01-08",
+    "version": "0.1.52",
+    "versionDate": "2021-01-14",
     "author": "hackolade",
     "engines": {
         "hackolade": "3.3.2",

diff --git a/reverse_engineering/api.js b/reverse_engineering/api.js
@@ -252,6 +252,16 @@ const handleMultipleTypes = (data, schema, parentSchema, definitions) => {
 	}
 };
 
+const resolveRecursiveReferences = (parentName, child) => {
+	if (!child || parentName !== child.type) {
+		return child;
+	}
+
+	child.type = 'string';
+
+	return child;
+};
+
 const addDefinitions = (types, definitions) => {
 	return types.map(type => {
 		if (Object(type) !== type) {
@@ -263,6 +273,7 @@ const addDefinitions = (types, definitions) => {
 		let schema = {};
 		const { name, namespace } = getNameAndNamespace(type.name);
 		type.name = name;
+		type = resolveRecursiveReferences(name, type);
 
 		handleRecursiveSchema(type, schema, {}, definitions);
 		if (namespace) {

diff --git a/reverse_engineering/helpers/adaptJsonSchema.js b/reverse_engineering/helpers/adaptJsonSchema.js
@@ -32,7 +32,7 @@ const handleNumber = field => {
 
 	return Object.assign({}, field, {
 		type: 'bytes',
-		logicalType: 'decimal'
+		subtype: 'decimal'
 	});
 };