diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 601b440d1..dfd50aedf 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -3,6 +3,7 @@ - Added configurable sales tax. (Tiffany Patterson / Elite Marketing) - change: made Text::Aspell optional, nullifying spellchecker if not present - Fixed a bug where logging in/out would cause a blank page display. + - Fix: Version tags could not be create()d because no default values set. 7.1.2 - Fixed a bug that caused workflows to fail if collaboration systems and diff --git a/docs/create.sql b/docs/create.sql index 27aa5ea4e..ac3b7e579 100644 --- a/docs/create.sql +++ b/docs/create.sql @@ -1152,9 +1152,9 @@ CREATE TABLE `assetVersionTag` ( `commitDate` bigint(20) NOT NULL default '0', `committedBy` varchar(22) binary NOT NULL default '', `isLocked` int(11) NOT NULL default '0', - `lockedBy` varchar(22) binary NOT NULL, - `groupToUse` varchar(22) binary NOT NULL, - `workflowId` varchar(22) binary NOT NULL, + `lockedBy` varchar(22) binary NOT NULL default '', + `groupToUse` varchar(22) binary NOT NULL default '', + `workflowId` varchar(22) binary NOT NULL default '', `workflowInstanceId` varchar(22) binary default NULL, `comments` text, PRIMARY KEY (`tagId`) diff --git a/docs/upgrades/upgrade_7.1.2-7.2.0.pl b/docs/upgrades/upgrade_7.1.2-7.2.0.pl index 5d643b25c..487c43ec3 100644 --- a/docs/upgrades/upgrade_7.1.2-7.2.0.pl +++ b/docs/upgrades/upgrade_7.1.2-7.2.0.pl @@ -22,6 +22,7 @@ my $session = start(); # this line required commerceSalesTax($session); createDictionaryStorage($session); +fixAssetVersionTag($session); finish($session); # this line required @@ -58,6 +59,16 @@ sub createDictionaryStorage { } +#------------------------------------------------- +sub fixAssetVersionTag { + my $session = shift; + print "\tFixing assetVersionTag database table.\n" unless ($quiet); + + $session->db->write("alter table assetVersionTag alter lockedBy set default ''"); + $session->db->write("alter table assetVersionTag alter groupToUse set default ''"); + $session->db->write("alter table assetVersionTag alter workflowId set default ''"); +} + # ---- DO NOT EDIT BELOW THIS LINE ----