From: Nick Crews Date: Wed, 10 May 2023 17:40:30 +0000 (-0800) Subject: fixup: format with pre-commit X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41bf05ce6b7d58bebefaa9320c7dec31c70f6868;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git fixup: format with pre-commit --- diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py index da30e7edc2..b12e7adaf5 100644 --- a/lib/sqlalchemy/__init__.py +++ b/lib/sqlalchemy/__init__.py @@ -99,8 +99,6 @@ from .sql.expression import Case as Case from .sql.expression import case as case from .sql.expression import Cast as Cast from .sql.expression import cast as cast -from .sql.expression import TryCast as TryCast -from .sql.expression import try_cast as try_cast from .sql.expression import ClauseElement as ClauseElement from .sql.expression import ClauseList as ClauseList from .sql.expression import collate as collate @@ -201,6 +199,8 @@ from .sql.expression import TextClause as TextClause from .sql.expression import TextualSelect as TextualSelect from .sql.expression import true as true from .sql.expression import True_ as True_ +from .sql.expression import try_cast as try_cast +from .sql.expression import TryCast as TryCast from .sql.expression import Tuple as Tuple from .sql.expression import tuple_ as tuple_ from .sql.expression import type_coerce as type_coerce diff --git a/lib/sqlalchemy/dialects/mssql/__init__.py b/lib/sqlalchemy/dialects/mssql/__init__.py index 997896a504..e54b5bc22f 100644 --- a/lib/sqlalchemy/dialects/mssql/__init__.py +++ b/lib/sqlalchemy/dialects/mssql/__init__.py @@ -6,7 +6,6 @@ # the MIT License: https://www.opensource.org/licenses/mit-license.php # mypy: ignore-errors -from ...sql._elements_constructors import try_cast from . import base # noqa from . import pymssql # noqa from . import pyodbc # noqa @@ -43,6 +42,7 @@ from .base import UNIQUEIDENTIFIER from .base import VARBINARY from .base import VARCHAR from .base import XML +from ...sql._elements_constructors import try_cast base.dialect = dialect = pyodbc.dialect diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index 1f3a68a240..acab87f2b9 100644 --- a/lib/sqlalchemy/dialects/mssql/base.py +++ b/lib/sqlalchemy/dialects/mssql/base.py @@ -939,10 +939,10 @@ from ...sql import quoted_name from ...sql import roles from ...sql import sqltypes from ...sql import util as sql_util -from ...sql._elements_constructors import try_cast as try_cast +from ...sql._elements_constructors import try_cast as try_cast # noqa: F401 from ...sql._typing import is_sql_compiler from ...sql.compiler import InsertmanyvaluesSentinelOpts -from ...sql.elements import TryCast as TryCast +from ...sql.elements import TryCast as TryCast # noqa: F401 from ...types import BIGINT from ...types import BINARY from ...types import CHAR diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py index c70bac4772..66081d1b23 100644 --- a/lib/sqlalchemy/sql/elements.py +++ b/lib/sqlalchemy/sql/elements.py @@ -3414,7 +3414,6 @@ class Cast(WrapsColumnExpression[_T]): return self.clause - class TryCast(Cast): """Represent a TRY_CAST expression. diff --git a/test/sql/test_compiler.py b/test/sql/test_compiler.py index ee9388a213..b216ba9ab7 100644 --- a/test/sql/test_compiler.py +++ b/test/sql/test_compiler.py @@ -57,9 +57,9 @@ from sqlalchemy import Table from sqlalchemy import testing from sqlalchemy import Text from sqlalchemy import text -from sqlalchemy import try_cast from sqlalchemy import TIMESTAMP from sqlalchemy import true +from sqlalchemy import try_cast from sqlalchemy import tuple_ from sqlalchemy import type_coerce from sqlalchemy import types