read_sql, read_sql_query

Author: cmp0xff

pandas-stubs/__init__.pyi

@@ -123,6 +123,8 @@ from pandas.io.api import (
     read_pickle as read_pickle,
     read_sas as read_sas,
     read_spss as read_spss,
+    read_sql as read_sql,
+    read_sql_query as read_sql_query,
     read_sql_table as read_sql_table,
     read_stata as read_stata,
     read_table as read_table,
@@ -134,12 +136,6 @@ from pandas.io.api import (
 from pandas.io.api import (
     read_orc as read_orc,  # pyright: ignore[reportUnknownVariableType]
 )
-from pandas.io.api import (
-    read_sql as read_sql,  # pyright: ignore[reportUnknownVariableType]
-)
-from pandas.io.api import (
-    read_sql_query as read_sql_query,  # pyright: ignore[reportUnknownVariableType]
-)
 from pandas.io.json._normalize import (
     json_normalize as json_normalize,  # pyright: ignore[reportUnknownVariableType]
 )

pandas-stubs/io/api.pyi

@@ -28,12 +28,8 @@ from pandas.io.pytables import (
 from pandas.io.sas import read_sas as read_sas
 from pandas.io.spss import read_spss as read_spss
 from pandas.io.sql import (
-    read_sql as read_sql,  # pyright: ignore[reportUnknownVariableType]
-)
-from pandas.io.sql import (
-    read_sql_query as read_sql_query,  # pyright: ignore[reportUnknownVariableType]
-)
-from pandas.io.sql import (
+    read_sql as read_sql,
+    read_sql_query as read_sql_query,
     read_sql_table as read_sql_table,
 )
 from pandas.io.stata import read_stata as read_stata

pandas-stubs/io/parquet.pyi

@@ -1,6 +1,6 @@
+from collections.abc import Sequence
 from typing import (
     Any,
-    Literal,
     TypeAlias,
 )
 
@@ -14,8 +14,7 @@ from pandas._typing import (
     StorageOptions,
 )
 
-_OP: TypeAlias = Literal["==", "=", ">", ">=", "<", "<=", "!=", "in", "not in"]
-_FILTER: TypeAlias = tuple[str, _OP, Any]
+_Filter: TypeAlias = tuple[str, str, Any]
 
 def read_parquet(
     path: FilePath | ReadBuffer[bytes],
@@ -24,6 +23,6 @@ def read_parquet(
     storage_options: StorageOptions = None,
     dtype_backend: DtypeBackend = "numpy_nullable",
     filesystem: Any = None,
-    filters: list[_FILTER] | list[list[_FILTER]] | None = None,
+    filters: Sequence[_Filter] | Sequence[Sequence[_Filter]] | None = None,
     **kwargs: Any,
 ) -> DataFrame: ...

pandas-stubs/io/sql.pyi

@@ -33,7 +33,7 @@ _SQLStatement: TypeAlias = (
     str
     | sqlalchemy.sql.expression.Selectable
     | sqlalchemy.sql.expression.TextClause
-    | sqlalchemy.sql.Select
+    | sqlalchemy.sql.Select[Any]
     | FromStatement[Any]
     | sqlalchemy.sql.expression.UpdateBase
 )

tests/test_io.py

@@ -48,9 +48,9 @@
 from pandas.io.excel._base import (
     read_excel,  # pyright: ignore[reportUnknownVariableType]
 )
-from pandas.io.html import read_html  # pyright: ignore[reportUnknownVariableType]
+from pandas.io.html import read_html
 from pandas.io.orc import read_orc  # pyright: ignore[reportUnknownVariableType]
-from pandas.io.parquet import read_parquet  # pyright: ignore[reportUnknownVariableType]
+from pandas.io.parquet import read_parquet
 from pandas.io.parsers import TextFileReader
 from pandas.io.parsers.readers import (
     read_csv,
@@ -62,8 +62,10 @@
 )
 from pandas.io.sas.sas7bdat import SAS7BDATReader
 from pandas.io.sas.sas_xport import XportReader
-from pandas.io.sql import read_sql  # pyright: ignore[reportUnknownVariableType]
-from pandas.io.sql import read_sql_query  # pyright: ignore[reportUnknownVariableType]
+from pandas.io.sql import (
+    read_sql,
+    read_sql_query,
+)
 from pandas.io.stata import StataReader
 from pandas.io.xml import read_xml