Merge pull request #8337 from planetscale/online-ddl-vrepl-suite-drop…

…-add-same-name Online DDL/VReplication: support DROP+ADD column of same name
vitessio · Jun 16, 2021 · bd5bb8c · bd5bb8c
2 parents 0e0755f + 334b448
commit bd5bb8c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 0 deletions.
diff --git a/...data/drop-null-add-not-null/after_columns → ...data/drop-null-add-not-null/after_columns b/...data/drop-null-add-not-null/after_columns → ...data/drop-null-add-not-null/after_columns
diff --git a/...e/untestdata/drop-null-add-not-null/alter → ...ite/testdata/drop-null-add-not-null/alter b/...e/untestdata/drop-null-add-not-null/alter → ...ite/testdata/drop-null-add-not-null/alter
diff --git a/...ata/drop-null-add-not-null/before_columns → ...ata/drop-null-add-not-null/before_columns b/...ata/drop-null-add-not-null/before_columns → ...ata/drop-null-add-not-null/before_columns
diff --git a/...estdata/drop-null-add-not-null/create.sql → ...estdata/drop-null-add-not-null/create.sql b/...estdata/drop-null-add-not-null/create.sql → ...estdata/drop-null-add-not-null/create.sql
diff --git a/go/vt/vttablet/onlineddl/vrepl.go b/go/vt/vttablet/onlineddl/vrepl.go
@@ -279,6 +279,12 @@ func (v *VRepl) getSharedColumns(sourceColumns, targetColumns *vrepl.ColumnList,
  break
  }
  }
+ for droppedColumn := range v.parser.DroppedColumnsMap() {
+ if strings.EqualFold(sourceColumn, droppedColumn) {
+ isSharedColumn = false
+ break
+ }
+ }
  for _, virtualColumn := range sourceVirtualColumns.Names() {
  // virtual/generated columns on source are silently skipped
  if strings.EqualFold(sourceColumn, virtualColumn) {