Fix the code smell reported by SQ

Author: passren

pydynamodb/sql/dml_sql.py

@@ -135,14 +135,14 @@ def __escape_column(self, token: Any) -> str:
 
     def __init__(self, statement: str) -> None:
         super().__init__(statement)
-        self._where_conditions = []
+        self._parsed_where_conditions = []
         self._limit = None
         self._consistent_read = False
         self._return_consumed_capacity = "NONE"
 
     @property
     def where_conditions(self) -> List[Optional[str]]:
-        return self._where_conditions
+        return self._parsed_where_conditions
 
     @property
     def limit(self) -> int:
@@ -166,18 +166,18 @@ def transform(self) -> Dict[str, Any]:
     def _construct_where_conditions(self, where_conditions: List[Any]) -> str:
         for condition in where_conditions:
             if not isinstance(condition, ParseResults):
-                self._where_conditions.append(str(condition))
+                self._parsed_where_conditions.append(str(condition))
             else:
                 function_ = condition.get("function", None)
                 function_with_op_ = condition.get("function_with_op", None)
                 if function_:
                     flatted_func_params = ",".join(condition["function_params"])
-                    self._where_conditions.append(
+                    self._parsed_where_conditions.append(
                         "%s(%s)" % (function_, flatted_func_params)
                     )
                 elif function_with_op_:
                     flatted_func_params = ",".join(condition["function_params"])
-                    self._where_conditions.append(
+                    self._parsed_where_conditions.append(
                         "%s(%s) %s %s"
                         % (
                             function_with_op_,
@@ -191,7 +191,7 @@ def _construct_where_conditions(self, where_conditions: List[Any]) -> str:
                     flatted_where = " ".join(
                         str(c) for c in flatten_list(where_conditions_)
                     )
-                    self._where_conditions.append(flatted_where)
+                    self._parsed_where_conditions.append(flatted_where)
 
         return "WHERE %s" % " ".join(self.where_conditions)
 

pydynamodb/sql/json_parser.py

@@ -9,31 +9,6 @@
 #   members optional in array and object collections
 #
 # Updated 9 Aug 2016 - use more current pyparsing constructs/idioms
-#
-'''
-json_bnf = """
-object
-    { members }
-    {}
-members
-    string : value
-    members , string : value
-array
-    [ elements ]
-    []
-elements
-    value
-    elements , value
-value
-    string
-    number
-    object
-    array
-    true
-    false
-    null
-"""
-'''
 
 import pyparsing as pp
 from pyparsing import pyparsing_common as ppc
@@ -61,11 +36,6 @@ def make_keyword(kwd_str, kwd_value):
 jsonValue = pp.Forward().set_name("jsonValue")
 
 jsonElements = pp.DelimitedList(jsonValue).set_name(None)
-# jsonArray = pp.Group(LBRACK + pp.Optional(jsonElements, []) + RBRACK)
-# jsonValue << (
-#     jsonString | jsonNumber | pp.Group(jsonObject) | jsonArray | TRUE | FALSE | NULL
-# )
-# memberDef = pp.Group(jsonString + COLON + jsonValue).set_name("jsonMember")
 
 jsonArray = pp.Group(
     LBRACK + pp.Optional(jsonElements) + RBRACK, aslist=RETURN_PYTHON_COLLECTIONS

pydynamodb/sql/parser.py

@@ -12,7 +12,7 @@
 from .dml_update import DmlUpdate
 from .dml_delete import DmlDelete
 from .util_sql import UtilListTables, UtilDescTable
-from typing import Any, Dict, Tuple
+from typing import Any, Dict, Tuple, Type, Optional
 
 _logger = logging.getLogger(__name__)  # type: ignore
 
@@ -71,8 +71,8 @@ def parser(self) -> Base:
 
         return self._parser
 
-    def _get_parse_class(self) -> Base:
-        _parse_class = None
+    def _get_parse_class(self) -> Optional[Type[Base]]:
+        _parse_class: Optional[Type[Base]] = None
         if (
             self.query_type == QueryType.CREATE
             or self.query_type == QueryType.CREATE_GLOBAL