sql-metadata 2.18.0__tar.gz → 2.20.0__tar.gz

{sql_metadata-2.18.0 → sql_metadata-2.20.0}/PKG-INFO

@@ -1,15 +1,14 @@
 Metadata-Version: 2.4
 Name: sql_metadata
-Version: 2.18.0
+Version: 2.20.0
 Summary: Uses tokenized query returned by python-sqlparse and generates query metadata
 License: MIT
 License-File: LICENSE
 Author: Maciej Brencz
 Author-email: maciej.brencz@gmail.com
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{sql_metadata-2.18.0 → sql_metadata-2.20.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sql_metadata"
-version = "2.18.0"
+version = "2.20.0"
 license="MIT"
 description = "Uses tokenized query returned by python-sqlparse and generates query metadata"
 authors = ["Maciej Brencz <maciej.brencz@gmail.com>", "Radosław Drążkiewicz <collerek@gmail.com>"]
@@ -13,11 +13,11 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.10"
 sqlparse = ">=0.4.1,<0.6.0"
 
 [tool.poetry.dev-dependencies]
-black = "^25.9"
+black = "^25.11"
 coverage = {extras = ["toml"], version = "^7.10"}
 pylint = "^3.3.9"
 pytest = "^8.4.2"

{sql_metadata-2.18.0 → sql_metadata-2.20.0}/sql_metadata/keywords_lists.py

@@ -33,6 +33,7 @@ TABLE_ADJUSTMENT_KEYWORDS = {
     "INTO",
     "UPDATE",
     "TABLE",
+    "IFNOTEXISTS",
 }
 
 # next statement beginning after with statement

{sql_metadata-2.18.0 → sql_metadata-2.20.0}/sql_metadata/parser.py

@@ -447,7 +447,7 @@ class Parser:  # pylint: disable=R0902
         return self._table_aliases
 
     @property
-    def with_names(self) -> List[str]:
+    def with_names(self) -> List[str]:  # noqa: C901
         """
         Returns with statements aliases list from a given query
 
@@ -474,6 +474,12 @@ class Parser:  # pylint: disable=R0902
                         )
                         if is_end_of_with_block:
                             self._is_in_with_block = False
+                        elif token.next_token and token.next_token.is_as_keyword:
+                            # Malformed SQL like "... AS (...) AS ..."
+                            raise ValueError("This query is wrong")
+                        else:
+                            # Advance token to prevent infinite loop
+                            token = token.next_token
                     else:
                         token = token.next_token
 
@@ -676,7 +682,7 @@ class Parser:  # pylint: disable=R0902
             # like: with (col1, col2) as (subquery) as ..., it enters an infinite loop.
             # return exception
             if start_token.is_with_query_start:
-                raise ValueError("This query is wrong")
+                raise ValueError("This query is wrong")  # pragma: no cover
             start_token.is_with_columns_start = True
             start_token.is_nested_function_start = False
             prev_token = start_token.previous_token
@@ -1005,6 +1011,7 @@ class Parser:  # pylint: disable=R0902
                     and self._open_parentheses[-1].is_partition_clause_start
                 )
                 and not (token.normalized == "USING" and last_keyword == "SELECT")
+                and not (token.normalized == "IFNOTEXISTS")
             ):
                 last_keyword = token.normalized
         return last_keyword

{sql_metadata-2.18.0 → sql_metadata-2.20.0}/sql_metadata/token.py

@@ -176,7 +176,7 @@ class SQLToken:  # pylint: disable=R0902, R0904
             self.is_keyword
             and self.normalized not in RELEVANT_KEYWORDS
             and self.previous_token.normalized in [",", "SELECT"]
-            and self.next_token.normalized in [",", "AS"]
+            and self.next_token.normalized in [",", "AS", "FROM"]
         )
 
     @property
@@ -262,7 +262,8 @@ class SQLToken:  # pylint: disable=R0902, R0904
             (self.is_name or self.is_keyword)
             and self.last_keyword_normalized in TABLE_ADJUSTMENT_KEYWORDS
             and self.previous_token.normalized not in ["AS", "WITH"]
-            and self.normalized not in ["AS", "SELECT", "IF", "SET", "WITH"]
+            and self.normalized
+            not in ["AS", "SELECT", "IF", "SET", "WITH", "IFNOTEXISTS"]
         )
 
     @property
@@ -288,7 +289,7 @@ class SQLToken:  # pylint: disable=R0902, R0904
         is_alias_without_as = (
             self.previous_token.normalized != self.last_keyword_normalized
             and not self.previous_token.is_punctuation
-            and not self.previous_token.normalized == "EXISTS"
+            and not self.previous_token.normalized == "IFNOTEXISTS"
         )
         return is_alias_without_as or self.previous_token.is_right_parenthesis