RDBC-436 Expose get_metadata_for in the API

RDBC-437 Allow to query on datetime instances natively

Author: ayende

pyravendb/data/document_conventions.py

@@ -80,9 +80,17 @@ def default_transform_type_tag_name(name):
     def build_default_metadata(entity):
         if entity is None:
             return {}
-        return {"@collection": DocumentConventions.default_transform_plural(entity.__class__.__name__),
+        existing = entity.__dict__.get('@metadata')
+        if existing is None:
+            existing = {}
+
+        new_metadata = {"@collection": DocumentConventions.default_transform_plural(entity.__class__.__name__),
                 "Raven-Python-Type": "{0}.{1}".format(entity.__class__.__module__, entity.__class__.__name__)}
 
+        existing.update(new_metadata)
+
+        return existing
+
     @staticmethod
     def try_get_type_from_metadata(metadata):
         if "Raven-Python-Type" in metadata:

pyravendb/store/document_session.py

@@ -479,6 +479,9 @@ def attachment(self):
             self._attachment = _Attachment(self.session)
         return self._attachment
 
+    def get_metadata_for(self, entity):
+        return self.session.documents_by_entity[entity]['metadata']
+
     def stream(self, query):
         from pyravendb.store.stream import IncrementalJsonParser
         import ijson

pyravendb/store/session_query.py

@@ -3,7 +3,7 @@
 from pyravendb.commands.raven_commands import GetFacetsCommand
 from pyravendb.data.query import IndexQuery, QueryOperator, OrderingType, FacetQuery
 from pyravendb.tools.utils import Utils
-from datetime import timedelta
+from datetime import timedelta, datetime
 import time
 import re
 
@@ -350,6 +350,13 @@ def negate_if_needed(self, field_name):
             self._where_tokens.append(_Token(write="NOT"))
 
     def add_query_parameter(self, value):
+
+        if isinstance(value, timedelta):
+            value = Utils.timedelta_tick(value)
+        elif isinstance(value, datetime):
+            value = Utils.datetime_to_string(value)
+
+
         parameter_name = "p{0}".format(len(self.query_parameters))
         self.query_parameters[parameter_name] = value
         return parameter_name
@@ -557,11 +564,6 @@ def where_between(self, field_name, start, end, exact=False):
         self._add_operator_if_needed()
         self.negate_if_needed(field_name)
 
-        if isinstance(start, timedelta):
-            start = Utils.timedelta_tick(start)
-        if isinstance(end, timedelta):
-            end = Utils.timedelta_tick(end)
-
         from_parameter_name = self.add_query_parameter("*" if start is None else start)
         to_parameter_name = self.add_query_parameter("NULL" if end is None else end)
 

pyravendb/tests/session_tests/test_query.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from pyravendb.tests.test_base import TestBase
 from pyravendb.raven_operations.maintenance_operations import PutIndexesOperation
 from pyravendb.custom_exceptions import exceptions
@@ -76,6 +78,14 @@ def test_can_use_exists_field(self):
         with self.store.open_session() as session:
             list(session.query(collection_name="Products").where_exists("name"))
 
+    def test_can_query_on_date_time(self):
+        with self.store.open_session() as session:
+            list(session.query(collection_name="Products").where_equals("at", datetime.now()))
+
+    def test_can_query_on_date_time_range(self):
+        with self.store.open_session() as session:
+            list(session.query(collection_name="Products").where_between("at", datetime.now(), datetime.now()))
+
     def test_where_not_equal(self):
         with self.store.open_session() as session:
             query_results = list(session.query(collection_name="Products").where_not_equals("name", "test101"))

pyravendb/tests/session_tests/test_store_entities.py

@@ -27,6 +27,30 @@ def test_store_without_key(self):
         with self.store.open_session() as session:
             self.assertIsNotNone(session.load("foos/1-A"))
 
+    def test_store_with_metadata_on_dict(self):
+        foo = Foo("test", 10)
+        foo.__dict__['@metadata'] = {'foo': True}
+        with self.store.open_session() as session:
+            session.store(foo)
+            session.save_changes()
+
+        with self.store.open_session() as session:
+            f = session.load("foos/1-A")
+            metadata = session.advanced.get_metadata_for(f)
+            self.assertTrue(metadata['foo'])
+
+    def test_store_with_metadata_on_api(self):
+        foo = Foo("test", 10)
+        with self.store.open_session() as session:
+            session.store(foo)
+            session.advanced.get_metadata_for(foo)['foo'] = False
+            session.save_changes()
+
+        with self.store.open_session() as session:
+            f = session.load("foos/1-A")
+            metadata = session.advanced.get_metadata_for(f)
+            self.assertFalse(metadata['foo'])
+
     def test_store_with_key(self):
         foo = Foo("test", 20)
         with self.store.open_session() as session: