Merge pull request #1956 from antgonza/fix-1553

fix 1553
qiita-spots · Sep 28, 2016 · e5e499d · e5e499d
2 parents 4d5b395 + 6542851
commit e5e499d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/qiita_db/logger.py b/qiita_db/logger.py
@@ -157,7 +157,14 @@ def info(self):
                      logging_id = %s""".format(self._table)
             qdb.sql_connection.TRN.add(sql, [self.id])
 
-            return loads(qdb.sql_connection.TRN.execute_fetchlast())
+            rows = qdb.sql_connection.TRN.execute_fetchlast()
+
+            if rows:
+                results = loads(rows)
+            else:
+                results = {}
+
+            return results
 
     @property
     def msg(self):

diff --git a/qiita_db/support_files/populate_test_db.sql b/qiita_db/support_files/populate_test_db.sql
@@ -544,7 +544,8 @@ INSERT INTO qiita.message_user (message_id, email) VALUES (1, 'test@foo.bar'),(1
 
 -- Create a loggin entry
 INSERT INTO qiita.logging (time, severity_id, msg, information)
-    VALUES ('Sun Nov 22 21:29:30 2015', 2, 'Error message', '{}');
+    VALUES ('Sun Nov 22 21:29:30 2015', 2, 'Error message', NULL),
+           ('Sun Nov 22 21:29:30 2015', 2, 'Error message', '{}');
 
 -- Create some processing jobs
 INSERT INTO qiita.processing_job