Complete Type Mapping

.flake8

@@ -1,5 +1,4 @@
 [flake8]
 exclude = .github,.git,__pycache__,docs/source/conf.py,old,build,dist,models.py,omymodels/test.py
 ignore = D100, D103, D101, D102, D104,D107, D403, D210, D400, D401, W503, W293, D205
-max-complexity = 10
 max-line-length = 120

omymodels/from_ddl.py

@@ -42,6 +42,8 @@ def create_models(
     defaults_off: Optional[bool] = False,
     exit_silent: Optional[bool] = False,
     no_auto_snake_case: Optional[bool] = False,
+    table_prefix: Optional[str] = "",
+    table_suffix: Optional[str] = "",
 ):
     """models_type can be: "gino", "dataclass", "pydantic" """
     # extract data from ddl file
@@ -55,7 +57,14 @@ def create_models(
             raise NoTablesError()
     # generate code
     output = generate_models_file(
-        data, singular, naming_exceptions, models_type, schema_global, defaults_off
+        data,
+        singular,
+        naming_exceptions,
+        models_type,
+        schema_global,
+        defaults_off,
+        table_prefix=table_prefix,
+        table_suffix=table_suffix,
     )
     if dump:
         save_models_to_file(output, dump_path)
@@ -99,6 +108,9 @@ def convert_ddl_to_models(  # noqa: C901
                 column["name"] = snake_case(column["name"])
             if column["name"] in refs:
                 column["references"] = refs[column["name"]]
+            if "generated" in column:
+                column["generated_as"] = column["generated"]["as"]
+
         if not no_auto_snake_case:
             table["primary_key"] = [snake_case(pk) for pk in table["primary_key"]]
             for uniq in table.get("constraints", {}).get("uniques", []):
@@ -133,6 +145,8 @@ def generate_models_file(
     models_type: str = "gino",
     schema_global: bool = True,
     defaults_off: Optional[bool] = False,
+    table_prefix: Optional[str] = "",
+    table_suffix: Optional[str] = "",
 ) -> str:
     """method to prepare full file with all Models &"""
     models_str = ""
@@ -152,6 +166,8 @@ def generate_models_file(
                 exceptions,
                 schema_global=schema_global,
                 defaults_off=defaults_off,
+                table_prefix=table_prefix,
+                table_suffix=table_suffix,
             )
         header += generator.create_header(
             data["tables"], schema=schema_global, models_str=models_str

omymodels/helpers.py

@@ -99,6 +99,17 @@ def add_custom_types_to_generator(types: List[Type], generator: object) -> objec
 
 
 def datetime_now_check(string: str) -> bool:
-    if "now" in string or "current_timestamp" in string:
-        return True
-    return False
+    now_keywords = [
+        "now",
+        "current_timestamp",
+        "current_date",
+        "current_time",
+        "localtime",
+        "localtimestamp",
+        "sysdate",
+        "getdate",
+        "current",
+        "curdate",
+        "curtime",
+    ]
+    return any(keyword in string.lower() for keyword in now_keywords)

omymodels/logic.py

@@ -1,10 +1,12 @@
 from typing import Dict, List
 
+from table_meta.model import Column
+
 import omymodels.types as t
 
 
 def generate_column(
-    column_data: Dict,
+    column_data: Column,
     table_pk: List[str],
     table_data: Dict,
     schema_global: bool,
@@ -24,7 +26,7 @@ def generate_column(
 
 
 def setup_column_attributes(
-    column_data: Dict,
+    column_data: Column,
     table_pk: List[str],
     column: str,
     table_data: Dict,