Fixing bug on error and making sure that the database is not left in an inconsitent state

Author: josenavas

qiita_db/metadata_template/base_metadata_template.py

@@ -1252,7 +1252,7 @@ def update_category(self, category, samples_and_values):
 
             if any([column_type != vt for vt in value_types]):
                 value_str = ', '.join(
-                    [v for value in viewvalues(samples_and_values)])
+                    [str(value) for value in viewvalues(samples_and_values)])
                 value_types_str = ', '.join(value_types)
 
                 raise ValueError(

qiita_db/metadata_template/test/test_sample_template.py

@@ -1253,7 +1253,6 @@ def test_exists_false(self):
         self.assertFalse(SampleTemplate.exists(self.new_study.id))
 
     def test_update_category(self):
-        """setitem raises an error (currently not allowed)"""
         with self.assertRaises(QiitaDBUnknownIDError):
             self.tester.update_category('country', {"foo": "bar"})
 
@@ -1295,10 +1294,18 @@ def test_update_category(self):
         # testing that if fails when trying to change an int column value
         # to str
         st = SampleTemplate.create(self.metadata, self.new_study)
-        mapping = {'2.Sample1': "no_value"}
+
+        sql = """SELECT * FROM qiita.sample_2 ORDER BY sample_id"""
+        before = self.conn_handler.execute_fetchall(sql)
+        mapping = {'2.Sample1': 1, '2.Sample2': "no_value"}
+
         with self.assertRaises(ValueError):
             st.update_category('int_column', mapping)
 
+        after = self.conn_handler.execute_fetchall(sql)
+
+        self.assertEqual(before, after)
+
     def test_update(self):
         """Updates values in existing mapping file"""
         # creating a new sample template