File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -380,7 +380,7 @@ def _merge_iceberg(
380380 if merge_cols or merge_on_clause :
381381 if merge_on_clause :
382382 on_condition = merge_on_clause
383- else :
383+ elif merge_cols is not None :
384384 if merge_match_nulls :
385385 merge_conditions = [f'(target."{ x } " IS NOT DISTINCT FROM source."{ x } ")' for x in merge_cols ]
386386 else :
@@ -402,7 +402,7 @@ def _merge_iceberg(
402402 INSERT ({ ", " .join ([f'"{ x } "' for x in df .columns ])} )
403403 VALUES ({ ", " .join ([f'source."{ x } "' for x in df .columns ])} )""" )
404404
405- elif merge_condition == "conditional_merge" :
405+ elif merge_condition == "conditional_merge" and merge_conditional_clauses is not None :
406406 for clause in merge_conditional_clauses :
407407 when_type = clause ["when" ]
408408 action = clause ["action" ]
You can’t perform that action at this time.
0 commit comments