Skip to content

Commit b7b3bfb

Browse files
committed
skip analysis of generated column data type in unique key
Signed-off-by: Shlomi Noach <[email protected]>
1 parent 7202076 commit b7b3bfb

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

go/logic/inspect.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@ func (this *Inspector) inspectOriginalAndGhostTables() (err error) {
188188
}
189189

190190
for _, column := range this.migrationContext.UniqueKey.Columns.Columns() {
191+
if this.migrationContext.GhostTableVirtualColumns.GetColumn(column.Name) != nil {
192+
// this is a virtual column
193+
continue
194+
}
191195
if this.migrationContext.MappedSharedColumns.HasTimezoneConversion(column.Name) {
192196
return fmt.Errorf("No support at this time for converting a column from DATETIME to TIMESTAMP that is also part of the chosen unique key. Column: %s, key: %s", column.Name, this.migrationContext.UniqueKey.Name)
193197
}

localtests/generated-columns57-unique/create.sql

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ create table gh_ost_test (
66
PRIMARY KEY (`id`,`idb`)
77
) auto_increment=1;
88

9-
insert into gh_ost_test (id, jsonobj) values (null, ''{"_id":2}'');
10-
insert into gh_ost_test (id, jsonobj) values (null, ''{"_id":3}'');
9+
insert into gh_ost_test (id, jsonobj) values (null, '{"_id":2}');
10+
insert into gh_ost_test (id, jsonobj) values (null, '{"_id":3}');
1111

1212
drop event if exists gh_ost_test;
1313
delimiter ;;
@@ -19,12 +19,12 @@ create event gh_ost_test
1919
enable
2020
do
2121
begin
22-
insert into gh_ost_test (id, jsonobj) values (null, ''{"_id":5}'');
23-
insert into gh_ost_test (id, jsonobj) values (null, ''{"_id":7}'');
24-
insert into gh_ost_test (id, jsonobj) values (null, ''{"_id":11}'');
25-
insert into gh_ost_test (id, jsonobj) values (null, ''{"_id":13}'');
26-
insert into gh_ost_test (id, jsonobj) values (null, ''{"_id":17}'');
27-
insert into gh_ost_test (id, jsonobj) values (null, ''{"_id":19}'');
28-
insert into gh_ost_test (id, jsonobj) values (null, ''{"_id":23}'');
29-
insert into gh_ost_test (id, jsonobj) values (null, ''{"_id":27}'');
22+
insert into gh_ost_test (id, jsonobj) values (null, '{"_id":5}');
23+
insert into gh_ost_test (id, jsonobj) values (null, '{"_id":7}');
24+
insert into gh_ost_test (id, jsonobj) values (null, '{"_id":11}');
25+
insert into gh_ost_test (id, jsonobj) values (null, '{"_id":13}');
26+
insert into gh_ost_test (id, jsonobj) values (null, '{"_id":17}');
27+
insert into gh_ost_test (id, jsonobj) values (null, '{"_id":19}');
28+
insert into gh_ost_test (id, jsonobj) values (null, '{"_id":23}');
29+
insert into gh_ost_test (id, jsonobj) values (null, '{"_id":27}');
3030
end ;;

0 commit comments

Comments
 (0)