diff --git standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql index c65af1e80c..1a9aa2eaa3 100644 --- standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql +++ standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql @@ -85,6 +85,8 @@ CREATE TABLE `CTLGS` ( UNIQUE KEY `UNIQUE_CATALOG` (`NAME`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO `CTLGS` VALUES (1, 'hive', 'Default catalog for Hive', 'TBD'); -- -- Table structure for table `DBS` @@ -99,7 +101,7 @@ CREATE TABLE IF NOT EXISTS `DBS` ( `NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_TYPE` varchar(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, - `CTLG_NAME` varchar(256) NOT NULL, + `CTLG_NAME` varchar(256) NOT NULL DEFAULT "hive", PRIMARY KEY (`DB_ID`), UNIQUE KEY `UNIQUE_DATABASE` (`NAME`, `CTLG_NAME`), CONSTRAINT `CTLG_FK1` FOREIGN KEY (`CTLG_NAME`) REFERENCES `CTLGS` (`NAME`) diff --git standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql index 8510ceb3e8..48f19d216f 100644 --- standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql +++ standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql @@ -85,6 +85,8 @@ CREATE TABLE `CTLGS` ( UNIQUE KEY `UNIQUE_CATALOG` (`NAME`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO `CTLGS` VALUES (1, 'hive', 'Default catalog for Hive', 'TBD'); -- -- Table structure for table `DBS` @@ -99,7 +101,7 @@ CREATE TABLE IF NOT EXISTS `DBS` ( `NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_TYPE` varchar(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, - `CTLG_NAME` varchar(256) NOT NULL, + `CTLG_NAME` varchar(256) NOT NULL DEFAULT "hive", PRIMARY KEY (`DB_ID`), UNIQUE KEY `UNIQUE_DATABASE` (`NAME`, `CTLG_NAME`), CONSTRAINT `CTLG_FK1` FOREIGN KEY (`CTLG_NAME`) REFERENCES `CTLGS` (`NAME`) diff --git standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.2.0.mysql.sql standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.2.0.mysql.sql index bd0447e3e9..b1d922ada5 100644 --- standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.2.0.mysql.sql +++ standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.2.0.mysql.sql @@ -86,6 +86,8 @@ CREATE TABLE `CTLGS` ( UNIQUE KEY `UNIQUE_CATALOG` (`NAME`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO `CTLGS` VALUES (1, 'hive', 'Default catalog for Hive', 'TBD'); -- -- Table structure for table `DBS` @@ -100,7 +102,7 @@ CREATE TABLE IF NOT EXISTS `DBS` ( `NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_TYPE` varchar(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, - `CTLG_NAME` varchar(256) NOT NULL, + `CTLG_NAME` varchar(256) NOT NULL DEFAULT "hive", `CREATE_TIME` INT(11), PRIMARY KEY (`DB_ID`), UNIQUE KEY `UNIQUE_DATABASE` (`NAME`, `CTLG_NAME`), diff --git standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql index cd03ba7ec6..451b6515f8 100644 --- standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql +++ standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql @@ -86,6 +86,8 @@ CREATE TABLE `CTLGS` ( UNIQUE KEY `UNIQUE_CATALOG` (`NAME`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO `CTLGS` VALUES (1, 'hive', 'Default catalog for Hive', 'TBD'); -- -- Table structure for table `DBS` @@ -100,7 +102,7 @@ CREATE TABLE IF NOT EXISTS `DBS` ( `NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_TYPE` varchar(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, - `CTLG_NAME` varchar(256) NOT NULL, + `CTLG_NAME` varchar(256) NOT NULL DEFAULT "hive", `CREATE_TIME` INT(11), PRIMARY KEY (`DB_ID`), UNIQUE KEY `UNIQUE_DATABASE` (`NAME`, `CTLG_NAME`), diff --git standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql index 786e38ac6e..3b4811165a 100644 --- standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql +++ standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql @@ -235,8 +235,8 @@ ALTER TABLE `DBS` ADD COLUMN `CTLG_NAME` VARCHAR(256); UPDATE `DBS` SET `CTLG_NAME` = 'hive'; --- Add the not null constraint -ALTER TABLE `DBS` CHANGE COLUMN `CTLG_NAME` `CTLG_NAME` varchar(256) NOT NULL; +-- Add the not null constraint and default value +ALTER TABLE `DBS` CHANGE COLUMN `CTLG_NAME` `CTLG_NAME` varchar(256) NOT NULL DEFAULT "hive";; -- Put back the unique index ALTER TABLE `DBS` ADD UNIQUE KEY `UNIQUE_DATABASE` (`NAME`, `CTLG_NAME`);