Fix duration/memory config in config objects (#6827)

geldata · Feb 13, 2024 · dbde513 · dbde513
1 parent b688521
commit dbde513
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/edb/lib/_testmode.edgeql b/edb/lib/_testmode.edgeql
@@ -168,6 +168,9 @@ create extension package _conf VERSION '1.0' {
         create required property extra -> int64 {
             set readonly := true;
         };
+        create required property duration_config: std::duration {
+            set default := <std::duration>'10 minutes';
+        };
     };
     create type ext::_conf::SecretObj extending ext::_conf::Obj {
         create property secret -> std::str {

diff --git a/edb/server/config/types.py b/edb/server/config/types.py
@@ -33,6 +33,15 @@
     from . import spec
 
 
+T_type = TypeVar('T_type', bound=type)
+
+
+def _issubclass(
+    typ: type | statypes.CompositeTypeSpec, parent: T_type
+) -> TypeGuard[T_type]:
+    return isinstance(typ, type) and issubclass(typ, parent)
+
+
 class ConfigTypeSpec(statypes.CompositeTypeSpec):
     def __call__(self, **kwargs) -> CompositeConfigType:
         return CompositeConfigType(self, **kwargs)
@@ -177,6 +186,11 @@ def from_pyvalue(cls, data, *,
 
                 value = cls.from_pyvalue(value, tspec=actual_f_type, spec=spec)
 
+            elif _issubclass(f_type, statypes.Duration):
+                value = statypes.Duration.from_iso8601(value)
+            elif _issubclass(f_type, statypes.ConfigMemory):
+                value = statypes.ConfigMemory(value)
+
             elif not isinstance(f_type, type) or not isinstance(value, f_type):
                 raise cls._err(
                     tspec,

diff --git a/tests/test_edgeql_ddl.py b/tests/test_edgeql_ddl.py
@@ -16804,6 +16804,7 @@ async def _check(_cfg_obj='Config', **kwargs):
                      'name': '2', 'value': 'bar', 'opt_value': 'opt.'},
                     {'_tname': 'ext::_conf::SubObj',
                      'name': '3', 'value': 'baz', 'extra': 42,
+                     'duration_config': 'PT10M',
                      'opt_value': None},
                     {'_tname': 'ext::_conf::SecretObj',
                      'name': '4', 'value': 'foo',
@@ -16849,6 +16850,7 @@ async def _check(_cfg_obj='Config', **kwargs):
             value := 'quux',
         };
         CONFIGURE CURRENT DATABASE INSERT ext::_conf::SubObj {
+            duration_config := <std::duration>'PT10M',
             extra := 42,
             name := '3',
             value := 'baz',