diff options
Diffstat (limited to 'Bugzilla')
-rw-r--r-- | Bugzilla/DB/Schema.pm | 3 | ||||
-rw-r--r-- | Bugzilla/Install/DB.pm | 4 | ||||
-rw-r--r-- | Bugzilla/Install/Filesystem.pm | 7 |
3 files changed, 11 insertions, 3 deletions
diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm index 583b49352..5e8c49ccf 100644 --- a/Bugzilla/DB/Schema.pm +++ b/Bugzilla/DB/Schema.pm @@ -352,7 +352,7 @@ use constant ABSTRACT_SCHEMA => { fieldid => {TYPE => 'INT3', NOTNULL => 1, REFERENCES => {TABLE => 'fielddefs', COLUMN => 'id'}}, - added => {TYPE => 'TINYTEXT'}, + added => {TYPE => 'varchar(255)'}, removed => {TYPE => 'TINYTEXT'}, ], INDEXES => [ @@ -360,6 +360,7 @@ use constant ABSTRACT_SCHEMA => { bugs_activity_who_idx => ['who'], bugs_activity_bug_when_idx => ['bug_when'], bugs_activity_fieldid_idx => ['fieldid'], + bugs_activity_added_idx => ['added'], ], }, diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm index dd4b2fe1d..d39d1a770 100644 --- a/Bugzilla/Install/DB.pm +++ b/Bugzilla/Install/DB.pm @@ -574,6 +574,10 @@ sub update_table_definitions { _convert_disallownew_to_isactive(); + $dbh->bz_alter_column('bugs_activity', 'added', + { TYPE => 'varchar(255)' }); + $dbh->bz_add_index('bugs_activity', 'bugs_activity_added_idx', ['added']); + ################################################################ # New --TABLE-- changes should go *** A B O V E *** this point # ################################################################ diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index fe9783805..763fd85bf 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -157,8 +157,6 @@ sub FILESYSTEM { # Readable directories "$datadir/mining" => { files => $ws_readable, dirs => $ws_dir_readable }, - "$datadir/duplicates" => { files => $ws_readable, - dirs => $ws_dir_readable }, "$libdir/Bugzilla" => { files => $ws_readable, dirs => $ws_dir_readable }, $extlib => { files => $ws_readable, @@ -379,6 +377,11 @@ EOT unlink "$datadir/duplicates.rdf"; unlink "$datadir/duplicates-old.rdf"; } + + if (-e "$datadir/duplicates") { + print "Removing duplicates directory...\n"; + rmtree("$datadir/duplicates"); + } } # A simple helper for creating "empty" CSS files. |