_evaluate_recursive() now uses the correct vars
This commit is contained in:
parent
5b0713f1cf
commit
8974d190cd
1 changed files with 5 additions and 5 deletions
|
@ -76,15 +76,15 @@ func _evaluate_recursive(random: String, schema_parent: Dictionary, data_parent:
|
||||||
failed.append(core.stringify_variables("Key %key% is present in schema but missing in data", { "key": path + "/" + key }))
|
failed.append(core.stringify_variables("Key %key% is present in schema but missing in data", { "key": path + "/" + key }))
|
||||||
else:
|
else:
|
||||||
# Exists in data
|
# Exists in data
|
||||||
if typeof(schema[key]) == TYPE_DICTIONARY:
|
if typeof(schema_parent[key]) == TYPE_DICTIONARY:
|
||||||
# Key is of type Dictionary, allow for recursion to happen
|
# Key is of type Dictionary, allow for recursion to happen
|
||||||
failed.append_array(_evaluate_recursive(random, schema[key], data[key], path + "/" + key))
|
failed.append_array(_evaluate_recursive(random, schema_parent[key], data_parent[key], path + "/" + key))
|
||||||
else:
|
else:
|
||||||
# Key is not of type Dictionary, evaluate against data
|
# Key is not of type Dictionary, evaluate against data
|
||||||
schema[key].data = data[key]
|
schema_parent[key].data = data_parent[key]
|
||||||
if !schema[key].evaluate():
|
if !schema_parent[key].evaluate():
|
||||||
logger.error(core.stringify_variables("Validation for key %key% failed", { "key": path + "/" + key }))
|
logger.error(core.stringify_variables("Validation for key %key% failed", { "key": path + "/" + key }))
|
||||||
for failure in schema[key].failures:
|
for failure in schema_parent[key].failures:
|
||||||
# Append failures from single
|
# Append failures from single
|
||||||
failed.append(key + ": " + failure)
|
failed.append(key + ": " + failure)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue