Handle scalar equ & var in DatabaseBackend.item_get_elements()

iiasa · Feb 23, 2021 · 6464987 · 6464987
1 parent 58b25b0
commit 6464987
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/ixmp/backend/dbapi.py b/ixmp/backend/dbapi.py
@@ -314,7 +314,9 @@ def item_get_elements(self, s, type, name, filters):
         if data is None:
             cur.execute("SELECT dims from item WHERE id = ?", (id,))
             dims = eval(cur.fetchone()[0])
-            idx_names, idx_sets = list(zip(*dims.items()))
+            idx_names, idx_sets = (
+                list(zip(*dims.items())) if len(dims) else (tuple(), tuple())
+            )
             data = tuple()
 
         if len(idx_sets):
@@ -337,7 +339,11 @@ def item_get_elements(self, s, type, name, filters):
 
             # Create data frame
             result = pd.DataFrame(data, columns=columns).astype(dtypes)
+        elif type in ("equ", "var"):
+            # Scalar equations and variables
+            result = dict(zip(("lvl", "mrg"), data))
         else:
+            print(s, type, name, filters, data, idx_names, idx_sets)
             raise NotImplementedError("non-indexed items")
 
         return result