diff --git a/changelog.md b/changelog.md index ca7e5805..06bfe701 100644 --- a/changelog.md +++ b/changelog.md @@ -6,6 +6,11 @@ Features * Add a `--batch` option as an alternative to STDIN. +Bug Fixes +--------- +* Revert suppression of warnings when `sqlglotrs` is installed (fixed upstream). + + Internal -------- * Harden `codex-review` workflow against script injection from untrusted PR metadata. diff --git a/mycli/main.py b/mycli/main.py index 9cc16b47..4147c477 100755 --- a/mycli/main.py +++ b/mycli/main.py @@ -26,7 +26,6 @@ from textwrap import dedent from time import sleep, time from urllib.parse import parse_qs, unquote, urlparse -import warnings from cli_helpers.tabular_output import TabularOutputFormatter, preprocessors from cli_helpers.tabular_output.output_formatter import MISSING_VALUE as DEFAULT_MISSING_VALUE @@ -59,18 +58,9 @@ from pymysql.constants.CR import CR_SERVER_LOST from pymysql.constants.ER import ACCESS_DENIED_ERROR, HANDSHAKE_ERROR from pymysql.cursors import Cursor +import sqlglot import sqlparse -with warnings.catch_warnings(): - # for sqlglot v29.0.1 - warnings.filterwarnings( - 'ignore', - message=r'sqlglot\[rs\] is deprecated', - category=UserWarning, - module='sqlglot', - ) - import sqlglot - from mycli import __version__ from mycli.clibuffer import cli_is_multiline from mycli.clistyle import style_factory_helpers, style_factory_toolkit diff --git a/mycli/packages/hybrid_redirection.py b/mycli/packages/hybrid_redirection.py index 238d0918..1937daf9 100644 --- a/mycli/packages/hybrid_redirection.py +++ b/mycli/packages/hybrid_redirection.py @@ -1,16 +1,7 @@ import functools import logging -import warnings - -with warnings.catch_warnings(): - # for sqlglot v29.0.1 - warnings.filterwarnings( - 'ignore', - message=r'sqlglot\[rs\] is deprecated', - category=UserWarning, - module='sqlglot', - ) - import sqlglot + +import sqlglot from mycli.compat import WIN from mycli.packages.special.delimitercommand import DelimiterCommand diff --git a/mycli/packages/parseutils.py b/mycli/packages/parseutils.py index b1f9eb78..7a2b341f 100644 --- a/mycli/packages/parseutils.py +++ b/mycli/packages/parseutils.py @@ -2,22 +2,12 @@ import re from typing import Any, Generator, Literal -import warnings +import sqlglot import sqlparse from sqlparse.sql import Function, Identifier, IdentifierList, Token, TokenList from sqlparse.tokens import DML, Keyword, Punctuation -with warnings.catch_warnings(): - # for sqlglot v29.0.1 - warnings.filterwarnings( - 'ignore', - message=r'sqlglot\[rs\] is deprecated', - category=UserWarning, - module='sqlglot', - ) - import sqlglot - sqlparse.engine.grouping.MAX_GROUPING_DEPTH = None # type: ignore[assignment] sqlparse.engine.grouping.MAX_GROUPING_TOKENS = None # type: ignore[assignment]