diff --git a/cdd/__init__.py b/cdd/__init__.py index 4dc4540f..d0f1f16c 100644 --- a/cdd/__init__.py +++ b/cdd/__init__.py @@ -8,7 +8,7 @@ from logging import getLogger as get_logger __author__ = "Samuel Marks" -__version__ = "0.0.99rc10" +__version__ = "0.0.99rc11" __description__ = ( "Open API to/fro routes, models, and tests. " "Convert between docstrings, classes, methods, argparse, pydantic, and SQLalchemy." diff --git a/cdd/tests/test_sqlalchemy/test_parse_sqlalchemy_utils.py b/cdd/tests/test_sqlalchemy/test_parse_sqlalchemy_utils.py index 15735661..70a31221 100644 --- a/cdd/tests/test_sqlalchemy/test_parse_sqlalchemy_utils.py +++ b/cdd/tests/test_sqlalchemy/test_parse_sqlalchemy_utils.py @@ -2,9 +2,11 @@ Tests for the utils that is used by the SQLalchemy parsers """ +from ast import keyword from copy import deepcopy from unittest import TestCase +from cdd.shared.ast_utils import set_value from cdd.sqlalchemy.utils.parse_utils import ( column_call_name_manipulator, column_call_to_param, @@ -54,24 +56,24 @@ def test_column_call_to_param_server_default(self) -> None: """ Tests that `parse.sqlalchemy.utils.column_call_to_param` works with server_default """ - - gold_name, gold_param = ( - lambda _name: ( - _name, - { - "server_default": config_schema["properties"][_name]["default"], - "typ": "str", - "doc": config_schema["properties"][_name]["description"], - "x_typ": {"sql": {"type": "String"}}, - }, - ) - )("dataset_name") - gen_name, gen_param = column_call_to_param( - column_call_name_manipulator( - deepcopy(dataset_primary_key_column_assign.value), "add", gold_name + node = deepcopy(node_fk_call) + node.keywords.append( + keyword( + arg="server_default", + value=set_value("mnist"), + identifier=None, ) ) - gen_param["server_default"] = gen_param.pop("default") + gen_name, gen_param = column_call_to_param(node) + + gold_name, gold_param = gen_name, { + "doc": "[FK(element.element_id)]", + "server_default": "mnist", + "typ": "int", + "x_typ": { + "sql": {"constraints": {"server_default": "mnist"}, "type": "Integer"} + }, + } self.assertEqual(gold_name, gen_name) self.assertDictEqual(gold_param, gen_param)