normalize both infra map in dev/prod mode (#3056)

to be the same as plan command

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> Normalize both reconciled and target infrastructure maps before
diffing, and refactor InfrastructureMap::normalize to mutate tables in
place.
> 
> - **Planning**:
> - Normalize `reconciled_map` and `target_infra_map` before diffing to
align behavior with remote plan and ensure consistent comparisons.
> - **Infrastructure Map**:
> - Refactor `InfrastructureMap::normalize` to mutate tables in-place
via `values_mut()`.
> - Applies ORDER BY fallback when empty and sets Array columns to
`required=true` without rebuilding the map.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
c27302b. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

Author: phiSgr

apps/framework-cli/src/framework/core/infrastructure_map.rs

@@ -2526,28 +2526,22 @@ impl InfrastructureMap {
     pub fn normalize(mut self) -> Self {
         use crate::framework::core::infrastructure::table::ColumnType;
 
-        self.tables = self
-            .tables
-            .into_iter()
-            .map(|(id, mut table)| {
-                // Fall back to primary key columns if order_by is empty for MergeTree engines
-                // This ensures backward compatibility when order_by isn't explicitly set
-                // We only do this for MergeTree family to avoid breaking S3 tables
-                if table.order_by.is_empty() {
-                    table.order_by = table.order_by_with_fallback();
-                }
+        self.tables.values_mut().for_each(|table| {
+            // Fall back to primary key columns if order_by is empty for MergeTree engines
+            // This ensures backward compatibility when order_by isn't explicitly set
+            // We only do this for MergeTree family to avoid breaking S3 tables
+            if table.order_by.is_empty() {
+                table.order_by = table.order_by_with_fallback();
+            }
 
-                // Normalize columns: ClickHouse doesn't support Nullable(Array(...))
-                // Arrays must always be NOT NULL (required=true)
-                for col in &mut table.columns {
-                    if matches!(col.data_type, ColumnType::Array { .. }) {
-                        col.required = true;
-                    }
+            // Normalize columns: ClickHouse doesn't support Nullable(Array(...))
+            // Arrays must always be NOT NULL (required=true)
+            for col in &mut table.columns {
+                if matches!(col.data_type, ColumnType::Array { .. }) {
+                    col.required = true;
                 }
-
-                (id, table)
-            })
-            .collect();
+            }
+        });
 
         self
     }

apps/framework-cli/src/framework/core/plan.rs

@@ -409,6 +409,10 @@ pub async fn plan_changes(
             .unwrap_or("Could not serialize reconciled infrastructure map".to_string())
     );
 
+    // Normalize both infra maps, same as remote_plan
+    let reconciled_map = reconciled_map.normalize();
+    let target_infra_map = target_infra_map.normalize();
+
     // Use the reconciled map for diffing with ClickHouse-specific strategy
     // Pass ignore_ops so the diff can normalize tables internally for comparison
     // while using original tables for the actual change operations