[ZC-1342]: Disable variable syntax in derivations

scrunch/datasets.py

@@ -1129,7 +1129,7 @@ def create_fill_values(self, variables, name, alias, description=''):
         if "variable" in else_case and "name" in else_case:
             raise ValueError("Else case can be either variable or category not both")
 
-        aliases = {c["variable"] for c in variables}
+        aliases = {c["var"] for c in variables}
         vars_by_alias = self.resource.variables.by("alias")
         types = {vars_by_alias[al]["type"] for al in aliases}
         if types != {"categorical"}:
@@ -1162,13 +1162,13 @@ def create_fill_values(self, variables, name, alias, description=''):
             })
 
         expr = {"function": "case", "args": args}
-        fill_map = {str(cid): {"variable": vars_by_alias[v["variable"]]["id"]}
+        fill_map = {str(cid): {"var": v["var"]}
                     for cid, v in zip(cat_ids, variables)}
 
-        if "variable" in else_case:
+        if "var" in else_case:
             # We are in the case of a default fill, replace the -1 with the new
             # variable
-            fill_map["-1"] = {"variable": vars_by_alias[else_case["variable"]]["id"]}
+            fill_map["-1"] = {"var": else_case["var"]}
 
         fill_expr = {
             "function": "fill",
@@ -1873,7 +1873,7 @@ def combine_categorical(self, variable, map, categories=None, missing=None,
             'alias': alias,
             'description': description,
             'derivation': combine_categories_expr(
-                variable.resource.self, combinations)
+                variable.alias, combinations)
         })
         return self._var_create_reload_return(payload)
 

scrunch/tests/test_cubes.py

@@ -48,7 +48,7 @@ def test_pass_filter_expression(self, mock_fetch_cube):
             "function": ">",
             "args": [
                 {
-                    "variable": "https://test.crunch.io/api/datasets/123456/variables/0001/"
+                    "var": "var1_alias"
                 },
                 {"value": 1},
             ],