Merge pull request openark#1194 from openark/vitess-db-compat

Strict default value in backend table
Hornswoggles · Jun 17, 2020 · f28c590 · f28c590
2 parents f41abff + 90b4c50
commit f28c590
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/go/db/generate_base.go b/go/db/generate_base.go
@@ -317,7 +317,7 @@ var generateSQLBase = []string{
 			in_active_period tinyint unsigned NOT NULL DEFAULT 0,
 			start_active_period timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
 			end_active_period_unixtime int unsigned,
-			end_recovery timestamp NULL,
+			end_recovery timestamp NULL DEFAULT NULL,
 			processing_node_hostname varchar(128) CHARACTER SET ascii NOT NULL,
 			processcing_node_token varchar(128) NOT NULL,
 			successor_hostname varchar(128) DEFAULT NULL,
@@ -407,7 +407,7 @@ var generateSQLBase = []string{
 			port smallint(5) unsigned NOT NULL,
 			downtime_active tinyint(4) DEFAULT NULL,
 			begin_timestamp timestamp DEFAULT CURRENT_TIMESTAMP,
-			end_timestamp timestamp,
+			end_timestamp timestamp NULL DEFAULT NULL,
 			owner varchar(128) CHARACTER SET utf8 NOT NULL,
 			reason text CHARACTER SET utf8 NOT NULL,
 			PRIMARY KEY (hostname, port)

diff --git a/go/inst/cluster_alias_dao.go b/go/inst/cluster_alias_dao.go
@@ -147,7 +147,7 @@ func UpdateClusterAliases() error {
 			replace into
 					cluster_alias (alias, cluster_name, last_registered)
 				select
-						cluster_name, cluster_name, now()
+						cluster_name as alias, cluster_name, now()
 				  from
 				    database_instance
 				  group by