RDBC-700 Misc

Author: poissoncorp

ravendb/documents/session/tokens/query_tokens/definitions.py

@@ -368,7 +368,7 @@ def write_to(self, writer: List[str]):
 
 
 class GroupBySumToken(QueryToken):
-    def __init__(self, field_name: str, praojected_name: str):
+    def __init__(self, field_name: str, projected_name: str):
         if field_name is None:
             raise ValueError("field_name cannot be None")
 

ravendb/documents/session/tokens/query_tokens/query_token.py

@@ -10,7 +10,7 @@ def write_to(self, writer: List[str]) -> None:
         raise NotImplementedError("Error : write_to is not implemented")
 
     def write_field(self, writer: List[str], field: str):
-        key_word = field in self.RQL_KEYWORDS
+        key_word = self.is_keyword(field)
         if key_word:
             writer.append("'")
         writer.append(field)

ravendb/documents/subscriptions/document_subscriptions.py

@@ -2,6 +2,7 @@
 from typing import Optional, Type, TypeVar, Dict, List, TYPE_CHECKING
 
 from ravendb.documents.operations.ongoing_tasks import ToggleOngoingTaskStateOperation, OngoingTaskType
+from ravendb.documents.session.tokens.query_tokens.query_token import QueryToken
 from ravendb.documents.session.utils.includes_util import IncludesUtil
 from ravendb.documents.commands.subscriptions import (
     CreateSubscriptionCommand,
@@ -111,7 +112,7 @@ def ensure_criteria(self, criteria: SubscriptionCreationOptions, object_type: Ty
                         query_builder.append(escaped_include)
                         query_builder.append("'")
                     else:
-                        query_builder.append(include)
+                        query_builder.append(f"'{include}'" if QueryToken.is_keyword(include) else include)
 
                     number_of_includes_added += 1
             # todo: uncomment on Counters and TimeSeries development