Fix handling of unsigned and zerofill in parser and normalization

go/vt/schemadiff/table.go

@@ -282,6 +282,12 @@ func (c *CreateTableEntity) normalizeColumnOptions() {
 		// doesn't mean anything anymore.
 		if _, ok := integralTypes[col.Type.Type]; ok {
 			col.Type.Length = nil
+			// Remove zerofill for integral types but keep the behavior that this marks the value
+			// as unsigned
+			if col.Type.Zerofill {
+				col.Type.Zerofill = false
+				col.Type.Unsigned = true
+			}
 		}
 
 		if _, ok := charsetTypes[col.Type.Type]; ok {

go/vt/schemadiff/table_test.go

@@ -108,14 +108,14 @@ func TestCreateTableDiff(t *testing.T) {
 			from:  "create table t1 (id int primary key, `i` int not null default 0)",
 			to:    "create table t2 (id int primary key, `i` bigint unsigned default null)",
 			diff:  "alter table t1 modify column i bigint unsigned",
-			cdiff: "ALTER TABLE `t1` MODIFY COLUMN `i` bigint UNSIGNED",
+			cdiff: "ALTER TABLE `t1` MODIFY COLUMN `i` bigint unsigned",
 		},
 		{
 			name:  "added column, dropped column, modified column",
 			from:  "create table t1 (id int primary key, `i` int not null default 0, c char(3) default '')",
 			to:    "create table t2 (id int primary key, ts timestamp null, `i` bigint unsigned default null)",
 			diff:  "alter table t1 drop column c, modify column i bigint unsigned, add column ts timestamp null after id",
-			cdiff: "ALTER TABLE `t1` DROP COLUMN `c`, MODIFY COLUMN `i` bigint UNSIGNED, ADD COLUMN `ts` timestamp NULL AFTER `id`",
+			cdiff: "ALTER TABLE `t1` DROP COLUMN `c`, MODIFY COLUMN `i` bigint unsigned, ADD COLUMN `ts` timestamp NULL AFTER `id`",
 		},
 		// columns, reordering
 		{
@@ -659,6 +659,13 @@ func TestCreateTableDiff(t *testing.T) {
 			diff:  "alter table t modify column t1 varchar(128) not null, modify column t2 varchar(128) not null, modify column t3 tinytext, charset utf8mb4",
 			cdiff: "ALTER TABLE `t` MODIFY COLUMN `t1` varchar(128) NOT NULL, MODIFY COLUMN `t2` varchar(128) NOT NULL, MODIFY COLUMN `t3` tinytext, CHARSET utf8mb4",
 		},
+		{
+			name:  "normalized unsigned attribute",
+			from:  "create table t1 (id int primary key)",
+			to:    "create table t1 (id int unsigned primary key)",
+			diff:  "alter table t1 modify column id int unsigned primary key",
+			cdiff: "ALTER TABLE `t1` MODIFY COLUMN `id` int unsigned PRIMARY KEY",
+		},
 		{
 			name:  "normalized ENGINE InnoDB value",
 			from:  "create table t1 (id int primary key) character set=utf8",
@@ -925,6 +932,12 @@ func TestNormalize(t *testing.T) {
 			from: "create table t (id int primary key, i int default null)",
 			to:   "CREATE TABLE `t` (\n\t`id` int PRIMARY KEY,\n\t`i` int\n)",
 		},
+		{
+			name: "keeps not exist",
+			from: "create table if not exists t (id int primary key, i int)",
+			to:   "CREATE TABLE IF NOT EXISTS `t` (\n\t`id` int PRIMARY KEY,\n\t`i` int\n)",
+		},
+
 		{
 			name: "timestamp null",
 			from: "create table t (id int primary key, t timestamp null)",
@@ -950,6 +963,11 @@ func TestNormalize(t *testing.T) {
 			from: "create table t (id int primary key, i int(11) default null)",
 			to:   "CREATE TABLE `t` (\n\t`id` int PRIMARY KEY,\n\t`i` int\n)",
 		},
+		{
+			name: "removes zerofill and maps to unsigned",
+			from: "create table t (id int primary key, i int zerofill default null)",
+			to:   "CREATE TABLE `t` (\n\t`id` int PRIMARY KEY,\n\t`i` int unsigned\n)",
+		},
 		{
 			name: "removes int sizes case insensitive",
 			from: "create table t (id int primary key, i INT(11) default null)",

go/vt/sqlparser/ast_format.go

@@ -613,10 +613,10 @@ func (ct *ColumnType) Format(buf *TrackedBuffer) {
 	}
 
 	if ct.Unsigned {
-		buf.astPrintf(ct, " %s", keywordStrings[UNSIGNED])
+		buf.astPrintf(ct, " %#s", keywordStrings[UNSIGNED])
 	}
 	if ct.Zerofill {
-		buf.astPrintf(ct, " %s", keywordStrings[ZEROFILL])
+		buf.astPrintf(ct, " %#s", keywordStrings[ZEROFILL])
 	}
 	if ct.Charset != "" {
 		buf.astPrintf(ct, " %s %s %#s", keywordStrings[CHARACTER], keywordStrings[SET], ct.Charset)

go/vt/sqlparser/tracked_buffer_test.go

@@ -72,6 +72,14 @@ func TestCanonicalOutput(t *testing.T) {
 			"create table `a`(`id` int, primary key(`id`))",
 			"CREATE TABLE `a` (\n\t`id` int,\n\tPRIMARY KEY (`id`)\n)",
 		},
+		{
+			"create table `a`(`id` int unsigned, primary key(`id`))",
+			"CREATE TABLE `a` (\n\t`id` int unsigned,\n\tPRIMARY KEY (`id`)\n)",
+		},
+		{
+			"create table `a`(`id` int zerofill, primary key(`id`))",
+			"CREATE TABLE `a` (\n\t`id` int zerofill,\n\tPRIMARY KEY (`id`)\n)",
+		},
 		{
 			"create table `a`(`id` int primary key)",
 			"CREATE TABLE `a` (\n\t`id` int PRIMARY KEY\n)",
@@ -110,7 +118,7 @@ func TestCanonicalOutput(t *testing.T) {
 		},
 		{
 			"alter table t2 modify column id bigint unsigned primary key",
-			"ALTER TABLE `t2` MODIFY COLUMN `id` bigint UNSIGNED PRIMARY KEY",
+			"ALTER TABLE `t2` MODIFY COLUMN `id` bigint unsigned PRIMARY KEY",
 		},
 		{
 			"alter table t1 modify column a int first, modify column b int after a",