Merge branch 'develop' into add_remote_listdir

aiida/backends/djsite/querybuilder_django/querybuilder_django.py

@@ -512,7 +512,7 @@ def get_aiida_res(self, key, res):
         elif key == 'extras':
             # same as attributes
             return DbExtra.get_all_values_for_nodepk(res)
-        elif key in ('_metadata', 'transport_params'):
+        elif key in ('_metadata', 'transport_params') and res is not None:
             # Metadata and transport_params are stored as json strings in the DB:
             return json_loads(res)
         elif isinstance(res, (self.Group, self.Node, self.Computer, self.User)):

aiida/backends/tests/export_and_import.py

@@ -1165,4 +1165,3 @@ def test_different_computer_same_name_import(self):
             # Deleting the created temporary folders
             shutil.rmtree(export_file_tmp_folder, ignore_errors=True)
             shutil.rmtree(unpack_tmp_folder, ignore_errors=True)
-

aiida/backends/tests/query.py

@@ -13,8 +13,6 @@
 import aiida.backends.settings as settings
 
 
-
-
 class TestQueryBuilder(AiidaTestCase):
 
     def test_classification(self):
@@ -70,7 +68,6 @@ def test_classification(self):
             self.assertEqual(clstype, 'user')
             self.assertEqual(query_type_string, None)
 
