cinchdb 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

cinchdb/managers/column.py

@@ -153,8 +153,7 @@ class ColumnManager:
         col_defs = []
         for col in new_columns:
             col_def = f"{col.name} {col.type}"
-            if col.primary_key:
-                col_def += " PRIMARY KEY"
+            # Primary keys are handled at table creation, not as a column attribute
             if not col.nullable:
                 col_def += " NOT NULL"
             if col.default is not None:
@@ -326,7 +325,6 @@ class ColumnManager:
                     type=col.type,
                     nullable=col.nullable,
                     default=col.default,
-                    primary_key=col.primary_key,
                     unique=col.unique,
                 )
                 new_columns.append(new_col)
@@ -339,8 +337,7 @@ class ColumnManager:
         col_defs = []
         for col in new_columns:
             col_def = f"{col.name} {col.type}"
-            if col.primary_key:
-                col_def += " PRIMARY KEY"
+            # Primary keys are handled at table creation, not as a column attribute
             if not col.nullable:
                 col_def += " NOT NULL"
             if col.default is not None:
@@ -397,7 +394,6 @@ class ColumnManager:
                     type=col.type,
                     nullable=col.nullable,
                     default=col.default,
-                    primary_key=col.primary_key,
                     unique=col.unique,
                 )
                 new_columns.append(new_col)
@@ -410,8 +406,7 @@ class ColumnManager:
         col_defs = []
         for col in new_columns:
             col_def = f"{col.name} {col.type}"
-            if col.primary_key:
-                col_def += " PRIMARY KEY"
+            # Primary keys are handled at table creation, not as a column attribute
             if not col.nullable:
                 col_def += " NOT NULL"
             if col.default is not None:
@@ -512,8 +507,7 @@ class ColumnManager:
         col_defs = []
         for col in existing_columns:
             col_def = f"{col.name} {col.type}"
-            if col.primary_key:
-                col_def += " PRIMARY KEY"
+            # Primary keys are handled at table creation, not as a column attribute
             # Apply nullable change to target column
             if col.name == column_name:
                 if not nullable:

cinchdb/managers/query.py

@@ -8,6 +8,7 @@ from pydantic import BaseModel, ValidationError
 from cinchdb.core.connection import DatabaseConnection
 from cinchdb.core.path_utils import get_tenant_db_path
 from cinchdb.utils import validate_query_safe
+from cinchdb.managers.tenant import TenantManager
 
 T = TypeVar("T", bound=BaseModel)
 
@@ -30,7 +31,24 @@ class QueryManager:
         self.database = database
         self.branch = branch
         self.tenant = tenant
-        self.db_path = get_tenant_db_path(project_root, database, branch, tenant)
+        # Initialize tenant manager for lazy tenant handling
+        self.tenant_manager = TenantManager(project_root, database, branch)
+    
+    def _is_write_query(self, sql: str) -> bool:
+        """Check if a SQL query is a write operation.
+        
+        Args:
+            sql: SQL query string
+            
+        Returns:
+            True if query performs writes, False otherwise
+        """
+        sql_upper = sql.strip().upper()
+        write_keywords = [
+            "INSERT", "UPDATE", "DELETE", "CREATE", "ALTER", "DROP",
+            "TRUNCATE", "REPLACE", "MERGE"
+        ]
+        return any(sql_upper.startswith(keyword) for keyword in write_keywords)
 
     def execute(
         self,
@@ -62,7 +80,12 @@ class QueryManager:
                 "execute() can only be used with SELECT queries. Use execute_non_query() for INSERT/UPDATE/DELETE operations."
             )
 
-        with DatabaseConnection(self.db_path) as conn:
+        # Get appropriate database path based on operation type (read for SELECT)
+        db_path = self.tenant_manager.get_tenant_db_path_for_operation(
+            self.tenant, is_write=False
+        )
+        
+        with DatabaseConnection(db_path) as conn:
             cursor = conn.execute(sql, params)
             rows = cursor.fetchall()
             return [dict(row) for row in rows]
@@ -187,7 +210,12 @@ class QueryManager:
         if not skip_validation:
             validate_query_safe(sql)
 
-        with DatabaseConnection(self.db_path) as conn:
+        # Get appropriate database path based on operation type (write for non-SELECT)
+        db_path = self.tenant_manager.get_tenant_db_path_for_operation(
+            self.tenant, is_write=True
+        )
+
+        with DatabaseConnection(db_path) as conn:
             cursor = conn.execute(sql, params)
             affected_rows = cursor.rowcount
             conn.commit()
@@ -208,7 +236,15 @@ class QueryManager:
         """
         total_affected = 0
 
-        with DatabaseConnection(self.db_path) as conn:
+        # Determine if this is a write operation
+        is_write = self._is_write_query(sql)
+        
+        # Get appropriate database path
+        db_path = self.tenant_manager.get_tenant_db_path_for_operation(
+            self.tenant, is_write=is_write
+        )
+
+        with DatabaseConnection(db_path) as conn:
             try:
                 for params in params_list:
                     cursor = conn.execute(sql, params)

cinchdb/managers/table.py

@@ -124,9 +124,9 @@ class TableManager:
                     fk_constraint += f" ON UPDATE {fk.on_update}"
                 foreign_key_constraints.append(fk_constraint)
 
-        # Build automatic columns
+        # Build automatic columns (id is always the primary key)
         auto_columns = [
-            Column(name="id", type="TEXT", primary_key=True, nullable=False),
+            Column(name="id", type="TEXT", nullable=False),
             Column(name="created_at", type="TEXT", nullable=False),
             Column(name="updated_at", type="TEXT", nullable=True),
         ]
@@ -139,13 +139,14 @@ class TableManager:
         for col in all_columns:
             col_def = f"{col.name} {col.type}"
 
-            if col.primary_key:
+            # id column is always the primary key
+            if col.name == "id":
                 col_def += " PRIMARY KEY"
             if not col.nullable:
                 col_def += " NOT NULL"
             if col.default is not None:
                 col_def += f" DEFAULT {col.default}"
-            if col.unique and not col.primary_key:
+            if col.unique and col.name != "id":  # id is already unique via PRIMARY KEY
                 col_def += " UNIQUE"
 
             sql_parts.append(col_def)
@@ -261,7 +262,7 @@ class TableManager:
                     type=col_type,
                     nullable=(row["notnull"] == 0),
                     default=row["dflt_value"],
-                    primary_key=(row["pk"] == 1),
+                    # Note: primary_key info not needed - 'id' is always the primary key
                     foreign_key=foreign_key,
                 )
                 columns.append(column)
@@ -339,7 +340,8 @@ class TableManager:
         for col in source.columns:
             col_def = f"{col.name} {col.type}"
 
-            if col.primary_key:
+            # id column is always the primary key
+            if col.name == "id":
                 col_def += " PRIMARY KEY"
             if not col.nullable:
                 col_def += " NOT NULL"