Merge pull request #204 from nsacyber/issue-203

[#203] New version 1.1.1 for release

VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

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
 

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;
+