fix: update remaining private calls

Author: cofin

sqlspec/_sql.py

@@ -724,16 +724,15 @@ def raw(sql_fragment: str, **parameters: Any) -> "Union[exp.Expression, SQL]":
         if not parameters:
             try:
                 parsed: exp.Expression = exp.maybe_parse(sql_fragment)
-                return parsed
             except Exception as e:
                 msg = f"Failed to parse raw SQL fragment '{sql_fragment}': {e}"
                 raise SQLBuilderError(msg) from e
+            return parsed
 
         return SQL(sql_fragment, parameters)
 
-    @staticmethod
     def count(
-        column: Union[str, exp.Expression, "ExpressionWrapper", "Case", "Column"] = "*", distinct: bool = False
+        self, column: Union[str, exp.Expression, "ExpressionWrapper", "Case", "Column"] = "*", distinct: bool = False
     ) -> AggregateExpression:
         """Create a COUNT expression.
 
@@ -747,7 +746,7 @@ def count(
         if isinstance(column, str) and column == "*":
             expr = exp.Count(this=exp.Star(), distinct=distinct)
         else:
-            col_expr = SQLFactory._extract_expression(column)
+            col_expr = self._extract_expression(column)
             expr = exp.Count(this=col_expr, distinct=distinct)
         return AggregateExpression(expr)
 

sqlspec/adapters/adbc/driver.py

@@ -521,9 +521,7 @@ def _execute_many(self, cursor: "Cursor", statement: SQL) -> "ExecutionResult":
 
         try:
             if not prepared_parameters:
-                # TODO: Replace with proper cursor protocol method
-                if hasattr(cursor, "_rowcount"):
-                    cursor._rowcount = 0
+                cursor._rowcount = 0  # pyright: ignore[reportPrivateUsage]
                 row_count = 0
             elif isinstance(prepared_parameters, list) and prepared_parameters:
                 processed_params = []

sqlspec/adapters/psycopg/config.py

@@ -173,8 +173,7 @@ def _close_pool(self) -> None:
         logger.info("Closing Psycopg connection pool", extra={"adapter": "psycopg"})
 
         try:
-            if hasattr(self.pool_instance, "_closed"):
-                self.pool_instance._closed = True
+            self.pool_instance._closed = True  # pyright: ignore[reportPrivateUsage]
 
             self.pool_instance.close()
             logger.info("Psycopg connection pool closed successfully", extra={"adapter": "psycopg"})
@@ -350,8 +349,7 @@ async def _close_pool(self) -> None:
             return
 
         try:
-            if hasattr(self.pool_instance, "_closed"):
-                self.pool_instance._closed = True
+            self.pool_instance._closed = True  # pyright: ignore[reportPrivateUsage]
 
             await self.pool_instance.close()
         finally:

sqlspec/builder/_parsing_utils.py

@@ -18,6 +18,27 @@
 )
 
 
+def extract_column_name(column: Union[str, exp.Column]) -> str:
+    """Extract column name from column expression for parameter naming.
+
+    Args:
+        column: Column expression (string or SQLGlot Column)
+
+    Returns:
+        Column name as string for use as parameter name
+    """
+    if isinstance(column, str):
+        if "." in column:
+            return column.split(".")[-1]
+        return column
+    if isinstance(column, exp.Column):
+        try:
+            return str(column.this.this)
+        except AttributeError:
+            return str(column.this) if column.this else "column"
+    return "column"
+
+
 def parse_column_expression(
     column_input: Union[str, exp.Expression, Any], builder: Optional[Any] = None
 ) -> exp.Expression:
@@ -139,9 +160,7 @@ def parse_condition_expression(
         if value is None:
             return exp.Is(this=column_expr, expression=exp.null())
         if builder and has_parameter_builder(builder):
-            from sqlspec.builder.mixins._where_clause import _extract_column_name
-
-            column_name = _extract_column_name(column)
+            column_name = extract_column_name(column)
             param_name = builder.generate_unique_parameter_name(column_name)
             _, param_name = builder.add_parameter(value, name=param_name)
             return exp.EQ(this=column_expr, expression=exp.Placeholder(this=param_name))

sqlspec/builder/_update.py

@@ -131,7 +131,7 @@ def join(
             subquery_exp = exp.paren(exp.maybe_parse(subquery.sql, dialect=self.dialect))
             table_expr = exp.alias_(subquery_exp, alias) if alias else subquery_exp
 
-            subquery_parameters = table._parameters
+            subquery_parameters = table.parameters
             if subquery_parameters:
                 for p_name, p_value in subquery_parameters.items():
                     self.add_parameter(p_value, name=p_name)

sqlspec/builder/mixins/_cte_and_set_ops.py

@@ -1,3 +1,4 @@
+# pyright: reportPrivateUsage=false
 """CTE and set operation mixins.
 
 Provides mixins for Common Table Expressions (WITH clause) and

