matrx-orm 1.2.2__tar.gz → 1.2.3__tar.gz

{matrx_orm-1.2.2 → matrx_orm-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrx-orm
-Version: 1.2.2
+Version: 1.2.3
 Summary: Add your description here
 Author-email: jatin.b.rx3@gmail.com
 Requires-Python: >=3.10

{matrx_orm-1.2.2 → matrx_orm-1.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matrx-orm"
-version = "1.2.2"
+version = "1.2.3"
 description = "Add your description here"
 readme = "README.md"
 authors = [

{matrx_orm-1.2.2 → matrx_orm-1.2.3}/src/matrx_orm/core/config.py

@@ -170,9 +170,11 @@ def get_code_config(db_project):
         "temp_path": "models.py",
         "root": ADMIN_PYTHON_ROOT,
         "file_location": f"# File: database/{usable_name}/models.py",
+        # Note: import_lines are dynamically replaced by generate_models() in schema.py
+        # based on the actual field types used. This is a fallback default only.
         "import_lines": [
             "import database_registry",
-            "from matrx_orm import CharField, EnumField, DateField, TextField, IntegerField, FloatField, BooleanField, DateTimeField, UUIDField, JSONField, DecimalField, BigIntegerField, SmallIntegerField, JSONBField, UUIDArrayField, JSONBArrayField, IPAddressField, ForeignKey, Model, model_registry, BaseDTO, BaseManager",
+            "from matrx_orm import Model, model_registry, BaseDTO, BaseManager",
             "from enum import Enum",
             "from dataclasses import dataclass"
         ],

{matrx_orm-1.2.2 → matrx_orm-1.2.3}/src/matrx_orm/schema_builder/individual_managers/columns.py

@@ -791,6 +791,14 @@ class Column:
                 "blank": value.split("'")[1].strip(),  # Extract timestamp with timezone
                 "generator": "formatTimestamptz()",
             },
+            "::time without time zone": lambda value: {
+                "blank": value.split("'")[1].strip(),  # Extract time value
+                "generator": "formatTime()",
+            },
+            "::time with time zone": lambda value: {
+                "blank": value.split("'")[1].strip(),  # Extract time with timezone value
+                "generator": "formatTime()",
+            },
             "::uuid": lambda uuid_value: {
                 "blank": uuid_value.split("'")[1].strip() if "'" in uuid_value else uuid_value.strip(),
                 "generator": "",
@@ -884,6 +892,10 @@ class Column:
             elif value.startswith("ARRAY[]::") and value.endswith("[]"):
                 return {"blank": "[]", "generator": ""}
 
+            # Handle non-empty ARRAY[...] syntax: ARRAY['react'::text, 'lucide-react'::text, ...]
+            elif value.startswith("ARRAY["):
+                return {"blank": "[]", "generator": ""}
+
             # Handle simple numeric defaults (no quotes, no casting)
             # This includes integers, decimals, negative numbers, scientific notation
             elif value.isdigit() or (value.startswith("-") and value[1:].replace(".", "", 1).isdigit()):
@@ -942,6 +954,12 @@ class Column:
                 vcprint(data=value, color="red")
                 return callable_outcomes["::timestamp with time zone"](value)
 
+            if value.endswith("::time without time zone"):
+                return callable_outcomes["::time without time zone"](value)
+
+            if value.endswith("::time with time zone"):
+                return callable_outcomes["::time with time zone"](value)
+
             if value.endswith("::uuid"):
                 uuid_value = value.split("::")[0].strip("'")  # Extract UUID without validation
                 return callable_outcomes["::uuid"](uuid_value)

{matrx_orm-1.2.2 → matrx_orm-1.2.3}/src/matrx_orm/schema_builder/individual_managers/common.py

@@ -10,7 +10,7 @@ schema_builder_save_direct = True
 
 
 DEBUG_SETTINGS = {
-    "tables": ["wc_impairment_definition"],
-    "columns": ["name"],
-    "base_type": [""],
+    "tables": [],
+    "columns": [],
+    "base_type": [],
 }

{matrx_orm-1.2.2 → matrx_orm-1.2.3}/src/matrx_orm/schema_builder/individual_managers/schema.py

@@ -652,10 +652,19 @@ class Schema:
                 remaining_tables.remove(table_name)
 
         py_structure = [self.get_string_user_model()]
+        all_field_types = {"UUIDField", "CharField", "Model"}
+
         for table_name in sorted_tables:
             table = self.tables[table_name]
             py_table_entry = table.to_python_model()
             py_structure.append(py_table_entry)
+            all_field_types.update(table.unique_field_types)
+
+        has_enums = any(
+            column.has_enum_labels
+            for table in self.tables.values()
+            for column in table.columns
+        )
 
         py_manager_structure = []
         py_auto_config_structure = []
@@ -690,8 +699,19 @@ class Schema:
             print("python_models", get_code_config(self.database_project)["python_models"])
             print("-----------------------------\n")
 
-        self.code_handler.generate_and_save_code_from_object(get_code_config(self.database_project)["python_models"],
-                                                             main_code, additional_code)
+        models_config = get_code_config(self.database_project)["python_models"]
+        sorted_field_types = sorted(all_field_types)
+        field_imports = ", ".join(sorted_field_types)
+        dynamic_import_lines = [
+            "import database_registry",
+            f"from matrx_orm import {field_imports}, model_registry, BaseDTO, BaseManager",
+        ]
+        if has_enums:
+            dynamic_import_lines.append("from enum import Enum")
+        dynamic_import_lines.append("from dataclasses import dataclass")
+        models_config["import_lines"] = dynamic_import_lines
+
+        self.code_handler.generate_and_save_code_from_object(models_config, main_code, additional_code)
 
         
         py_auto_config_code = "\n".join(py_auto_config_structure)

{matrx_orm-1.2.2 → matrx_orm-1.2.3}/src/matrx_orm/schema_builder/individual_managers/tables.py

@@ -1021,7 +1021,13 @@ class Table:
         for column in self.columns:
             py_field = column.to_python_model_field()
             py_fields.append(py_field)
-            self.unique_field_types.add(column.python_field_type)
+
+            if column.foreign_key_reference:
+                self.unique_field_types.add("ForeignKey")
+            elif column.has_enum_labels:
+                self.unique_field_types.add("EnumField")
+            else:
+                self.unique_field_types.add(column.python_field_type)
 
             if column.has_enum_labels:
                 py_enum_entry = column.set_python_enum_entry()