← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~stevenk/launchpad/db-revert-r11232 into lp:launchpad/db-devel

 

Steve Kowalik has proposed merging lp:~stevenk/launchpad/db-revert-r11232 into lp:launchpad/db-devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/db-revert-r11232/+merge/86190

Revert r11232. It broke buildbot.
-- 
https://code.launchpad.net/~stevenk/launchpad/db-revert-r11232/+merge/86190
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/db-revert-r11232 into lp:launchpad/db-devel.
=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2011-12-16 14:43:44 +0000
+++ database/sampledata/current-dev.sql	2011-12-19 05:34:25 +0000
@@ -1,6 +1,6 @@
 -- Copyright 2010-2011 Canonical Ltd.  This software is licensed under the
 -- GNU Affero General Public License version 3 (see the file LICENSE).
--- Created using pg_dump (PostgreSQL) 8.4.9
+-- Created using pg_dump (PostgreSQL) 8.4.8
 
 SET check_function_bodies = false;
 SET client_encoding = 'UTF8';
@@ -5752,13 +5752,6 @@
 ALTER TABLE messagechunk ENABLE TRIGGER ALL;
 
 
-ALTER TABLE milestonetag DISABLE TRIGGER ALL;
-
-
-
-ALTER TABLE milestonetag ENABLE TRIGGER ALL;
-
-
 ALTER TABLE mirror DISABLE TRIGGER ALL;
 
 

=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2011-12-16 14:43:44 +0000
+++ database/sampledata/current.sql	2011-12-19 05:34:25 +0000
@@ -1,6 +1,6 @@
 -- Copyright 2010-2011 Canonical Ltd.  This software is licensed under the
 -- GNU Affero General Public License version 3 (see the file LICENSE).
--- Created using pg_dump (PostgreSQL) 8.4.9
+-- Created using pg_dump (PostgreSQL) 8.4.8
 
 SET check_function_bodies = false;
 SET client_encoding = 'UTF8';
@@ -5682,13 +5682,6 @@
 ALTER TABLE messagechunk ENABLE TRIGGER ALL;
 
 
-ALTER TABLE milestonetag DISABLE TRIGGER ALL;
-
-
-
-ALTER TABLE milestonetag ENABLE TRIGGER ALL;
-
-
 ALTER TABLE mirror DISABLE TRIGGER ALL;
 
 

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2011-12-14 19:18:02 +0000
+++ database/schema/comments.sql	2011-12-19 05:34:25 +0000
@@ -2425,8 +2425,3 @@
 'OpenId Identifiers that can be used to log into an Account.';
 COMMENT ON COLUMN OpenIdIdentifier.identifier IS
 'OpenId Identifier. This should be a URL, but is currently just a token that can be used to generate the Identity URL for the Canonical SSO OpenId Provider.';
-
--- MilestoneTag
-COMMENT ON TABLE milestonetag IS 'Attaches simple text tags to a milestone.';
-COMMENT ON COLUMN milestonetag.milestone IS 'The milestone the tag is attached to.';
-COMMENT ON COLUMN milestonetag.tag IS 'The text representation of the tag.';

=== removed file 'database/schema/patch-2209-00-3.sql'
--- database/schema/patch-2209-00-3.sql	2011-12-16 14:23:36 +0000
+++ database/schema/patch-2209-00-3.sql	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
--- Copyright 2011 Canonical Ltd.  This software is licensed under the
--- GNU Affero General Public License version 3 (see the file LICENSE).
-
-SET client_min_messages=ERROR;
-
-CREATE TABLE milestonetag (
-    id SERIAL PRIMARY KEY,
-    milestone integer NOT NULL REFERENCES milestone ON DELETE CASCADE,
-    tag text NOT NULL,
-    date_created timestamp without time zone DEFAULT
-        timezone('UTC'::text, now()) NOT NULL,
-    created_by integer NOT NULL REFERENCES person,
-    CONSTRAINT valid_tag CHECK (valid_name(tag))
-);
-
-ALTER TABLE ONLY milestonetag
-    ADD CONSTRAINT milestonetag__tag__milestone__key UNIQUE (tag, milestone);
-
-CREATE INDEX milestonetag__milestones_idx
-    ON milestonetag USING btree (milestone);
-
-INSERT INTO LaunchpadDatabaseRevision VALUES (2209, 0, 3);

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2011-12-16 14:43:44 +0000
+++ database/schema/security.cfg	2011-12-19 05:34:25 +0000
@@ -223,7 +223,6 @@
 public.messageapproval                  = SELECT, INSERT, UPDATE, DELETE
 public.messagechunk                     = SELECT, INSERT
 public.milestone                        = SELECT, INSERT, UPDATE, DELETE
