From 9afd000c14104e548c324af085d46ae48ba3d688 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Tue, 8 Apr 2014 13:43:34 +0800
Subject: revert Bug 981756: add support for "bigint unsigned" to db/schema and
 update bz_schema to reflect the current state

---
 Bugzilla/DB/Schema.pm       | 10 +++++-----
 Bugzilla/DB/Schema/Mysql.pm |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'Bugzilla/DB')

diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index e2a7e138e..d8f3e175a 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -342,13 +342,13 @@ use constant ABSTRACT_SCHEMA => {
 
     bugs_activity => {
         FIELDS => [
-            id        => {TYPE => 'BIGSERIAL', NOTNULL => 1,
+            id        => {TYPE => 'INTSERIAL', NOTNULL => 1, 
                           PRIMARYKEY => 1}, 
             bug_id    => {TYPE => 'INT3', NOTNULL => 1,
                           REFERENCES    =>  {TABLE  =>  'bugs',
                                              COLUMN =>  'bug_id',
                                              DELETE => 'CASCADE'}},
-            attach_id => {TYPE => 'INT5',
+            attach_id => {TYPE => 'INT3',
                           REFERENCES    =>  {TABLE  =>  'attachments',
                                             COLUMN  =>  'attach_id',
                                             DELETE => 'CASCADE'}},
@@ -492,7 +492,7 @@ use constant ABSTRACT_SCHEMA => {
 
     attachments => {
         FIELDS => [
-            attach_id    => {TYPE => 'BIGSERIAL', NOTNULL => 1,
+            attach_id    => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
                              PRIMARYKEY => 1},
             bug_id       => {TYPE => 'INT3', NOTNULL => 1,
                              REFERENCES    =>  {TABLE  => 'bugs',
@@ -523,7 +523,7 @@ use constant ABSTRACT_SCHEMA => {
     },
     attach_data => {
         FIELDS => [
-            id      => {TYPE => 'INT5', NOTNULL => 1,
+            id      => {TYPE => 'INT3', NOTNULL => 1,
                         PRIMARYKEY => 1,
                         REFERENCES  =>  {TABLE  => 'attachments',
                                          COLUMN => 'attach_id',
@@ -636,7 +636,7 @@ use constant ABSTRACT_SCHEMA => {
                                   REFERENCES => {TABLE  => 'bugs',
                                                  COLUMN => 'bug_id',
                                                  DELETE => 'CASCADE'}},
-            attach_id         => {TYPE => 'INT5',
+            attach_id         => {TYPE => 'INT3',
                                   REFERENCES => {TABLE  => 'attachments',
                                                  COLUMN => 'attach_id',
                                                  DELETE => 'CASCADE'}},
diff --git a/Bugzilla/DB/Schema/Mysql.pm b/Bugzilla/DB/Schema/Mysql.pm
index f2450abf1..5fc50a986 100644
--- a/Bugzilla/DB/Schema/Mysql.pm
+++ b/Bugzilla/DB/Schema/Mysql.pm
@@ -108,12 +108,10 @@ sub _initialize {
         INT2 =>         'smallint',
         INT3 =>         'mediumint',
         INT4 =>         'integer',
-        INT5 =>         'bigint unsigned',
 
         SMALLSERIAL =>  'smallint auto_increment',
         MEDIUMSERIAL => 'mediumint auto_increment',
         INTSERIAL =>    'integer auto_increment',
-        BIGSERIAL =>    'bigint unsigned auto_increment',
 
         TINYTEXT =>     'tinytext',
         MEDIUMTEXT =>   'mediumtext',
-- 
cgit v1.2.3-24-g4f1b