Merge pull request #5 from IdanHaim/RavenDB-6332

RavenDB-6332

Author: IdanHaim

pyravendb/d_commands/database_commands.py

@@ -304,9 +304,14 @@ def create_database(self, database_document):
             path = "databases/{0}".format(Utils.quote_key(db_name))
             response = self.requests_handler.http_request_handler(path, "PUT", database_document.to_json(),
                                                                   admin=True)
+
+            if response.status_code == 502:
+                raise exceptions.ErrorResponseException(
+                    "Connection failed please check your connection to {0}".format(self.requests_handler.url))
             if response.status_code != 200:
                 raise exceptions.ErrorResponseException(
                     "Database with the name '{0}' already exists".format(database_document.database_id))
+
             return response
 
         def delete_database(self, db_name, hard_delete=False):
@@ -315,7 +320,7 @@ def delete_database(self, db_name, hard_delete=False):
             if hard_delete:
                 path += "?hard-delete=true"
             response = self.requests_handler.http_request_handler(path, "DELETE", admin=True)
-            if response.status_code != 200:
+            if response.content != '':
                 raise response.raise_for_status()
             return response
 

pyravendb/store/document_session.py

@@ -91,15 +91,15 @@ def _multi_load(self, keys, object_type, includes, nested_object_types):
         if len(keys) == 0:
             return []
 
-        ids_of_not_existing_object = keys
+        ids_of_not_existing_object = set(keys)
         if not includes:
-            ids_in_includes = [key for key in keys if key in self._includes]
+            ids_in_includes = [key for key in ids_of_not_existing_object if key in self._includes]
             if len(ids_in_includes) > 0:
                 for include in ids_in_includes:
                     self._convert_and_save_entity(include, self._includes[include], object_type, nested_object_types)
                     self._includes.pop(include)
 
-            ids_of_not_existing_object = [key for key in keys if
+            ids_of_not_existing_object = [key for key in ids_of_not_existing_object if
                                           key not in self._entities_by_key]
 
         ids_of_not_existing_object = [key for key in ids_of_not_existing_object if key not in self._known_missing_ids]
@@ -114,7 +114,7 @@ def _multi_load(self, keys, object_type, includes, nested_object_types):
                     if results[i] is None:
                         self._known_missing_ids.add(ids_of_not_existing_object[i])
                         continue
-                    self._convert_and_save_entity(keys[i], results[i], object_type, nested_object_types)
+                    self._convert_and_save_entity(ids_of_not_existing_object[i], results[i], object_type, nested_object_types)
                 self.save_includes(response_includes)
         return [None if key in self._known_missing_ids else self._entities_by_key[
             key] if key in self._entities_by_key else None for key in keys]

pyravendb/store/session_query.py

@@ -287,7 +287,10 @@ def boost(self, value):
             raise ArgumentOutOfRangeException("boost", "boost factor must be a positive number")
         if value != 1:
             # 1 is the default
-            self.query_builder += "^{0}".format(value)
+            if self.query_builder.endswith(')'):
+                self.query_builder = "{0}^{1})".format(self.query_builder[:len(self.query_builder) - 1], value)
+            else:
+                self.query_builder += "^{0}".format(value)
         return self
 
     def _execute_query(self):

pyravendb/tests/session_tests/conversion_test.py renamed to pyravendb/tests/session_tests/test_conversion.py

@@ -67,7 +67,7 @@ def test_full_text_search_two(self):
                 "query", search_terms="Bobo"))
             self.assertEqual(len(query), 3)
 
