diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade --- smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade 2008-09-30 23:25:28.000000000 -0500 +++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade 2008-09-30 23:23:21.000000000 -0500 @@ -144,13 +144,37 @@ $statement->execute or die "execute: $$statement: $DBI::errstr"; } +unless (defined $nag_shares->{share_owner}) +{ + # We need to be careful about this one as it will fail if the + # column exists, so we check the error. + my $statement = + "ALTER TABLE nag_shares CHANGE share_owner share_owner ". + "VARCHAR(255)"; + $statement = $db_naghandle->prepare($statement) or + die "prepare: $$statement: $DBI::errstr"; + $statement->execute or die "execute: $$statement: $DBI::errstr"; +} + +unless (defined $nag_shares_users->{user_uid}) +{ + # We need to be careful about this one as it will fail if the + # column exists, so we check the error. + my $statement = + "ALTER TABLE nag_shares_users CHANGE user_uid user_uid ". + "VARCHAR(255)"; + $statement = $db_naghandle->prepare($statement) or + die "prepare: $$statement: $DBI::errstr"; + $statement->execute or die "execute: $$statement: $DBI::errstr"; +} + unless (defined $nag_shares_groups->{group_uid}) { # We need to be careful about this one as it will fail if the # column exists, so we check the error. my $statement = - "ALTER TABLE nag_shares_groups ADD group_uid VARCHAR(255) ". - "NOT NULL"; + "ALTER TABLE nag_shares_groups CHANGE group_uid group_uid ". + "VARCHAR(255)"; $statement = $db_naghandle->prepare($statement) or die "prepare: $$statement: $DBI::errstr"; $statement->execute or die "execute: $$statement: $DBI::errstr"; diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql mezzanine_patched_smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql --- smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql 2008-09-30 23:25:28.000000000 -0500 +++ mezzanine_patched_smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql 2008-09-30 23:24:53.000000000 -0500 @@ -1,4 +1,4 @@ --- $Horde: nag/scripts/sql/nag.sql,v 1.4.8.5 2008/04/29 19:33:22 chuck Exp $ +-- $Horde: nag/scripts/sql/nag.sql,v 1.4.8.7 2008/09/23 15:18:22 jan Exp CREATE TABLE IF NOT EXISTS nag_tasks ( task_id VARCHAR(32) NOT NULL,