sqlspec/builder/mixins/_delete_operations.py

@@ -1,3 +1,4 @@
+# pyright: reportPrivateUsage=false
 """DELETE operation mixins.
 
 Provides mixins for DELETE statement functionality including

sqlspec/builder/mixins/_insert_operations.py

@@ -1,3 +1,4 @@
+# pyright: reportPrivateUsage=false
 """INSERT operation mixins.
 
 Provides mixins for INSERT statement functionality including
@@ -137,8 +138,8 @@ def values(self, *values: Any, **kwargs: Any) -> Self:
                 msg = "Cannot mix positional values with keyword values."
                 raise SQLBuilderError(msg)
             try:
-                _columns = self._columns
-                if not _columns:
+                cols = self._columns
+                if not cols:
                     self.columns(*kwargs.keys())
             except AttributeError:
                 pass
@@ -156,8 +157,8 @@ def values(self, *values: Any, **kwargs: Any) -> Self:
         elif len(values) == 1 and hasattr(values[0], "items"):
             mapping = values[0]
             try:
-                _columns = self._columns
-                if not _columns:
+                cols = self._columns
+                if not cols:
                     self.columns(*mapping.keys())
             except AttributeError:
                 pass
@@ -174,9 +175,9 @@ def values(self, *values: Any, **kwargs: Any) -> Self:
                     row_exprs.append(exp.Placeholder(this=param_name))
         else:
             try:
-                _columns = self._columns
-                if _columns and len(values) != len(_columns):
-                    msg = f"Number of values ({len(values)}) does not match the number of specified columns ({len(_columns)})."
+                cols = self._columns
+                if cols and len(values) != len(cols):
+                    msg = f"Number of values ({len(values)}) does not match the number of specified columns ({len(cols)})."
                     raise SQLBuilderError(msg)
             except AttributeError:
                 pass
@@ -186,11 +187,9 @@ def values(self, *values: Any, **kwargs: Any) -> Self:
                     row_exprs.append(v)
                 else:
                     try:
-                        _columns = self._columns
-                        if _columns and i < len(_columns):
-                            column_name = (
-                                str(_columns[i]).split(".")[-1] if "." in str(_columns[i]) else str(_columns[i])
-                            )
+                        cols = self._columns
+                        if cols and i < len(cols):
+                            column_name = str(cols[i]).split(".")[-1] if "." in str(cols[i]) else str(cols[i])
                             param_name = self._generate_unique_parameter_name(column_name)
                         else:
                             param_name = self._generate_unique_parameter_name(f"value_{i + 1}")

sqlspec/builder/mixins/_join_operations.py

@@ -1,3 +1,4 @@
+# pyright: reportPrivateUsage=false
 """JOIN operation mixins.
 
 Provides mixins for JOIN operations in SELECT statements.

sqlspec/builder/mixins/_merge_operations.py

@@ -1,3 +1,4 @@
+# pyright: reportPrivateUsage=false
 """MERGE operation mixins.
 
 Provides mixins for MERGE statement functionality including INTO,