-public.milestonetag                     = SELECT, INSERT, DELETE
 public.mirrorcdimagedistroseries        = SELECT, INSERT, DELETE
 public.mirrordistroarchseries           = SELECT, INSERT, DELETE, UPDATE
 public.mirrordistroseriessource         = SELECT, INSERT, UPDATE, DELETE
@@ -594,7 +593,6 @@
 public.message                          = SELECT, INSERT
 public.messagechunk                     = SELECT, INSERT
 public.milestone                        = SELECT
-public.milestonetag                     = SELECT
 public.person                           = SELECT, INSERT, UPDATE
 public.personlanguage                   = SELECT
 public.personsettings                   = SELECT, INSERT
@@ -653,7 +651,6 @@
 public.karmaaction                        = SELECT
 public.message                            = SELECT, INSERT
 public.messagechunk                       = SELECT, INSERT
-public.milestonetag                       = SELECT
 public.person                             = SELECT
 public.revision                           = SELECT, INSERT, UPDATE
 public.revisionauthor                     = SELECT, INSERT, UPDATE
@@ -867,7 +864,6 @@
 public.message                          = SELECT, INSERT
 public.messagechunk                     = SELECT, INSERT
 public.milestone                        = SELECT
-public.milestonetag                     = SELECT
 public.packagecopyjob                   = SELECT, INSERT, DELETE
 public.packagecopyrequest               = SELECT, INSERT, UPDATE
 public.packagediff                      = SELECT, INSERT, UPDATE
@@ -1307,7 +1303,6 @@
 public.message                          = SELECT, INSERT
 public.messagechunk                     = SELECT, INSERT
 public.milestone                        = SELECT
-public.milestonetag                     = SELECT
 public.packagebuild                     = SELECT, INSERT, UPDATE
 public.packagecopyjob                   = SELECT, INSERT
 public.packagediff                      = SELECT, INSERT, UPDATE, DELETE
@@ -1411,7 +1406,6 @@
 public.message                          = SELECT, INSERT
 public.messagechunk                     = SELECT, INSERT
 public.milestone                        = SELECT
-public.milestonetag                     = SELECT
 public.packagebuild                     = SELECT, INSERT, UPDATE
 public.packagecopyjob                   = SELECT, INSERT, UPDATE
 public.packagediff                      = SELECT, UPDATE
@@ -1510,7 +1504,6 @@
 public.message                          = SELECT, INSERT
 public.messagechunk                     = SELECT, INSERT
 public.milestone                        = SELECT
-public.milestonetag                     = SELECT
 public.person                           = SELECT
 public.personlanguage                   = SELECT
 public.personsettings                   = SELECT
@@ -1715,7 +1708,6 @@
 public.message                          = SELECT, INSERT
 public.messagechunk                     = SELECT, INSERT
 public.milestone                        = SELECT
-public.milestonetag                     = SELECT, INSERT, DELETE
 public.packageset                       = SELECT
 public.packagesetgroup                  = SELECT
 public.packagesetinclusion              = SELECT
@@ -1956,7 +1948,6 @@
 public.job                              = SELECT, INSERT, UPDATE
 public.message                          = SELECT, INSERT
 public.messagechunk                     = SELECT, INSERT
-public.milestonetag                     = SELECT
 public.person                           = SELECT, INSERT
 public.personsettings                   = SELECT, INSERT
 public.product                          = SELECT, INSERT, UPDATE
@@ -2157,7 +2148,6 @@
 public.job                              = SELECT, INSERT, DELETE
 public.logintoken                       = SELECT, DELETE
 public.mailinglistsubscription          = SELECT, DELETE
-public.milestonetag                     = SELECT
 public.oauthnonce                       = SELECT, DELETE
 public.openidconsumerassociation        = SELECT, DELETE
 public.openidconsumernonce              = SELECT, DELETE