-    def test_full_text_search_witg_boost(self):
+    def test_full_text_search_with_boost(self):
         with self.document_store.open_session() as session:
             query = list(session.query(object_type=LastFm, wait_for_non_stale_results=True,
                                        index_name=LastFmAnalyzed.__name__).search("query", search_terms="Me").boost(10).

pyravendb/tests/session_tests/delete_test.py renamed to pyravendb/tests/session_tests/test_delete.py

@@ -30,7 +30,8 @@ class TestLoad(TestBase):
     @classmethod
     def setUpClass(cls):
         super(TestLoad, cls).setUpClass()
-        cls.db.put("products/101", {"name": "test"}, {"Raven-Python-Type": "load_test.Product"})
+        cls.db.put("products/101", {"name": "test"},
+                   {"Raven-Python-Type": Product.__module__+".Product"})
         cls.db.put("products/10", {"name": "test"}, {})
         cls.db.put("orders/105", {"name": "testing_order", "key": 92, "product": "products/101"},
                    {"Raven-Entity-Name": "Orders"})
@@ -52,6 +53,13 @@ def test_multi_load(self):
             products = session.load(["products/101", "products/10"])
             self.assertEqual(len(products), 2)
 
+    def test_multi_load_with_duplicate_id(self):
+        with self.document_store.open_session() as session:
+            products = session.load(["products/101", "products/101", "products/10"])
+            self.assertEqual(len(products), 3)
+            for product in products:
+                self.assertIsNotNone(product)
+
     def test_load_track_entity(self):
         with self.document_store.open_session() as session:
             product = session.load("products/101")

pyravendb/tests/session_tests/full_text_search_tests.py renamed to pyravendb/tests/session_tests/test_full_text_search.py

@@ -3,6 +3,7 @@
 from pyravendb.store.session_query import QueryOperator
 from pyravendb.custom_exceptions import exceptions
 from pyravendb.data.indexes import IndexDefinition, SortOptions
+import unittest
 
 
 class Product(object):
@@ -31,15 +32,15 @@ def setUpClass(cls):
                                          stores={"doc_id": "Yes"})
         cls.db.put_index("Testing_Sort", index_def=cls.index_sort, overwrite=True)
         cls.db.put("products/101", {"name": "test101", "key": 2, "order": "a"},
-                   {"Raven-Entity-Name": "Products", "Raven-Python-Type": "query_test.Product"})
+                   {"Raven-Entity-Name": "Products", "Raven-Python-Type": Product.__module__ + ".Product"})
         cls.db.put("products/10", {"name": "test10", "key": 3, "order": "b"}, {})
         cls.db.put("products/106", {"name": "test106", "key": 4, "order": "c"}, {})
         cls.db.put("products/107", {"name": "test107", "key": 5, "order": None},
-                   {"Raven-Entity-Name": "Products", "Raven-Python-Type": "query_test.Product"})
+                   {"Raven-Entity-Name": "Products", "Raven-Python-Type": Product.__module__ + ".Product"})
         cls.db.put("products/103", {"name": "test107", "key": 6},
-                   {"Raven-Entity-Name": "Products", "Raven-Python-Type": "query_test.Product"})
+                   {"Raven-Entity-Name": "Products", "Raven-Python-Type": Product.__module__ + ".Product"})
         cls.db.put("products/108", {"name": "new_testing", "key": 90, "order": "d"},
-                   {"Raven-Entity-Name": "Products", "Raven-Python-Type": "query_test.Product"})
+                   {"Raven-Entity-Name": "Products", "Raven-Python-Type": Product.__module__ + ".Product"})
         cls.db.put("orders/105", {"name": "testing_order", "key": 92, "product": "products/108"},
                    {"Raven-Entity-Name": "Orders"})
         cls.db.put("company/1",
@@ -152,8 +153,11 @@ def test_query_with_fetch_terms(self):
 
             found_in_all = True
             for result in query_results:
-                if not hasattr(result,"doc_id"):
+                if not hasattr(result, "doc_id"):
                     found_in_all = False
                     break
 
             self.assertTrue(found_in_all)
+
+if __name__ == "__main__":
+    unittest.main()

pyravendb/tests/session_tests/load_test.py renamed to pyravendb/tests/session_tests/test_load.py

@@ -70,14 +70,13 @@ def build_path(index_name, query, options):
     @staticmethod
     def import_class(name):
         components = name.split('.')
+        module_name = '.'.join(name.split('.')[:-1])
+        mod = None
         try:
-            mod = __import__(components[0])
-            for comp in components[1:]:
-                mod = getattr(mod, comp)
-            return mod
+            mod = getattr(__import__(module_name, fromlist=[components[-1]]), components[-1])
         except (ImportError, ValueError, AttributeError):
             pass
-        return None
+        return mod
 
     @staticmethod
     def is_inherit(parent, child):