matrx-orm 2.0.4__tar.gz → 2.0.6__tar.gz

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrx-orm
-Version: 2.0.4
+Version: 2.0.6
 Summary: Async-first PostgreSQL ORM with bidirectional migrations, schema introspection, many-to-many relationships, and built-in state caching. Works with any PostgreSQL database.
 Project-URL: Homepage, https://github.com/armanisadeghi/matrx-orm
 Project-URL: Repository, https://github.com/armanisadeghi/matrx-orm
@@ -782,7 +782,7 @@ path = await diff.generate_migration_file("migrations/")
 When an included table has a foreign key column that references a table *outside* the migration scope, `matrx-orm` emits a `UserWarning` — the FK constraint will still be generated in the SQL, but the referenced table won't be created or managed by this migration set. Ensure it already exists in the target database.
 
 ```
-UserWarning: [matrx-orm] Cross-scope FK detected: 'post.author_id' references 'user',
+UserWarning: [MATRX ORM] Cross-scope FK detected: 'post.author_id' references 'user',
 which is outside the current migration scope. The FK constraint will be included
 in the generated SQL, but 'user' will not be created or managed by this migration
 set. Ensure it already exists in the target database.

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/README.md

@@ -743,7 +743,7 @@ path = await diff.generate_migration_file("migrations/")
 When an included table has a foreign key column that references a table *outside* the migration scope, `matrx-orm` emits a `UserWarning` — the FK constraint will still be generated in the SQL, but the referenced table won't be created or managed by this migration set. Ensure it already exists in the target database.
 
 ```
-UserWarning: [matrx-orm] Cross-scope FK detected: 'post.author_id' references 'user',
+UserWarning: [MATRX ORM] Cross-scope FK detected: 'post.author_id' references 'user',
 which is outside the current migration scope. The FK constraint will be included
 in the generated SQL, but 'user' will not be created or managed by this migration
 set. Ensure it already exists in the target database.

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matrx-orm"
-version = "2.0.4"
+version = "2.0.6"
 description = "Async-first PostgreSQL ORM with bidirectional migrations, schema introspection, many-to-many relationships, and built-in state caching. Works with any PostgreSQL database."
 readme = "README.md"
 license = { text = "MIT" }

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/release.sh

@@ -78,7 +78,9 @@ ok "Commit amended"
 # ── Push commit ─────────────────────────────────────────────────────────────
 
 info "Pushing to $REMOTE/$BRANCH..."
+echo ""
 git push "$REMOTE" "$BRANCH"
+echo ""
 ok "Pushed to $REMOTE/$BRANCH"
 
 # ── Tag and push tag ───────────────────────────────────────────────────────
@@ -88,7 +90,9 @@ git tag "$NEW_TAG"
 ok "Tag created"
 
 info "Pushing tag $NEW_TAG..."
+echo ""
 git push "$REMOTE" "$NEW_TAG"
+echo ""
 ok "Tag pushed"
 
 # ── Done ────────────────────────────────────────────────────────────────────
@@ -102,8 +106,8 @@ echo ""
 echo ""
 echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
 echo -e "  Monitor: ${CYAN}https://github.com/armanisadeghi/matrx-orm/actions${NC}"
-echo -e "  Update:  ${CYAN}uv add matrx-orm==${NEW_VERSION}${NC}"
 echo ""
+echo -e "  Update:  ${CYAN}uv add matrx-orm==${NEW_VERSION}${NC}"
 echo -e "  --> Not Available Yet?   Speed up indexing:  ${CYAN}pip index versions matrx-orm${NC}"
 echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
 echo ""

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/client/postgres_connection.py

@@ -1,6 +1,7 @@
 import json
 import os
 from typing import Any, Dict, List
+from urllib.parse import quote_plus
 
 from psycopg_pool import ConnectionPool
 from psycopg.rows import dict_row
@@ -30,7 +31,13 @@ def init_connection_details(config_name):
             raise ValueError(
                 f"Incomplete database configuration for '{config_name}'. " "Please check your environment variables or settings.")
 
-        connection_string = f"{db_protocol}://{db_user}:{db_password}@{db_host}:{db_port}/{db_name}"
+        # URL-encode user and password so special characters (#, $, @, etc.)
+        # don't corrupt the URI — this is the root cause of auth failures when
+        # passwords contain symbols.
+        connection_string = (
+            f"{db_protocol}://{quote_plus(db_user)}:{quote_plus(db_password)}"
+            f"@{db_host}:{db_port}/{db_name}"
+        )
         redacted = f"{db_protocol}://{db_user}:****@{db_host}:{db_port}/{db_name}"
 
         vcprint(f"\n[Matrx ORM] Connection String:\n{redacted}\n", color="yellow")
