summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-07-23 23:51:44 +0200
committerDave Lawrence <dlawrence@mozilla.com>2012-07-23 23:51:44 +0200
commit68e12cdd7ca90594089327e00cf0b7c50e4d0807 (patch)
tree183fc91015b29e41f38a5fe5add07f14bb3fb529
parentd23802e8b18093a2d257b319f02f6e0942326b67 (diff)
downloadbugzilla-68e12cdd7ca90594089327e00cf0b7c50e4d0807.tar.gz
bugzilla-68e12cdd7ca90594089327e00cf0b7c50e4d0807.tar.xz
Bug 764466 - Add a primary key to the profiles_activity table
r=glob, a=LpSolit
-rw-r--r--Bugzilla/DB/Schema.pm2
-rw-r--r--Bugzilla/Install/DB.pm4
-rwxr-xr-xcontrib/recode.pl1
3 files changed, 7 insertions, 0 deletions
diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index f8469e66e..09475807c 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -918,6 +918,8 @@ use constant ABSTRACT_SCHEMA => {
profiles_activity => {
FIELDS => [
+ id => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
+ PRIMARYKEY => 1},
userid => {TYPE => 'INT3', NOTNULL => 1,
REFERENCES => {TABLE => 'profiles',
COLUMN => 'userid',
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 39bfca602..b2cf1194f 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -678,6 +678,10 @@ sub update_table_definitions {
$dbh->bz_add_column('bugs_activity', 'id',
{TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+ # 2012-06-13 dkl@mozilla.com - Bug 764466
+ $dbh->bz_add_column('profiles_activity', 'id',
+ {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+
################################################################
# New --TABLE-- changes should go *** A B O V E *** this point #
################################################################
diff --git a/contrib/recode.pl b/contrib/recode.pl
index 76e10ad2c..e74e06c07 100755
--- a/contrib/recode.pl
+++ b/contrib/recode.pl
@@ -45,6 +45,7 @@ use constant SPECIAL_KEYS => {
# bugs_activity since 4.4 has a unique primary key added
bugs_activity => 'bug_id,bug_when,fieldid',
profile_setting => 'user_id,setting_name',
+ # profiles_activity since 4.4 has a unique primary key added
profiles_activity => 'userid,profiles_when,fieldid',
setting_value => 'name,value',
# longdescs didn't used to have a PK, before 2.20.