diff --git a/VERSION b/VERSION index 9084fa2f..524cb552 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.0 +1.1.1 diff --git a/package/rpm/HIRS.spec b/package/rpm/HIRS.spec index f4eba82c..0fd718ce 100644 --- a/package/rpm/HIRS.spec +++ b/package/rpm/HIRS.spec @@ -192,12 +192,22 @@ if [ $1 -gt 1 ]; then exit 1; fi elif [ %{version} == "1.1.0" ]; then - if (mysql -u root hirs_db < /opt/hirs/scripts/common/upgrade_schema_1.0.4.sql && mysql -u root hirs_db < /opt/hirs/scripts/common/upgrade_schema_1.1.0.sql); then + if (mysql -u root hirs_db < /opt/hirs/scripts/common/upgrade_schema_1.0.4.sql && \ + mysql -u root hirs_db < /opt/hirs/scripts/common/upgrade_schema_1.1.0.sql); then echo "Upgrade to version 1.1.0" else echo "Error upgrading HIRS database schema to 1.1.0!" exit 1; fi + elif [ %{version} == "1.1.1" ]; then + if (mysql -u root hirs_db < /opt/hirs/scripts/common/upgrade_schema_1.0.4.sql && \ + mysql -u root hirs_db < /opt/hirs/scripts/common/upgrade_schema_1.1.0.sql && \ + mysql -u root hirs_db < /opt/hirs/scripts/common/upgrade_schema_1.1.1.sql); then + echo "Upgrade to version 1.1.1" + else + echo "Error upgrading HIRS database schema to 1.1.1!" + exit 1; + fi fi fi diff --git a/package/scripts/common/upgrade_schema_1.1.1.sql b/package/scripts/common/upgrade_schema_1.1.1.sql new file mode 100644 index 00000000..e33af0bf --- /dev/null +++ b/package/scripts/common/upgrade_schema_1.1.1.sql @@ -0,0 +1,23 @@ +DROP PROCEDURE IF EXISTS upgrade_schema_to_1_1_1; +DELIMITER '//' + +CREATE PROCEDURE upgrade_schema_to_1_1_1() +BEGIN +IF(NOT EXISTS(SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='hirs_db' AND TABLE_NAME='Certificate' AND COLUMN_NAME='tcgCredentialMajorVersion')) THEN +ALTER TABLE Certificate ADD tcgCredentialMajorVersion int(11) DEFAULT NULL; +END IF; + +IF(NOT EXISTS(SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='hirs_db' AND TABLE_NAME='Certificate' AND COLUMN_NAME='tcgCredentialMinorVersion')) THEN +ALTER TABLE Certificate ADD tcgCredentialMinorVersion int(11) DEFAULT NULL; +END IF; + +IF(NOT EXISTS(SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='hirs_db' AND TABLE_NAME='Certificate' AND COLUMN_NAME='tcgCredentialRevisionLevel')) THEN +ALTER TABLE Certificate ADD tcgCredentialRevisionLevel int(11) DEFAULT NULL; +END IF; + +END// +DELIMITER ';' + +CALL upgrade_schema_to_1_1_1; +DROP PROCEDURE upgrade_schema_to_1_1_1; +