RDBC-700 Misc

poissoncorp · poissoncorp · commit 215f965dd224 · 2023-05-17T15:03:41.000+02:00
diff --git a/ravendb/__init__.py b/ravendb/__init__.py
@@ -177,7 +177,9 @@
 from ravendb.documents.session.document_info import DocumentInfo
 from ravendb.documents.session.document_session import DocumentSession
 from ravendb.documents.session.entity_to_json import EntityToJson
-from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+    InMemoryDocumentSessionOperations,
+)
 from ravendb.documents.session.loaders.include import IncludeBuilder, IncludeBuilderBase, QueryIncludeBuilder
 from ravendb.documents.session.loaders.loaders import (
     LoaderWithInclude,
diff --git a/ravendb/documents/commands/batches.py b/ravendb/documents/commands/batches.py
@@ -23,7 +23,9 @@
 if TYPE_CHECKING:
     from ravendb.documents.conventions import DocumentConventions
     from ravendb.documents.operations.patch import PatchRequest
-    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+        InMemoryDocumentSessionOperations,
+    )
 
 
 class CommandType(Enum):
diff --git a/ravendb/documents/operations/batch.py b/ravendb/documents/operations/batch.py
@@ -12,7 +12,9 @@
 from ravendb.tools.utils import CaseInsensitiveDict
 
 if TYPE_CHECKING:
-    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+        InMemoryDocumentSessionOperations,
+    )
 
 
 class BatchOperation:
diff --git a/ravendb/documents/operations/compare_exchange/compare_exchange.py b/ravendb/documents/operations/compare_exchange/compare_exchange.py
@@ -165,9 +165,7 @@ def get_command(
                     metadata = self.prepare_metadata_for_put(self._key, self.__value.metadata, conventions)
                 else:
                     self.validate_metadata_for_put(self._key, self.__value.metadata)
-                    metadata_has_changed = _update_metadata_modifications(
-                        self.__value.metadata, metadata
-                    )
+                    metadata_has_changed = _update_metadata_modifications(self.__value.metadata, metadata)
 
             entity_to_insert = None
             if not entity_json or metadata_has_changed:
diff --git a/ravendb/documents/operations/executor.py b/ravendb/documents/operations/executor.py
@@ -14,7 +14,9 @@
 from ravendb.serverwide.server_operation_executor import ServerOperationExecutor
 
 if TYPE_CHECKING:
-    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+        InMemoryDocumentSessionOperations,
+    )
     from ravendb.http.request_executor import RequestExecutor
     from ravendb.documents import DocumentStore
 
diff --git a/ravendb/documents/session/cluster_transaction_operation.py b/ravendb/documents/session/cluster_transaction_operation.py
@@ -24,7 +24,9 @@
 )
 
 if TYPE_CHECKING:
-    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+        InMemoryDocumentSessionOperations,
+    )
     from ravendb.documents.session.document_session import DocumentSession
     from ravendb import Lazy
 
diff --git a/ravendb/documents/session/document_session.py b/ravendb/documents/session/document_session.py
@@ -30,7 +30,9 @@
     IClusterTransactionOperations,
 )
 from ravendb.documents.session.document_info import DocumentInfo
-from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+    InMemoryDocumentSessionOperations,
+)
 from ravendb.documents.session.loaders.include import IncludeBuilder
 from ravendb.documents.session.loaders.loaders import LoaderWithInclude, MultiLoaderWithInclude
 from ravendb.documents.session.operations.lazy import LazyLoadOperation, LazySessionOperations