@@ -39,8 +46,10 @@ def init_connection_details(config_name):
             connection_string,
             min_size=1,
             max_size=10,
-            kwargs={"sslmode": "require"}
+            kwargs={"sslmode": "require"},
+            open=False,
         )
+        connection_pools[config_name].open(wait=True)
 
 
 def get_postgres_connection(
@@ -61,7 +70,12 @@ def execute_sql_query(query, params=None, database_project="this_will_cause_erro
             if params and isinstance(params, dict):
                 query, params = sql_param_to_psycopg2(query, params)
             cur.execute(query, params)
-            return cur.fetchall()
+            results = cur.fetchall()
+        conn.commit()
+        return results
+    except Exception:
+        conn.rollback()
+        raise
     finally:
         connection_pools[database_project].putconn(conn)
 

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/core/config.py

@@ -186,7 +186,7 @@ def register_database_from_env(
     _REQUIRED = ["HOST", "PORT", "NAME", "USER", "PASSWORD"]
     _OPTIONAL = {"PROTOCOL": "postgresql"}
 
-    vcprint(f"[matrx-orm] Registering database '{name}'...", color="cyan")
+    vcprint(name, f"\n[MATRX ORM] Registering database", color="cyan")
 
     missing: list[str] = []
     resolved: dict[str, str] = {}

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/migrations/table_filter.py

@@ -114,7 +114,7 @@ class TableFilter:
                         continue
                     seen.add(key)
                     warnings.warn(
-                        f"[matrx-orm] Cross-scope FK detected: "
+                        f"[MATRX ORM] Cross-scope FK detected: "
                         f"'{table_name}.{col_name}' references '{ref_table}', "
                         f"which is outside the current migration scope. "
                         f"The FK constraint will be included in the generated SQL, "

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/python_sql/table_detailed_relationships.py

@@ -18,8 +18,6 @@ def get_table_relationships(schema, database_project):
         List of dictionaries with table relationship data including relationship types.
     """
 
-    print("get_table_relationships called with", database_project)
-
     query = """
     WITH fk_info AS (
         SELECT

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/schema_builder/__init__.py

@@ -3,6 +3,7 @@
 from matrx_orm.schema_builder import helpers
 from matrx_orm.schema_builder.common import (
     DEBUG_CONFIG,
+    OutputConfig,
 )
 from matrx_orm.schema_builder.generator import (
     get_schema_structure,
@@ -25,6 +26,7 @@ __all__ = [
     "ADMIN_PYTHON_ROOT",
     "ADMIN_TS_ROOT",
     "DEBUG_CONFIG",
+    "OutputConfig",
     "schema_builder_verbose",
     "SchemaManager",
     "run_schema_generation",

matrx_orm-2.0.6/src/matrx_orm/schema_builder/code_handler.py

@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+import os
+
+from matrx_utils.file_handling.specific_handlers.code_handler import CodeHandler
+
+from matrx_orm.schema_builder.common import OutputConfig
+
+
+class SchemaCodeHandler(CodeHandler):
+    """
+    Thin subclass of CodeHandler that gates file writes based on OutputConfig.
+
+    - generate_and_save_code_from_object: skipped when the file extension is
+      .py (python=False) or .ts (typescript=False).
+    - write_to_json: skipped when json=False.
+
+    Everything else — including the temp/direct routing — is handled by the
+    parent class exactly as before.
+    """
+
+    def __init__(self, output_config: OutputConfig):
+        super().__init__(save_direct=output_config.save_direct)
+        self.output_config = output_config
+
+    def generate_and_save_code_from_object(self, config_obj, main_code, additional_code=None):
+        temp_path: str = config_obj.get("temp_path", "")
+        ext = os.path.splitext(temp_path)[-1].lower()
+
+        if ext == ".py" and not self.output_config.python:
+            return
+        if ext == ".ts" and not self.output_config.typescript:
+            return
+
+        super().generate_and_save_code_from_object(config_obj, main_code, additional_code)
+
+    def write_to_json(self, path, data, root="temp", clean=True):
+        if not self.output_config.json:
+            return
+        super().write_to_json(path, data, root=root, clean=clean)

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/schema_builder/columns.py

@@ -119,14 +119,6 @@ class Column:
 
         self.initialize_code_generation()
 
-        vcprint(
-            self.to_dict(),
-            title="Column initialized",
-            pretty=True,
-            verbose=self.verbose,
-            color="cyan",
-        )
-
         if self.enum_labels:
             self.has_enum_labels = True
             vcprint(

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/schema_builder/common.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+from dataclasses import dataclass, field
 from matrx_utils import DataTransformer
 import os
 import dotenv
@@ -13,6 +15,29 @@ ADMIN_TS_ROOT = os.getenv("ADMIN_TS_ROOT", "")
 
 dt_utils = DataTransformer()
 
+@dataclass
+class OutputConfig:
+    """
+    Controls which file types are written during schema generation and whether
+    output goes directly to the project roots (save_direct) or to the temp dir.
+
+    All three type flags default to True — set any to False to skip that output.
+    """
+    save_direct: bool = False
+    python: bool = True
+    typescript: bool = True
+    json: bool = True
+
+    @classmethod
+    def from_dict(cls, d: dict) -> OutputConfig:
+        return cls(
+            save_direct=bool(d.get("save_direct", False)),
+            python=bool(d.get("python", True)),
+            typescript=bool(d.get("typescript", True)),
+            json=bool(d.get("json", True)),
+        )
+
+
 # Central debug configuration for the entire schema builder.
 # Values can be overridden at runtime by run_schema_generation() from the yaml
 # debug section, or by setting env vars MATRX_DEBUG, MATRX_VERBOSE, MATRX_INFO.

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/schema_builder/helpers/git_checker.py

@@ -25,18 +25,18 @@ def check_git_status(save_direct: bool, python_root: str = "", ts_root: str = ""
 
     if not save_direct:
         vcprint(
-            "[MATRX GIT CHECKER] save_direct is False - skipping git checks",
+            "[MATRX ORM GIT CHECKER] save_direct is False - skipping git checks",
             color="green",
         )
         return True
 
-    vcprint("\n[MATRX GIT CHECKER] Checking git repository status...", color="yellow")
-    vcprint(f"[MATRX GIT CHECKER] Python root:     {python_root}", color="green")
-    vcprint(f"[MATRX GIT CHECKER] TypeScript root: {ts_root}", color="green")
+    vcprint("\n[MATRX ORM GIT CHECKER] Checking git repository status...\n", color="yellow")
+    vcprint(f"[MATRX ORM GIT CHECKER] Python root:     {python_root}", color="green")
+    vcprint(f"[MATRX ORM GIT CHECKER] TypeScript root: {ts_root}", color="green")
     print()
 
     for root_name, root_path in roots_to_check:
-        vcprint(f"\n[MATRX GIT CHECKER] Checking {root_name}...", color="yellow")
+        vcprint(f"\n[MATRX ORM GIT CHECKER] Checking {root_name}...", color="yellow")
 
         # Skip if path is not set
         if not root_path:
@@ -51,7 +51,7 @@ def check_git_status(save_direct: bool, python_root: str = "", ts_root: str = ""
         try:
             # Try to initialize repo object
             repo = Repo(root_path)
-            vcprint("- Git repository found! ✓", color="green")
+            vcprint("- [MATRX ORM GIT CHECKER] Git repository found! ✓", color="green")
             vcprint("- Checking git status...\n", color="green")
 
             # Check if there are uncommitted changes
@@ -83,15 +83,15 @@ def check_git_status(save_direct: bool, python_root: str = "", ts_root: str = ""
 
     if has_issues:
         vcprint(
-            "\n[MATRX GIT CHECKER] Error: Cannot proceed with save_direct=True\n",
+            "\n[MATRX ORM GIT CHECKER] Error: Cannot proceed with save_direct=True\n",
             color="red",
         )
         vcprint(
-            "[MATRX GIT CHECKER] Your Options:\n --> Option 1: Commit or stash your changes first.\n --> Option 2: Set save_direct=False.\n --> Option 3: Change your environmental variables to point to a different or temporary directory.\n",
+            "[MATRX ORM GIT CHECKER] Your Options:\n --> Option 1: Commit or stash your changes first.\n --> Option 2: Set save_direct=False.\n --> Option 3: Change your environmental variables to point to a different or temporary directory.\n",
             color="red",
         )
         sys.exit(1)
     else:
-        vcprint("\n[MATRX GIT CHECKER] All checks passed ✓", color="green")
+        vcprint("\n[MATRX ORM GIT CHECKER] All checks passed ✓", color="green")
 
     return True

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/schema_builder/relationships.py

@@ -35,14 +35,6 @@ class Relationship:
         self.debug = DEBUG_CONFIG["debug"]
         self.info = DEBUG_CONFIG["info"]
 
-        vcprint(
-            self.to_dict(),
-            title="Relationship initialized",
-            pretty=True,
-            verbose=self.verbose,
-            color="yellow",
-        )
-
     def __repr__(self):
         return f"<Relationship {self.constraint_name}: {self.column} -> {self.foreign_column}>"
 
@@ -51,8 +43,8 @@ class Relationship:
             "constraint_name": self.constraint_name,
             "column": self.column,
             "foreign_column": self.foreign_column,
-            "target_table": self.target_table,
-            "source_table": self.source_table,
+            "target_table": repr(self.target_table) if self.target_table is not None else None,
+            "source_table": repr(self.source_table) if self.source_table is not None else None,
             "frontend_column": self.frontend_column,
             "frontend_foreign_column": self.frontend_foreign_column,
             "frontend_target_table": self.frontend_target_table,

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/schema_builder/runner.py

@@ -17,7 +17,7 @@ from dotenv import load_dotenv
 from matrx_utils import vcprint
 
 from matrx_orm.core.config import register_database_from_env, DatabaseConfigError
-from matrx_orm.schema_builder.common import DEBUG_CONFIG
+from matrx_orm.schema_builder.common import DEBUG_CONFIG, OutputConfig
 from matrx_orm.schema_builder.helpers.git_checker import check_git_status
 from matrx_orm.schema_builder.schema_manager import SchemaManager
 
@@ -54,7 +54,7 @@ def run_schema_generation(config_path: str | Path = "matrx_orm.yaml") -> None:
             f"Create a matrx_orm.yaml file next to your generate.py script."
         )
 
-    vcprint(f"[matrx-orm] Loading config: {config_path}", color="cyan")
+    vcprint(config_path, f"[MATRX ORM] Loading config", color="cyan")
 
     # Load .env from the same directory as the config file
     env_file = config_path.parent / ".env"
@@ -74,11 +74,10 @@ def run_schema_generation(config_path: str | Path = "matrx_orm.yaml") -> None:
     DEBUG_CONFIG["verbose"] = bool(debug_cfg.get("verbose", False))
 
     # -------------------------------------------------------------------------
-    # Output directories + save_direct
+    # Output config — resolves paths, type flags, and save_direct
     # -------------------------------------------------------------------------
     output_cfg = cfg.get("output", {})
     base = config_path.parent
-    save_direct = bool(output_cfg.get("save_direct", False))
 
     python_root = ""
     ts_root = ""
@@ -91,24 +90,26 @@ def run_schema_generation(config_path: str | Path = "matrx_orm.yaml") -> None:
         ts_root = str((base / output_cfg["typescript_root"]).resolve())
         os.environ["ADMIN_TS_ROOT"] = ts_root
 
+    output_config = OutputConfig.from_dict(output_cfg)
+
     # -------------------------------------------------------------------------
     # Git safety check — must run before any generation when save_direct=True
     # -------------------------------------------------------------------------
-    check_git_status(save_direct, python_root=python_root, ts_root=ts_root)
+    check_git_status(output_config.save_direct, python_root=python_root, ts_root=ts_root)
 
     # -------------------------------------------------------------------------
     # Register databases
     # -------------------------------------------------------------------------
     databases = cfg.get("databases", [])
     if not databases:
-        vcprint("[matrx-orm] No databases defined in matrx_orm.yaml — nothing to do.", color="yellow")
+        vcprint("[MATRX ORM] No databases defined in matrx_orm.yaml — nothing to do.", color="yellow")
         return
 
     for db in databases:
         name = db.get("name")
         prefix = db.get("env_prefix")
         if not name or not prefix:
-            vcprint(f"[matrx-orm] Skipping database entry missing 'name' or 'env_prefix': {db}", color="yellow")
+            vcprint(f"[MATRX ORM] Skipping database entry missing 'name' or 'env_prefix': {db}", color="yellow")
             continue
 
         register_database_from_env(
@@ -122,39 +123,38 @@ def run_schema_generation(config_path: str | Path = "matrx_orm.yaml") -> None:
     # -------------------------------------------------------------------------
     generate_list = cfg.get("generate", [])
     if not generate_list:
-        vcprint("[matrx-orm] No entries in 'generate' — databases registered but nothing generated.", color="yellow")
+        vcprint("[MATRX ORM] No entries in 'generate' — databases registered but nothing generated.", color="yellow")
         return
 
     for entry in generate_list:
         db_name = entry.get("database")
         schema = entry.get("schema", "public")
 
-        vcprint(
-            f"[matrx-orm] Generating schema for database='{db_name}' schema='{schema}'",
-            color="cyan",
-        )
+        vcprint(f"[MATRX ORM] Generating schema... \n\n- Database: '{db_name}'\n- Schema: '{schema}'", verbose=DEBUG_CONFIG["verbose"], color="cyan")
 
         try:
             manager = SchemaManager(
                 schema=schema,
                 database_project=db_name,
-                save_direct=save_direct,
+                output_config=output_config,
             )
             manager.initialize()
             manager.schema.generate_schema_files()
             manager.schema.generate_models()
             vcprint(
-                f"[matrx-orm] Done — database='{db_name}' schema='{schema}'",
+                f"[MATRX ORM] Done — database='{db_name}' schema='{schema}'\n",
                 color="green",
             )
+
+            manager.schema.code_handler.print_all_batched()
         except DatabaseConfigError as e:
             vcprint(
-                f"[matrx-orm] Skipping '{db_name}': {e}",
+                f"[MATRX ORM] Skipping '{db_name}': {e}",
                 color="red",
             )
         except Exception as e:
             vcprint(
-                f"[matrx-orm] Error generating '{db_name}': {e}",
+                f"[MATRX ORM] Error generating '{db_name}': {e}",
                 color="red",
             )
             raise

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/schema_builder/schema.py

@@ -6,9 +6,9 @@ from matrx_orm.schema_builder.helpers import (
     generate_complete_main_hooks_file,
     generate_multiple_entities,
 )
-from matrx_utils.file_handling.specific_handlers.code_handler import CodeHandler
 from matrx_orm import get_code_config, get_schema_builder_overrides
-from matrx_orm.schema_builder.common import DEBUG_CONFIG, dt_utils
+from matrx_orm.schema_builder.code_handler import SchemaCodeHandler
+from matrx_orm.schema_builder.common import DEBUG_CONFIG, OutputConfig, dt_utils
 import re
 
 
@@ -25,10 +25,13 @@ class Schema:
         self,
         name="public",
         database_project=None,
-        save_direct=False,
+        output_config: OutputConfig = None,
     ):
+        if output_config is None:
+            output_config = OutputConfig()
         self.utils = dt_utils
-        self.code_handler = CodeHandler(save_direct=save_direct)
+        self.output_config = output_config
+        self.code_handler = SchemaCodeHandler(output_config)
         self.name = name
         self.database_project = database_project
         self.tables = {}
@@ -37,7 +40,7 @@ class Schema:
         self.verbose = DEBUG_CONFIG["verbose"]
         self.debug = DEBUG_CONFIG["debug"]
         self.info = DEBUG_CONFIG["info"]
-        self.save_direct = save_direct
+        self.save_direct = output_config.save_direct
         self.initialized = False
         self._include_tables: set[str] | None = None
         self._exclude_tables: set[str] | None = None
@@ -91,13 +94,13 @@ class Schema:
             view.initialize_code_generation()
 
         self.initialized = True
-        vcprint(
-            self.to_dict(),
-            title="Schema started",
-            pretty=True,
-            verbose=self.verbose,
-            color="cyan",
-        )
+        # vcprint(
+        #     self.to_dict(),
+        #     title="Schema started",
+        #     pretty=True,
+        #     verbose=self.verbose,
+        #     color="cyan",
+        # )
 
     # Method to get file location based on the code version (schema or types)
     def get_file_location(self, code_version):

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/schema_builder/schema_manager.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from matrx_utils import vcprint
 
-from matrx_orm.schema_builder.common import DEBUG_CONFIG, dt_utils
+from matrx_orm.schema_builder.common import DEBUG_CONFIG, OutputConfig, dt_utils
 from matrx_orm.schema_builder.generator import get_relationship_data_model_types
 from matrx_orm.python_sql.db_objects import get_db_objects
 from matrx_orm.schema_builder.relationships import Relationship
@@ -17,6 +17,7 @@ class SchemaManager:
         schema="public",
         database_project=None,
         additional_schemas=None,
+        output_config: OutputConfig = None,
         save_direct=False,
         include_tables=None,
         exclude_tables=None,
@@ -40,12 +41,19 @@ class SchemaManager:
                 "SchemaManager accepts either 'include_tables' or 'exclude_tables', not both."
             )
 
-        # Ensure utils and Schema are properly imported or defined
-        self.utils = dt_utils  # Define or import `utils` properly
+        # Resolve output_config — explicit object wins; bare save_direct is the
+        # legacy fallback so existing call sites don't break.
+        if output_config is None:
+            output_config = OutputConfig(save_direct=save_direct)
+        self.output_config = output_config
+
+        self.utils = dt_utils
         self.database = database
         self.schema = Schema(
-            name=schema, database_project=database_project, save_direct=save_direct
-        )  # Define or import `Schema`
+            name=schema,
+            database_project=database_project,
+            output_config=output_config,
+        )
         self.additional_schemas = additional_schemas
         self.database_project = database_project
         self.processed_objects = None
@@ -55,7 +63,7 @@ class SchemaManager:
         self.overview_analysis = None
         self.frontend_full_relationships = []
         self.initialized = False
-        self.save_direct = save_direct
+        self.save_direct = output_config.save_direct
         self.verbose = DEBUG_CONFIG["verbose"]
         self.debug = DEBUG_CONFIG["debug"]
         self.info = DEBUG_CONFIG["info"]

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/schema_builder/tables.py

@@ -114,13 +114,6 @@ class Table:
         vcprint(
             self.junction_analysis_ts, pretty=True, verbose=self.verbose, color="blue"
         )
-        vcprint(
-            self.to_dict(),
-            title="Table initialized",
-            pretty=True,
-            verbose=self.verbose,
-            color="cyan",
-        )
 
     def pre_initialize(self):
         if self.pre_initialized:

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/src/matrx_orm/schema_builder/views.py

@@ -40,13 +40,6 @@ class View:
         self.name_title = self.utils.to_title_case(self.name)
 
         self.unique_name_lookups = None
-        vcprint(
-            self.to_dict(),
-            title="View initialized",
-            pretty=True,
-            verbose=self.verbose,
-            color="cyan",
-        )
 
     def __repr__(self):
         return f"<View name={self.name}>"

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/tests/sample_project/generate.py

@@ -1,3 +1,8 @@
 from matrx_orm.schema_builder import run_schema_generation
+from matrx_utils import clear_terminal
+
+
+clear_terminal()
+
 
 run_schema_generation("matrx_orm.yaml")

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/tests/sample_project/matrx_orm.yaml

@@ -10,10 +10,16 @@
 output:
   python_root: generated/python
   typescript_root: generated/typescript
-  # save_direct: false  — set to true to write directly to the roots above.
-  #                       When true, matrx-orm will refuse to run if either
-  #                       root has uncommitted git changes (safety guard).
-  save_direct: false
+
+  # save_direct: write directly to the roots above instead of the temp dir.
+  # When true, matrx-orm will refuse to run if either root has uncommitted
+  # git changes (safety guard).
+  save_direct: true
+
+  # Set any of these to false to skip generating that file type entirely.
+  python: true
+  typescript: true
+  json: true
 
 # =============================================================================
 # Databases
@@ -33,6 +39,8 @@ databases:
 
   - name: secondary
     env_prefix: SECONDARY_DB
+    additional_schemas:
+      - auth
 
 # =============================================================================
 # Schema generation
@@ -44,14 +52,16 @@ generate:
   - database: primary
     schema: public
 
+
   # Uncomment to also generate from the secondary database:
-  # - database: secondary
-  #   schema: public
+  - database: secondary
+    schema: public
 
 # =============================================================================
 # Debug
 # =============================================================================
 debug:
-  info: false
-  verbose: false
-  debug: false
+  info: true
+  debug: true
+  verbose: true
+  

{matrx_orm-2.0.4 → matrx_orm-2.0.6}/uv.lock

@@ -266,7 +266,7 @@ wheels = [
 
 [[package]]
 name = "matrx-orm"
-version = "2.0.2"
+version = "2.0.4"
 source = { editable = "." }
 dependencies = [
     { name = "asyncpg" },