diff --git a/mozilla/webtools/testopia/.bzrrev b/mozilla/webtools/testopia/.bzrrev index 3114067d5df..b7f636c12f2 100644 --- a/mozilla/webtools/testopia/.bzrrev +++ b/mozilla/webtools/testopia/.bzrrev @@ -1 +1 @@ -664 \ No newline at end of file +665 \ No newline at end of file diff --git a/mozilla/webtools/testopia/extensions/Testopia/Extension.pm b/mozilla/webtools/testopia/extensions/Testopia/Extension.pm index b578af5cecf..70cc880eeb9 100644 --- a/mozilla/webtools/testopia/extensions/Testopia/Extension.pm +++ b/mozilla/webtools/testopia/extensions/Testopia/Extension.pm @@ -151,6 +151,13 @@ sub derive_regexp_groups { # End of redefined subroutines. +sub bz_version { + BUGZILLA_VERSION =~ /^(\d+\.\d+)(?:(rc|\.)(\d+))?\+?$/; + + # There are no DB schema changes on stable branches so + # we don't care about minor releases. + return $1; +} sub bug_end_of_update { my ($self, $args) = @_; @@ -936,7 +943,7 @@ sub db_schema_abstract_schema { } }, component_id => { - TYPE => 'INT2', + TYPE => bz_version() > 4.4 ? 'INT3' : 'INT2', NOTNULL => 1, REFERENCES => { TABLE => 'components', @@ -1476,6 +1483,13 @@ sub install_update_db { COLUMN => 'case_id', DELETE => 'CASCADE' }}); + if (bz_version() > 4.4) { + $dbh->bz_alter_column('test_case_components', 'component_id', {TYPE => 'INT3', NOTNULL => 1, REFERENCES => { + TABLE => 'components', + COLUMN => 'id', + DELETE => 'CASCADE' + }}); + } $dbh->bz_alter_column('test_case_dependencies', 'blocked', {TYPE => 'INT4', NOTNULL => 1}); $dbh->bz_alter_column('test_case_dependencies', 'dependson', {TYPE => 'INT4', NOTNULL => 1}); $dbh->bz_alter_column('test_case_plans', 'case_id', {TYPE => 'INT4', NOTNULL => 1, REFERENCES => { diff --git a/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php b/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php index 29117e04761..0ab0ff5c69e 100644 --- a/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php +++ b/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php @@ -1,7 +1,7 @@ -// $Id: .xmlrpc.inc.php,v 1.27 2012-11-10 12:30:19 mkanat%bugzilla.org Exp $ +// $Id: .xmlrpc.inc.php,v 1.28 2013-11-20 13:00:17 bzrmirror%bugzilla.org Exp $ // Copyright (c) 1999,2000,2002 Edd Dumbill. // All rights reserved.