-
         for cls, clstype, query_type_string in (
                 qb._get_ormclass(Computer, None),
                 qb._get_ormclass(None, 'computer'),
@@ -79,15 +76,13 @@ def test_classification(self):
             self.assertEqual(clstype, 'computer')
             self.assertEqual(query_type_string, None)
 
-
         for cls, clstype, query_type_string in (
                 qb._get_ormclass(Data, None),
                 qb._get_ormclass(None, 'data.Data.'),
         ):
             self.assertEqual(clstype, Data._plugin_type_string)
             self.assertEqual(query_type_string, Data._query_type_string)
 
-
     def test_simple_query_1(self):
         """
         Testing a simple query
@@ -162,7 +157,6 @@ def test_simple_query_1(self):
         qb6.append(Data, tag='node2')
         self.assertEqual(qb6.count(), 0)
 
-
     def test_simple_query_2(self):
         from aiida.orm.querybuilder import QueryBuilder
         from aiida.orm import Node
@@ -187,13 +181,10 @@ def test_simple_query_2(self):
         for n in (n0, n1, n2):
             n.store()
 
-
-
         qb1 = QueryBuilder()
         qb1.append(Node, filters={'label': 'hello'})
         self.assertEqual(len(list(qb1.all())), 1)
 
-
         qh = {
             'path': [
                 {
@@ -222,18 +213,13 @@ def test_simple_query_2(self):
 
         qb2 = QueryBuilder(**qh)
 
-
         resdict = qb2.dict()
         self.assertEqual(len(resdict), 1)
         self.assertTrue(isinstance(resdict[0]['n1']['ctime'], datetime))
 
-
         res_one = qb2.one()
         self.assertTrue('bar' in res_one)
 
-
-
-
         qh = {
             'path': [
                 {
@@ -253,7 +239,6 @@ def test_simple_query_2(self):
         qb = QueryBuilder(**qh)
         self.assertEqual(qb.count(), 1)
 
-
         # Test the hashing:
         query1 = qb.get_query()
         qb.add_filter('n2', {'label': 'nonexistentlabel'})
@@ -270,7 +255,6 @@ def test_simple_query_2(self):
         self.assertTrue(id(query1) != id(query2))
         self.assertTrue(id(query2) == id(query3))
 
-
     def test_operators_eq_lt_gt(self):
         from aiida.orm.querybuilder import QueryBuilder
         from aiida.orm import Node
@@ -297,9 +281,6 @@ def test_operators_eq_lt_gt(self):
         self.assertEqual(QueryBuilder().append(Node, filters={'attributes.fa':{'>':1.02}}).count(), 4)
         self.assertEqual(QueryBuilder().append(Node, filters={'attributes.fa':{'>=':1.02}}).count(), 5)
 
-
-
-
     def test_subclassing(self):
         from aiida.orm.data.structure import StructureData
         from aiida.orm.data.parameter import ParameterData
@@ -337,7 +318,6 @@ def test_subclassing(self):
             qb = QueryBuilder().append(cls, filters={'attributes.cat':'miau'}, subclassing=False)
             self.assertEqual(qb.count(), 1)
 
-
     def test_list_behavior(self):
         from aiida.orm import Node
         from aiida.orm.querybuilder import QueryBuilder
@@ -388,8 +368,6 @@ def test_append_validation(self):
         with self.assertRaises(InputValidationError):
             QueryBuilder(offset=2.3)
 
-
-
         # So, I mess up one append, I want the QueryBuilder to clean it!
         with self.assertRaises(InputValidationError):
             qb = QueryBuilder()
@@ -441,6 +419,45 @@ def test_tags(self):
             ])
 
 
+class TestQueryBuilderCornerCases(AiidaTestCase):
+    """
+    In this class corner cases of QueryBuilder are added.
+    """
+
+    def test_computer_json(self):
+        """
+        In this test we check the correct behavior of QueryBuilder when
+        retrieving the _metadata and the transport_params with no content.
+        Note that they are in JSON format in both backends. Forcing the
+        decoding of a None value leads to an exception (this was the case
+        under Django).
+        """
+        from aiida.orm.querybuilder import QueryBuilder
+        from aiida.orm import Node, Data, Calculation
+        from aiida.orm import Computer
+
+        n1 = Calculation()
+        n1.label = 'node2'
+        n1._set_attr('foo', 1)
+        n1.store()
+
+        # Checking the correct retrieval of transport_params which is
+        # a JSON field (in both backends).
+        qb = QueryBuilder()
+        qb.append(Calculation, project=['id'], tag='calc')
+        qb.append(Computer, project=['id', 'transport_params'],
+                  outerjoin=True, computer_of='calc')
+        qb.all()
+
+        # Checking the correct retrieval of _metadata which is
+        # a JSON field (in both backends).
+        qb = QueryBuilder()
+        qb.append(Calculation, project=['id'], tag='calc')
+        qb.append(Computer, project=['id', '_metadata'],
+                  outerjoin=True, computer_of='calc')
+        qb.all()
+
+
 class TestAttributes(AiidaTestCase):
     def test_attribute_existence(self):
         # I'm storing a value under key whatever:
@@ -453,21 +470,6 @@ def test_attribute_existence(self):
         n1._set_attr("test_case", "test_attribute_existence")
         n1.store()
 
-        n1 = Node()
-        n1._set_attr("whatever", 0.)
-        n1._set_attr("test_case", "test_attribute_existence")
-        n1.store()
-        res_uuids.add(n1.uuid)
-
-        n1 = Node()
-        n1._set_attr("whatever", None)
-        n1._set_attr("test_case", "test_attribute_existence")
-        n1.store()
-
-        n1 = Node()
-        n1._set_attr("test_case", "test_attribute_existence")
-        n1.store()
-        res_uuids.add(n1.uuid)
 
         # I want all the nodes where whatever is smaller than 1. or there is no such value:
 
@@ -482,7 +484,6 @@ def test_attribute_existence(self):
         self.assertEqual(res_query, res_uuids)
 
 
-
 class QueryBuilderDateTimeAttribute(AiidaTestCase):
     @unittest.skipIf(settings.BACKEND == u'sqlalchemy',
               "SQLA doesn't have full datetime support in attributes")
@@ -504,8 +505,6 @@ def test_date(self):
         self.assertEqual(qb.count(), 1)
 
 
-
-
 class QueryBuilderLimitOffsetsTest(AiidaTestCase):
 
     def test_ordering_limits_offsets_of_results_general(self):