Browse Source

* Search for correct element type when checking array types

Michaël Van Canneyt 8 months ago
parent
commit
8cedb10c3a
1 changed files with 5 additions and 1 deletions
  1. 5 1
      packages/fcl-jsonschema/src/fpjson.schema.pascaltypes.pp

+ 5 - 1
packages/fcl-jsonschema/src/fpjson.schema.pascaltypes.pp

@@ -876,7 +876,11 @@ begin
         lElTypeData:=GetSchemaTypeData(Nil,lSchema.Items[0]);
 //         Data.FindSchemaTypeData('Array of string')
         lPascalName:=ArrayTypePrefix+lElTypeData.PascalName+ArrayTypeSuffix;
-        lName:='['+lElTypeData.SchemaName+']';
+
+        lName:='['+lElTypeData.SchemaName;
+        if lSchema.Items[0].Validations.HasKeywordData(jskformat) then
+          lName:=lName+'--'+lSchema.Items[0].Validations.Format;
+        lName:=LName+']';
         Result:=FindSchemaTypeData(lName);
         if Result<>Nil then
           lName:='';