Find DataType in simple type's ancestors (fixes #18)

mganss · Dec 4, 2016 · 6d73b02 · 6d73b02
1 parent 7b0ce51
commit 6d73b02
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/XmlSchemaClassGenerator/TypeModel.cs b/XmlSchemaClassGenerator/TypeModel.cs
@@ -912,11 +912,19 @@ private IEnumerable<CodeAttributeDeclaration> GetAttributes(bool isArray)
  var simpleModel = Type as SimpleModel;
  if (simpleModel != null && simpleModel.UseDataTypeAttribute)
  {
- var name = Type.XmlSchemaType.GetQualifiedName();
- if (name.Namespace == XmlSchema.Namespace)
+ // walk up the inheritance chain to find DataType if the simple type is derived (see #18)
+ var xmlSchemaType = Type.XmlSchemaType;
+ while (xmlSchemaType != null)
  {
- var dataType = new CodeAttributeArgument("DataType", new CodePrimitiveExpression(name.Name));
- attribute.Arguments.Add(dataType);
+ var name = xmlSchemaType.GetQualifiedName();
+ if (name.Namespace == XmlSchema.Namespace && name.Name != "anySimpleType")
+ {
+ var dataType = new CodeAttributeArgument("DataType", new CodePrimitiveExpression(name.Name));
+ attribute.Arguments.Add(dataType);
+ break;
+ }
+ else
+ xmlSchemaType = xmlSchemaType.BaseXmlSchemaType;
  }
  }
  }