From 8cedb10c3a01510b921bc918d674cfd94b04349c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Mon, 25 Nov 2024 21:57:32 +0100 Subject: [PATCH] * Search for correct element type when checking array types --- packages/fcl-jsonschema/src/fpjson.schema.pascaltypes.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/fcl-jsonschema/src/fpjson.schema.pascaltypes.pp b/packages/fcl-jsonschema/src/fpjson.schema.pascaltypes.pp index 8ee0c6ee3e..d8b8c49046 100644 --- a/packages/fcl-jsonschema/src/fpjson.schema.pascaltypes.pp +++ b/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:='';