MindsDB 25.9.2.0a1__py3-none-any.whl → 25.10.0__py3-none-any.whl

mindsdb/utilities/render/sqlalchemy_render.py

@@ -10,6 +10,7 @@ from sqlalchemy.dialects import mysql, postgresql, sqlite, mssql, oracle
 from sqlalchemy.schema import CreateTable, DropTable
 from sqlalchemy.sql import ColumnElement
 from sqlalchemy.sql import functions as sa_fnc
+from sqlalchemy.engine.interfaces import Dialect
 
 from mindsdb_sql_parser import ast
 
@@ -80,27 +81,27 @@ def get_is_quoted(identifier: ast.Identifier):
     return quoted
 
 
-class SqlalchemyRender:
-    def __init__(self, dialect_name):
-        dialects = {
-            "mysql": mysql,
-            "postgresql": postgresql,
-            "postgres": postgresql,
-            "sqlite": sqlite,
-            "mssql": mssql,
-            "oracle": oracle,
-            "Snowflake": oracle,
-        }
+dialects = {
+    "mysql": mysql,
+    "postgresql": postgresql,
+    "postgres": postgresql,
+    "sqlite": sqlite,
+    "mssql": mssql,
+    "oracle": oracle,
+}
+
 
+class SqlalchemyRender:
+    def __init__(self, dialect_name: str | Dialect):
         if isinstance(dialect_name, str):
             dialect = dialects[dialect_name].dialect
         else:
             dialect = dialect_name
 
         # override dialect's preparer
-        if hasattr(dialect, "preparer"):
+        if hasattr(dialect, "preparer") and dialect.preparer.__name__ != "MDBPreparer":
 
-            class Preparer(dialect.preparer):
+            class MDBPreparer(dialect.preparer):
                 def _requires_quotes(self, value: str) -> bool:
                     # check force-quote flag
                     if isinstance(value, AttributedStr):
@@ -116,7 +117,7 @@ class SqlalchemyRender:
                         # or (lc_value != value)
                     )
 
-            dialect.preparer = Preparer
+            dialect.preparer = MDBPreparer
 
         # remove double percent signs
         # https://docs.sqlalchemy.org/en/14/faq/sqlexpressions.html#why-are-percent-signs-being-doubled-up-when-stringifying-sql-statements
@@ -383,7 +384,7 @@ class SqlalchemyRender:
         elif isinstance(t, ast.Parameter):
             col = sa.column(t.value, is_literal=True)
             if t.alias:
-                raise RenderError()
+                raise RenderError("Parameter aliases are not supported in the renderer")
         elif isinstance(t, ast.Tuple):
             col = [self.to_expression(i) for i in t.items]
         elif isinstance(t, ast.Variable):
@@ -574,17 +575,18 @@ class SqlalchemyRender:
                         else:
                             condition = self.to_expression(item["condition"])
 
-                        if "ASOF" in join_type:
+                        if "ASOF" in join_type or "RIGHT" in join_type:
                             raise NotImplementedError(f"Unsupported join type: {join_type}")
-                        method = "join"
+
                         is_full = False
-                        if join_type == "LEFT JOIN":
-                            method = "outerjoin"
+                        is_outer = False
+                        if join_type in ("LEFT JOIN", "LEFT OUTER JOIN"):
+                            is_outer = True
                         if join_type == "FULL JOIN":
                             is_full = True
 
                         # perform join
-                        query = getattr(query, method)(table, condition, full=is_full)
+                        query = query.join(table, condition, isouter=is_outer, full=is_full)
             elif isinstance(from_table, (ast.Union, ast.Intersect, ast.Except)):
                 alias = None
                 if from_table.alias:

mindsdb/utilities/starters.py

@@ -18,16 +18,6 @@ def start_mysql(*args, **kwargs):
     start(*args, **kwargs)
 
 
-def start_postgres(*args, **kwargs):
-    from mindsdb.utilities.log import initialize_logging
-
-    initialize_logging("postgres")
-
-    from mindsdb.api.postgres.start import start
-
-    start(*args, **kwargs)
-
-
 def start_tasks(*args, **kwargs):
     from mindsdb.utilities.log import initialize_logging
 

mindsdb/utilities/utils.py

@@ -22,13 +22,13 @@ def parse_csv_attributes(csv_attributes: typing.Optional[str] = "") -> typing.Di
         for row in reader:
             for pair in row:
                 # Match key=value pattern
-                match = re.match(r'^\s*([^=]+?)\s*=\s*(.+?)\s*$', pair)
+                match = re.match(r"^\s*([^=]+?)\s*=\s*(.+?)\s*$", pair)
                 if match:
                     key, value = match.groups()
                     attributes[key.strip()] = value.strip()
                 else:
                     raise ValueError(f"Invalid attribute format: {pair}")
     except Exception as e:
-        raise ValueError(f"Failed to parse csv_attributes='{csv_attributes}': {e}")
+        raise ValueError(f"Failed to parse csv_attributes='{csv_attributes}': {e}") from e
 
     return attributes