diff --git a/ravendb/documents/session/document_session_operations/in_memory_document_session_operations.py b/ravendb/documents/session/document_session_operations/in_memory_document_session_operations.py
@@ -1021,7 +1021,7 @@ def __prepare_for_entities_deletion(
                         result.on_success.remove_document_by_entity(document_info.entity)
                         result.entities.append(document_info.entity)
 
-                    result.on_success.remove_document_by_entity(document_info.key)
+                    result.on_success.remove_document_by_id(document_info.key)
 
                 change_vector = change_vector if self.__use_optimistic_concurrency else None
                 self.before_delete_invoke(BeforeDeleteEventArgs(self, document_info.key, document_info.entity))
@@ -1131,7 +1131,7 @@ def has_changes(self) -> bool:
             if self._entity_changed(document, entity.value, None):
                 return True
 
-        return not len(self._deleted_entities) == 0
+        return not self._deleted_entities or not self._deferred_commands
 
     def _what_changed(self) -> Dict[str, List[DocumentsChanges]]:
         changes = {}
diff --git a/ravendb/documents/session/document_session_operations/misc.py b/ravendb/documents/session/document_session_operations/misc.py
@@ -1,7 +1,7 @@
 import json
 from typing import Dict
 
-from ravendb.json.metadata_as_dictionary import  MetadataAsDictionary
+from ravendb.json.metadata_as_dictionary import MetadataAsDictionary
 from ravendb.tools.utils import Utils
 
 
@@ -14,4 +14,16 @@ def _update_metadata_modifications(metadata_dictionary: MetadataAsDictionary, me
             if value is None or isinstance(value, MetadataAsDictionary) and value.is_dirty is True:
                 dirty = True
             metadata[key] = json.loads(json.dumps(value, default=Utils.json_default))
-    return dirty
+        if len(metadata) != len(metadata_dictionary):
+            # looks like some props were removed
+            to_remove = set()
+
+            fields = metadata.keys()
+            for field in fields:
+                if field not in metadata_dictionary:
+                    to_remove.add(field)
+
+            for s in to_remove:
+                del metadata[s]
+
+    return dirty
diff --git a/ravendb/documents/session/entity_to_json.py b/ravendb/documents/session/entity_to_json.py
@@ -16,7 +16,9 @@
 from ravendb.documents.conventions import DocumentConventions
 
 if TYPE_CHECKING:
-    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+        InMemoryDocumentSessionOperations,
+    )
 
 
 _T = TypeVar("_T")
diff --git a/ravendb/documents/session/event_args.py b/ravendb/documents/session/event_args.py
@@ -6,7 +6,9 @@
 from ravendb.http.topology import Topology
 
 if TYPE_CHECKING:
-    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+        InMemoryDocumentSessionOperations,
+    )
 
 
 class EventArgs:
@@ -260,10 +262,14 @@ def attempt_number(self) -> int:
 
 
 class FailedRequestEventArgs(EventArgs):
-    def __init__(self, database: str, url: str, exception: Exception):
+    def __init__(
+        self, database: str, url: str, exception: Exception, request: requests.Request, response: requests.Response
+    ):
         self.__database = database
         self.__url = url
         self.__exception = exception
+        self.__request = request
+        self.__response = response
 
     @property
     def database(self) -> str:
@@ -277,6 +283,14 @@ def url(self) -> str:
     def exception(self) -> Exception:
         return self.__exception
 
+    @property
+    def request(self) -> requests.Request:
+        return self.__request
+
+    @property
+    def response(self) -> requests.Response:
+        return self.__response
+
 
 class TopologyUpdatedEventArgs(EventArgs):
     def __init__(self, topology: Topology):
diff --git a/ravendb/documents/session/misc.py b/ravendb/documents/session/misc.py
@@ -12,7 +12,9 @@
     from ravendb.http.request_executor import RequestExecutor
     from ravendb.documents.session.query import Query
     from ravendb.documents.session.operations.query import QueryOperation
-    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+        InMemoryDocumentSessionOperations,
+    )
     from ravendb.documents import DocumentStore
 
 
@@ -86,6 +88,9 @@ def __set_context_internal(self, session_key: str) -> None:
         else:
             self.__session_id = int(hashlib.md5(bytes(session_key)).digest().decode("utf-8"))
 
+    def increment_request_count(self) -> None:
+        self.__session.increment_requests_count()
+
 
 class SessionOptions:
     def __init__(
diff --git a/ravendb/documents/session/operations/lazy.py b/ravendb/documents/session/operations/lazy.py
@@ -28,7 +28,9 @@
 
 if TYPE_CHECKING:
     from ravendb.documents.session.operations.query import QueryOperation
-    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+        InMemoryDocumentSessionOperations,
+    )
     from ravendb.documents.session.document_session import DocumentSession
     from ravendb.documents.session.cluster_transaction_operation import (
         ClusterTransactionOperationsBase,
@@ -144,7 +146,7 @@ def create_request(self) -> GetRequest:
         request.method = "GET"
         request.query = f"?id={Utils.quote_key(self.__key)}"
 
-        request.headers["If-None-Match"] = f'"{self.__change_vector}"'
+        request.headers[constants.Headers.IF_NONE_MATCH] = f'"{self.__change_vector}"'
         return request
 
     def handle_response(self, response: "GetResponse") -> None:
diff --git a/ravendb/documents/session/operations/load_operation.py b/ravendb/documents/session/operations/load_operation.py
@@ -8,7 +8,9 @@
 from ravendb.tools.utils import CaseInsensitiveSet, CaseInsensitiveDict, Utils
 
 if TYPE_CHECKING:
-    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+        InMemoryDocumentSessionOperations,
+    )
 
 _T = TypeVar("_T")
 
