[WIP][FIXUP] double remapping during patch measure extraction

Author: mcheshkov

rust/cubesql/cubesql/src/compile/engine/df/wrapper.rs

@@ -1670,27 +1670,28 @@ impl CubeScanWrapperNode {
         let mut other = vec![];
 
         for original_expr in exprs {
-            let (expr, alias) = Self::remap_column_expression(
-                schema,
-                &original_expr,
-                column_remapping,
-                next_remapper,
-                can_rename_columns,
-            )?;
-
             let (patch_def, sql_query_next) = Self::get_patch_measure(
                 sql_query,
                 sql_generator.clone(),
-                &expr,
+                &original_expr,
                 push_to_cube_context,
                 subqueries.clone(),
             )
             .await?;
             sql_query = sql_query_next;
             if let Some((patch_def, cube)) = patch_def {
+                // TODO is this ok w.r.t. `_expr`
+                let (_expr, alias) = Self::remap_column_expression(
+                    schema,
+                    &original_expr,
+                    column_remapping,
+                    next_remapper,
+                    can_rename_columns,
+                )?;
+
                 patches.push((patch_def, cube, alias));
             } else {
-                other.push(expr);
+                other.push(original_expr);
             }
         }