Improve support for WHERE-clauses

CHANGELOG.md

@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+0.4.1
+-----
+ - Increased support for WHERE-clauses:
+   1. Nested clauses
+   2. OR-clauses
+   3. Functions: attribute_type, IF (NOT) MISSING, comparison operators (<, >)
+
 0.4.0
 -----
  - The DynamoDBStatementParser now expects a document in the DynamoDB format:

py_partiql_parser/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 
 
 from ._internal.parser import DynamoDBStatementParser, S3SelectParser  # noqa

py_partiql_parser/_internal/parser.py

@@ -101,4 +101,4 @@ def get_query_metadata(cls, query: str):
         else:
             where = None
 
-        return QueryMetadata(tables=from_clauses, where_clauses=where)
+        return QueryMetadata(tables=from_clauses, where_clause=where)

py_partiql_parser/_internal/utils.py

@@ -2,7 +2,10 @@
 
 from .case_insensitive_dict import CaseInsensitiveDict
 from .json_parser import MissingVariable, Variable
-from typing import Any, Dict, List, Tuple, Union
+from typing import Any, Dict, List, Optional, Union, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .where_parser import AbstractWhereClause
 
 
 def is_dict(dct):
@@ -134,13 +137,17 @@ def find_value_in_dynamodb_document(keys: List[str], json_doc):
 
 class QueryMetadata:
     def __init__(
-        self, tables: Dict[str, str], where_clauses: List[Tuple[List[str], str]] = None
+        self,
+        tables: Dict[str, str],
+        where_clause: Optional["AbstractWhereClause"] = None,
     ):
         self._tables = tables
-        self._where_clauses = where_clauses or []
+        self._where_clause = where_clause
 
     def get_table_names(self) -> List[str]:
         return list(self._tables.values())
 
     def get_filter_names(self) -> List[str]:
-        return [".".join(keys) for keys, _ in self._where_clauses]
+        if self._where_clause:
+            return self._where_clause.get_filter_names()
+        return []