diff --git a/ravendb/documents/session/operations/operations.py b/ravendb/documents/session/operations/operations.py
@@ -3,7 +3,9 @@
 from ravendb.documents.commands.crud import GetDocumentsCommand, GetDocumentsResult
 from ravendb.documents.commands.multi_get import GetRequest, MultiGetCommand
 from ravendb.documents.session.document_info import DocumentInfo
-from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+    InMemoryDocumentSessionOperations,
+)
 
 _T = TypeVar("_T")
 
diff --git a/ravendb/documents/session/operations/query.py b/ravendb/documents/session/operations/query.py
@@ -13,7 +13,9 @@
 from ravendb.tools.utils import Stopwatch, Utils
 
 if TYPE_CHECKING:
-    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+        InMemoryDocumentSessionOperations,
+    )
     from ravendb.documents.session.document_session import DocumentSession
 
 
diff --git a/ravendb/documents/session/query.py b/ravendb/documents/session/query.py
@@ -1762,8 +1762,7 @@ def select_fields(
         query_data.project_into = True
         query_data.projection_behavior = projection_behavior
 
-        select_fields = self.select_fields_query_data(projection_class, query_data=query_data)
-        return select_fields
+        return self.select_fields_query_data(projection_class, query_data=query_data)
 
     def wait_for_non_stale_results(self, wait_timeout: datetime.timedelta = None) -> DocumentQuery[_T]:
         self._wait_for_non_stale_results(wait_timeout)
diff --git a/ravendb/documents/session/tokens/query_tokens/definitions.py b/ravendb/documents/session/tokens/query_tokens/definitions.py
@@ -362,12 +362,13 @@ def write_to(self, writer: List[str]):
         if self.__projected_name is None or self.__projected_name == self.__field_name:
             return
 
-        writer.append(" as ")
+        writer.append(" as '")
         writer.append(self.__projected_name)
+        writer.append("'")
 
 
 class GroupBySumToken(QueryToken):
-    def __init__(self, field_name: str, projected_name: str):
+    def __init__(self, field_name: str, praojected_name: str):
         if field_name is None:
             raise ValueError("field_name cannot be None")
 
diff --git a/ravendb/documents/session/tokens/query_tokens/query_token.py b/ravendb/documents/session/tokens/query_tokens/query_token.py
@@ -16,3 +16,7 @@ def write_field(self, writer: List[str], field: str):
         writer.append(field)
         if key_word:
             writer.append("'")
+
+    @staticmethod
+    def is_keyword(field: str) -> bool:
+        return field in QueryToken.RQL_KEYWORDS
diff --git a/ravendb/documents/store/definition.py b/ravendb/documents/store/definition.py
@@ -27,7 +27,9 @@
 )
 from ravendb.documents.store.lazy import Lazy
 from ravendb.documents.session.document_session import DocumentSession
-from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+    InMemoryDocumentSessionOperations,
+)
 from ravendb.documents.session.misc import SessionOptions
 from ravendb.documents.subscriptions.document_subscriptions import DocumentSubscriptions
 from ravendb.http.request_executor import RequestExecutor
diff --git a/ravendb/documents/subscriptions/worker.py b/ravendb/documents/subscriptions/worker.py
@@ -15,7 +15,9 @@
 from ravendb import constants
 from ravendb.documents.session.entity_to_json import EntityToJson
 from ravendb.documents.commands.subscriptions import GetTcpInfoForRemoteTaskCommand
-from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (
+    InMemoryDocumentSessionOperations,
+)
 from ravendb.documents.session.document_info import DocumentInfo
 from ravendb.documents.session.misc import SessionOptions, TransactionMode
 from ravendb.documents.subscriptions.revision import Revision

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,9 @@`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`if TYPE_CHECKING:`
`27`		`- from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations`
	`27`	`+ from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import (`
	`28`	`+ InMemoryDocumentSessionOperations,`
	`29`	`+ )`
`28`	`30`	`from ravendb.documents.session.document_session import DocumentSession`
`29`	`31`	`from ravendb import Lazy`
`30`	`32`