Fix logical type branch name

#297
mtth · Apr 20, 2020 · c1eff41 · c1eff41
1 parent cc10abf
commit c1eff41
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/lib/types.js b/lib/types.js
@@ -460,10 +460,10 @@ Type.__reset = function (size) {
 Object.defineProperty(Type.prototype, 'branchName', {
   enumerable: true,
   get: function () {
-    if (this.name) {
-      return this.name;
-    }
     var type = Type.isType(this, 'logical') ? this.underlyingType : this;
+    if (type.name) {
+      return type.name;
+    }
     if (Type.isType(type, 'abstract')) {
       return type._concreteTypeName;
     }

diff --git a/test/test_types.js b/test/test_types.js
@@ -2952,6 +2952,36 @@ suite('types', function () {
       assert(!t.isValid({int: 3}));
     });
 
+    test('of records inside wrapped union', function () {
+      function PassThroughType(schema, opts) {
+        LogicalType.call(this, schema, opts);
+      }
+      util.inherits(PassThroughType, LogicalType);
+      PassThroughType.prototype._fromValue = function (val) { return val; };
+      PassThroughType.prototype._toValue = PassThroughType.prototype._fromValue;
+
+      var t = types.Type.forSchema(
+        [
+          {
+            type: 'record',
+            logicalType: 'pt',
+            name: 'A',
+            fields: [{name: 'a', type: 'int'}],
+          },
+          {
+            type: 'record',
+            logicalType: 'pt',
+            name: 'B',
+            fields: [{name: 'b', type: 'int'}],
+          },
+        ],
+        {logicalTypes: {pt: PassThroughType}, wrapUnions: true},
+      );
+      assert(t.isValid({A: {a: 123}}));
+      assert(t.isValid({B: {b: 456}}));
+      assert(!t.isValid({B: {a: 456}}));
+    });
+
     // Unions are slightly tricky to override with logical types since their
     // schemas aren't represented as objects.
     suite('union logical types', function () {