chore: sync release v1.42.4 to main branch (#5496)

rudderlabs · Feb 10, 2025 · 4854220 · 4854220
1 parent 4938a25
commit 4854220
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.42.4](https://github.com/rudderlabs/rudder-server/compare/v1.42.3...v1.42.4) (2025-02-10)
+
+
+### Bug Fixes
+
+* databricks columns to add becomes empty after filtering ([#5494](https://github.com/rudderlabs/rudder-server/issues/5494)) ([462aeef](https://github.com/rudderlabs/rudder-server/commit/462aeef76866dc86b391bd52634899082a7cc7db))
+
 ## [1.42.3](https://github.com/rudderlabs/rudder-server/compare/v1.42.2...v1.42.3) (2025-02-10)
 
 

diff --git a/warehouse/integrations/deltalake/deltalake.go b/warehouse/integrations/deltalake/deltalake.go
@@ -535,6 +535,9 @@ func (d *Deltalake) AddColumns(ctx context.Context, tableName string, columnsInf
 		_, ok := tableSchema[columnInfo.Name]
 		return !ok
 	})
+	if len(columnsToAddInfo) == 0 {
+		return nil
+	}
 
 	var queryBuilder strings.Builder
 

diff --git a/warehouse/integrations/deltalake/deltalake_test.go b/warehouse/integrations/deltalake/deltalake_test.go
@@ -1376,8 +1376,8 @@ func TestIntegration(t *testing.T) {
 			},
 		}
 
-		err = d.AddColumns(ctx, tableName, columnsToAdd)
-		require.NoError(t, err)
+		require.NoError(t, d.AddColumns(ctx, tableName, columnsToAdd))
+		require.NoError(t, d.AddColumns(ctx, tableName, columnsToAdd))
 
 		schema, err := d.FetchSchema(ctx)
 		require.NoError(t, err)