Database: FIX data type check.

xsedla1o · xsedla1o · commit bafb4cb15633 · 2024-11-06T14:13:58.000+01:00
diff --git a/dp3/database/database.py b/dp3/database/database.py
@@ -1571,7 +1571,7 @@ def get_distinct_val_count(self, etype: str, attr: str) -> dict[Any, int]:
             raise DatabaseError(f"Attribute '{attr}' isn't plain or observations")
 
         # Attribute data type must be primitive, array<T> or set<T>
-        if attr_spec.data_type.root in ("dict", "json"):
+        if any(needle in attr_spec.data_type.root for needle in ("dict", "json")):
             raise DatabaseError(
                 f"Data type '{attr_spec.data_type}' of attribute '{attr}' is not processable"
             )

Original file line number	Diff line number	Diff line change
`@@ -1571,7 +1571,7 @@ def get_distinct_val_count(self, etype: str, attr: str) -> dict[Any, int]:`
`1571`	`1571`	`raise DatabaseError(f"Attribute '{attr}' isn't plain or observations")`
`1572`	`1572`
`1573`	`1573`	`# Attribute data type must be primitive, array<T> or set<T>`
`1574`		`- if attr_spec.data_type.root in ("dict", "json"):`
	`1574`	`+ if any(needle in attr_spec.data_type.root for needle in ("dict", "json")):`
`1575`	`1575`	`raise DatabaseError(`
`1576`	`1576`	`f"Data type '{attr_spec.data_type}' of attribute '{attr}' is not processable"`
`1577`	`1577`	`)`