Merge lp:~mwhudson/launchpad/recipe-db-schema into lp:launchpad/db-devel

[Michael Hudson-Doyle]

The database tables for the SourcePackageRecipe build work.

[Michael Hudson-Doyle (mwhudson)]

Hi there,

This branch adds the db schema for sourcepackagerecipes and associated things that was much discussed on the list. I've written a little code using this schema now (see lp:~mwhudson/launchpad/recipe-model-code) and it still feels more or less right and I would like to start landing code, so now seems like a good time to get this branch formally reviewed.

This presupposes a fairly boring way of representing recipes in the database -- but I think that this will be easier to change if we want to later.

Cheers,
mwh

[Muharem Hrnjadovic (al-maisan)]

Hello there!

I understood that manifests need to store the revision for each referenced branch. I don't see that detail addressed in the schema change. Or did I miss something?

[Muharem Hrnjadovic (al-maisan)]

I read through the "First cut at recipe db-schema patch" email thread again..

Just in case you plan to keep the revision data for manifests in the SourcePackageRecipeData.recipe text column: how do we distinguish between recipe and manifest data w/o looking at the .recipe content or checking that it was referenced via SourcePackageBuild.manifest?

Or is there no need for such a distinction?

[Michael Hudson-Doyle (mwhudson)]

Muharem Hrnjadovic wrote:
> I read through the "First cut at recipe db-schema patch" email thread again..
>
> Just in case you plan to keep the revision data for manifests in the SourcePackageRecipeData.recipe text column: how do we distinguish between recipe and manifest data w/o looking at the .recipe content or checking that it was referenced via SourcePackageBuild.manifest?

I guess I was expecting that you wouldn't do a big query for all
SourcePackageRecipeData rows referencing a branch and the split them
into recipe and manifest links but rather do two queries, one for
recipes referencing a branch and then one for manifests/build logs
referencing a branch. In my model code currently, there is no interface
for SourcePackageRecipeData -- it's hidden within the
SourcePackageRecipe content type.

> Or is there no need for such a distinction?

I don't really think there is.

Cheers,
mwh

[Michael Hudson-Doyle (mwhudson)]

Muharem Hrnjadovic wrote:
> Hello there!
>
> I understood that manifests need to store the revision for each referenced branch. I don't see that detail addressed in the schema change. Or did I miss something?

Oh whoops, forgot about that.

I think I'm gradually coming around to Jono's view that we'll have
fairly structured storage of the recipe in the db, so all this will
probably change quite a bit before we start using it in anger.

Cheers,
mwh

[Stuart Bishop (stub)]

I'm curious why SourcePackageRecipeData is a seperate table.

If this is a 1:1 relationship, do you have a rationale for this being a separate table?

If this is not a 1:1 relationship, how do we express this in English? A SourcePackageRecipe contains multiple recipes?

I'm happy to have the non-structured recipe column provided we don't need to do anything with it besides store it, retrieve it, and send it to builders. If the appservers need to decode it we should consider a more structured format per Jono's reported views.

SourcePackageBuild.sourcepackagename is misspelled.

The SourcePackageRecipe unique index does not match its name. Do you want (owner, distroseries, sourcepackagename, name) unique or just (distroseries, sourcepackagename, name)? I prefer ALTER TABLE ADD CONSTRAINT sourcepackagerecipe__ds__spn__name__key UNIQUE (distroseries, sourcepackagename, name) to CREATE UNIQUE INDEX, as we get a little more metadata in the DB with the former syntax (functionally, it is identical though except for some DBA operations).

It is going to need more indexes - pretty much every foreign key constraint needs an index on that column. I can add these in later if you want. We also will probably need indexes on SourcePackageBuild and SourcePackageBuildUpload to support queries required by our reports - we can add them in now if this is obvious, or leave them until later if we don't know what the selection criteria will be.

review: Resubmit (db)

[Jonathan Lange (jml)]

Michael and I had a chat on the phone. We've worked out a schema that will have a much more structured view of recipes. Should be up for review again tomorrow.

review: Resubmit

[Michael Hudson-Doyle (mwhudson)]

Hi guys, I think the patch is now ready and we'd like to land it before It will still need indexes added, but I hope stub can do that :-)

[Jonathan Lange (jml)]

 * 'name' on SPRInstruction should be NOT NULL, I think.
 * You _could_ add a constraint saying that the line number should be strictly greater than the parent's line number. Not sure if this is necessary.
 * Shouldn't SourcePackageBuild.recipe be NOT NULL?

Other than that, looks good.

review: Needs Fixing

[Michael Hudson-Doyle (mwhudson)]

* OK.
* Doesn't seem useful really
* OK.

Go again?

[Jonathan Lange (jml)]

Wuu.

review: Approve

[Stuart Bishop (stub)]

Allocated patch number is patch-2207-25-0.sql

SourcePackageRecipeDataInstruction.recipe_data should be NOT NULL

The sourcepackagerecipedatainstruction__name__recipe_data should be called
sourcepackagerecipedatainstruction__name__recipe_data__key. Similarly other unique constraints should end with __key.

Please change:

ALTER TABLE SourcePackageRecipeDataInstruction
ADD CONSTRAINT sourcepackagerecipedatainstruction__line_number__recipe_data
UNIQUE (line_number, recipe_data);

into the more useful to PostgreSQL variant:

ALTER TABLE SourcePackageRecipeDataInstruction ADD CONSTRAINT
sourcepackagerecipedatainstruction__recipe_data__line_number__key
UNIQUE (recipe_data, line_number);

sourcepackage is one word in Launchpad, so the .*source_package.* columns
need to be renamed .*sourcepackage.*.

As discussed on IRC and seen at http://pastebin.ubuntu.com/355335/, its better to make SourcepackageRecipeData reference recipe and build rather than the other way around, as we can then enforce the constraint that one and only one should be set.

Needed indexes:

CREATE INDEX sourcepackagerecipedata__base_branch__idx
ON SourcepackageRecipeData(base_branch);

CREATE INDEX sourcepackagerecipedatainstruction__branch__idx
ON SourcepackageRecipeDataInstruction(branch);

CREATE INDEX sourcepackagerecipe__registrant__idx
ON SourcepackageRecipe(registrant);

--CREATE INDEX sourcepackagerecipe__owner__idx
--ON SourcepackageRecipe(owner);

CREATE INDEX sourcepackagerecipebuild__distroseries__idx
ON SourcepackageRecipeBuild(distroseries);

CREATE INDEX sourcepackagerecipebuild__sourcepackagename__idx
ON SourcepackageRecipeBuild(sourcepackagename);

CREATE INDEX sourcepackagerecipebuild__build_log__idx
ON SourcepackageRecipeBuild(build_log) WHERE build_log IS NOT NULL;

CREATE INDEX sourcepackagerecipebuild__builder__idx
ON SourcepackageRecipeBuild(builder);

CREATE INDEX sourcepackagerecipebuild__requester__idx
ON SourcepackageRecipeBuild(requester);

CREATE INDEX sourcepackagerecipebuild__recipe__idx
ON SourcepackageRecipeBuild(recipe);

CREATE INDEX sourcepackagebuildupload__registrant__idx
ON SourcepackageRecipeBuildUpload(registrant);

review: Needs Fixing (db)

[Stuart Bishop (stub)]

I missed some indexes and one of the constraints is wrong.

CREATE INDEX sourcepackagerecipebuildupload__archive__idx
ON SourcepackageRecipeBuildUpload(archive);

CREATE INDEX sourcepackagerecipebuildupload__upload_log__idx
ON SourcepackageRecipeBuildUpload(upload_log) WHERE upload_log IS NOT NULL;

CREATE INDEX sourcepackagerelease__sourcepackage_recipe_build__idx
ON SourcepackageRelease(sourcepackage_recipe_build);

Should BuildSourcepackageFromRecipe.job be UNIQUE? If so:

ALTER TABLE BuildSourcepackageFromRecipe ADD CONSTRAINT
buildsourcepackagefromrecipe__job__key UNIQUE (job);

Otherwise:

CREATE INDEX buildsourcepackagefromrecipe__job__idx
ON BuildSourcepackageFromRecipe(job);

One of the constraints is wrong (NULL != NULL in SQL 3-value boolean). Drop:

ALTER TABLE SourcePackageRecipeData ADD CONSTRAINT
sourcepackagerecipedata__sourcepackage_recipe__sourcepackage_recipe_build__key
UNIQUE (sourcepackage_recipe, sourcepackage_recipe_build);

Replace with:

CREATE UNIQUE UNDEX sourcepackagerecipedata__sourcepackage_recipe__key
ON SourcepackageRecipeData(sourcepackage_recipe)
WHERE sourcepackage_recipe IS NOT NULL;
CREATE UNIQUE INDEX sourcepackagerecipedata__sourcepackage_recipe_build__key
ON SourcepackageRecipeData(sourcepackage_recipe_build)
WHERE sourcepackage_recipe_build IS NOT NULL;

[Stuart Bishop (stub)]

W00t

review: Approve (db)

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2010-01-11 04:46:04 +0000
+++ database/schema/comments.sql	2010-01-13 05:13:16 +0000
@@ -1288,7 +1288,69 @@
 
 COMMENT ON TABLE SourcePackageName IS 'SourcePackageName: A soyuz source package name.';
 
+-- SourcePackageRecipeData
+
+COMMENT ON TABLE SourcePackageRecipeData IS 'The database representation of a BaseRecipeBranch from bzr-builder.  Exactly one of sourcepackage_recipe or sourcepackage_recipe_build will be non-NULL.';
+COMMENT ON COLUMN SourcePackageRecipeData.base_branch IS 'The branch the recipe is based on.';
+COMMENT ON COLUMN SourcePackageRecipeData.recipe_format IS 'The format version of the recipe.';
+COMMENT ON COLUMN SourcePackageRecipeData.deb_version_template IS 'The template for the revision number of the build.';
+COMMENT ON COLUMN SourcePackageRecipeData.revspec IS 'The revision from base_branch to use.';
+COMMENT ON COLUMN SourcePackageRecipeData.sourcepackage_recipe IS 'The recipe that this data is for.';
+COMMENT ON COLUMN SourcePackageRecipeData.sourcepackage_recipe_build IS 'The build that resulted in this manifest.';
+
+-- SourcePackageRecipeDataInstruction
+
+COMMENT ON TABLE SourcePackageRecipeDataInstruction IS 'A line from the recipe, specifying a branch to nest or merge.';
+COMMENT ON COLUMN SourcePackageRecipeDataInstruction.name IS 'The name of the instruction.';
+COMMENT ON COLUMN SourcePackageRecipeDataInstruction.type IS 'The type of the instruction (MERGE == 1, NEST == 2).';
+COMMENT ON COLUMN SourcePackageRecipeDataInstruction.comment IS 'The comment from the recipe about this instruction.';
+COMMENT ON COLUMN SourcePackageRecipeDataInstruction.line_number IS 'The line number of the instruction in the recipe.';
+COMMENT ON COLUMN SourcePackageRecipeDataInstruction.branch IS 'The branch being merged or nested.';
+COMMENT ON COLUMN SourcePackageRecipeDataInstruction.revspec IS 'The revision of the branch to use.';
+COMMENT ON COLUMN SourcePackageRecipeDataInstruction.directory IS 'The location to nest at, if this is a nest instruction.';
+COMMENT ON COLUMN SourcePackageRecipeDataInstruction.recipe_data IS 'The SourcePackageRecipeData this instruction is part of.';
+COMMENT ON COLUMN SourcePackageRecipeDataInstruction.parent_instruction IS 'The nested branch this instruction applies to, or NULL for a top-level instruction.';
+
+-- SourcePackageRecipe
+
+COMMENT ON TABLE SourcePackageRecipe IS 'A recipe for assembling a source package from branches.';
+COMMENT ON COLUMN SourcePackageRecipe.registrant IS 'The person who created this recipe.';
+COMMENT ON COLUMN SourcePackageRecipe.owner IS 'The person or team who can edit this recipe.';
+COMMENT ON COLUMN SourcePackageRecipe.distroseries IS 'The distroseries this recipe builds a package for.';
+COMMENT ON COLUMN SourcePackageRecipe.sourcepackagename IS 'The name of the source package this recipe builds.';
+COMMENT ON COLUMN SourcePackageRecipe.name IS 'The name of the recipe in the web/URL.';
+
+-- SourcePackageRecipeBuild
+
+COMMENT ON TABLE SourcePackageRecipeBuild IS 'The build record for the process of building a source package as described by a recipe.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.distroseries IS 'The distroseries the build was for.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.sourcepackagename IS 'The name of the source package that was built.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.build_state IS 'The state of the build.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.date_built IS 'When the build record was processed.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.build_duration IS 'How long this build took to be processed.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.build_log IS 'Points to the build_log file stored in librarian.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.builder IS 'Points to the builder which has once processed it.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.date_first_dispatched IS 'The instant the build was dispatched the first time. This value will not get overridden if the build is retried.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.requester IS 'Who requested the build.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.recipe IS 'The recipe being processed.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.archive IS 'The archive the source package will be uploaded to.';
+
+-- SourcePackageRecipeBuildUpload
+
+COMMENT ON TABLE SourcePackageRecipeBuildUpload IS 'The record of uploading the source package built by a SourcePackageRecipeBuild to an archive.';
+COMMENT ON COLUMN SourcePackageRecipeBuildUpload.registrant IS 'Who requested the upload.';
+COMMENT ON COLUMN SourcePackageRecipeBuildUpload.sourcepackage_recipe_build IS 'Upload the output of this build.';
+COMMENT ON COLUMN SourcePackageRecipeBuildUpload.archive IS 'The archive to upload to.';
+COMMENT ON COLUMN SourcePackageRecipeBuildUpload.upload_log IS 'The output from uploading the source package to the archive.';
+COMMENT ON COLUMN SourcePackageRecipeBuildUpload.state IS 'The state of the upload.';
+
+-- SourcePackageRecipeBuildJob
+
+COMMENT ON TABLE SourcePackageRecipeBuildJob IS 'The link between a SourcePackageRecipeBuild row and a Job row to schedule a build of a source package recipe.';
+COMMENT ON COLUMN SourcePackageRecipeBuildJob.sourcepackage_recipe_build IS 'The build record describing the package being built.';
+
 -- Specification
+
 COMMENT ON TABLE Specification IS 'A feature specification. At the moment we do not store the actual specification, we store a URL for the spec, which is managed in a wiki somewhere else. We store the overall state of the spec, as well as queueing information about who needs to review the spec, and why.';
 COMMENT ON COLUMN Specification.assignee IS 'The person who has been assigned to implement this specification.';
 COMMENT ON COLUMN Specification.drafter IS 'The person who has been asked to draft this specification. They are responsible for getting the spec to "approved" state.';

=== added file 'database/schema/patch-2207-25-0.sql'
--- database/schema/patch-2207-25-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2207-25-0.sql	2010-01-13 05:13:16 +0000
@@ -0,0 +1,149 @@
+SET client_min_messages=ERROR;
+
+CREATE TABLE SourcePackageRecipe (
+    id serial PRIMARY KEY,
+    date_created timestamp without time zone DEFAULT timezone('UTC'::text, now()) NOT NULL,
+    date_last_modified timestamp without time zone DEFAULT timezone('UTC'::text, now()) NOT NULL,
+    registrant integer NOT NULL REFERENCES Person,
+    owner integer NOT NULL REFERENCES Person,
+    distroseries integer NOT NULL REFERENCES DistroSeries,
+    sourcepackagename integer NOT NULL REFERENCES SourcePackageName,
+    name text NOT NULL
+);
+
+ALTER TABLE SourcePackageRecipe ADD CONSTRAINT sourcepackagerecipe__owner__distroseries__sourcepackagename__name__key
+     UNIQUE (owner, distroseries, sourcepackagename, name);
+
+CREATE TABLE SourcePackageRecipeBuild (
+    id serial PRIMARY KEY,
+    -- most of this is just copied from Build
+
+    -- I've dropped: processor, sourcepackagerelease, pocket, dependencies
+    -- changed: distroarchseries to distroseries
+    -- added: recipe and manifest
+    date_created timestamp without time zone DEFAULT timezone('UTC'::text, ('now'::text)::timestamp(6) with time zone) NOT NULL,
+    distroseries integer NOT NULL REFERENCES distroseries,
+    sourcepackagename integer NOT NULL REFERENCES SourcePackageName,
+    build_state integer NOT NULL,
+    date_built timestamp without time zone,
+    build_duration interval,
+    build_log integer REFERENCES libraryfilealias,
+    builder integer REFERENCES builder,
+    date_first_dispatched timestamp without time zone,
+    requester integer NOT NULL REFERENCES Person,
+    recipe integer REFERENCES SourcePackageRecipe NOT NULL,
+    archive integer NOT NULL REFERENCES Archive
+);
+
+CREATE TABLE SourcePackageRecipeBuildUpload (
+    id serial PRIMARY KEY,
+    date_created timestamp without time zone DEFAULT timezone('UTC'::text, ('now'::text)::timestamp(6) with time zone) NOT NULL,
+    registrant integer NOT NULL REFERENCES Person,
+    sourcepackage_recipe_build integer NOT NULL REFERENCES SourcePackageRecipeBuild,
+    archive integer NOT NULL REFERENCES Archive,
+    upload_log integer REFERENCES LibraryFileAlias,
+    state integer NOT NULL -- an enum, WAITING/UPLOADED/FAILED or something like that.
+);
+
+-- indexes for SourcePackageRecipeBuildUpload I guess
+
+ALTER TABLE SourcePackageRelease
+  ADD COLUMN sourcepackage_recipe_build integer REFERENCES SourcePackageRecipeBuild;
+
+CREATE TABLE SourcePackageRecipeBuildJob (
+    id serial PRIMARY KEY,
+    job integer NOT NULL REFERENCES Job,
+    sourcepackage_recipe_build integer REFERENCES SourcePackageRecipeBuild
+);
+
+ALTER TABLE SourcePackageRecipeBuildJob ADD CONSTRAINT sourcepackagerecipebuildjob__sourcepackage_recipe_build__key
+    UNIQUE (sourcepackage_recipe_build);
+
+ALTER TABLE SourcePackageRecipeBuildJob ADD CONSTRAINT sourcepackagerecipebuildjob__job__key
+    UNIQUE (job);
+
+CREATE TABLE SourcePackageRecipeData (
+    id serial PRIMARY KEY,
+    base_branch integer NOT NULL REFERENCES Branch,
+    recipe_format text NOT NULL,
+    deb_version_template text NOT NULL,
+    revspec text,
+    sourcepackage_recipe integer REFERENCES SourcePackageRecipe,
+    sourcepackage_recipe_build integer REFERENCES SourcePackageRecipeBuild
+);
+
+ALTER TABLE SourcePackageRecipeData ADD CONSTRAINT sourcepackagerecipedata__recipe_or_build_is_not_null
+    CHECK (sourcepackage_recipe IS NULL != sourcepackage_recipe_build IS NULL);
+CREATE UNIQUE INDEX sourcepackagerecipedata__sourcepackage_recipe__key
+    ON SourcepackageRecipeData(sourcepackage_recipe)
+ WHERE sourcepackage_recipe IS NOT NULL;
+CREATE UNIQUE INDEX sourcepackagerecipedata__sourcepackage_recipe_build__key
+    ON SourcepackageRecipeData(sourcepackage_recipe_build)
+ WHERE sourcepackage_recipe_build IS NOT NULL;
+
+CREATE TABLE SourcePackageRecipeDataInstruction (
+    id serial PRIMARY KEY,
+    name text NOT NULL,
+    type integer NOT NULL, -- MERGE == 1, NEST == 2
+    comment text,
+    line_number integer NOT NULL,
+    branch integer NOT NULL REFERENCES Branch,
+    revspec text,
+    directory text,
+    recipe_data integer NOT NULL REFERENCES SourcePackageRecipeData,
+    parent_instruction integer REFERENCES SourcePackageRecipeDataInstruction
+);
+
+ALTER TABLE SourcePackageRecipeDataInstruction ADD CONSTRAINT sourcepackagerecipedatainstruction__name__recipe_data__key
+     UNIQUE (name, recipe_data);
+ALTER TABLE SourcePackageRecipeDataInstruction ADD CONSTRAINT sourcepackagerecipedatainstruction__recipe_data__line_number__key
+     UNIQUE (recipe_data, line_number);
+ALTER TABLE SourcePackageRecipeDataInstruction ADD CONSTRAINT sourcepackagerecipedatainstruction__directory_not_null
+     CHECK ((type = 1 AND directory IS NULL) OR (type = 2 AND directory IS NOT NULL));
+
+CREATE INDEX sourcepackagerecipedata__base_branch__idx
+ON SourcepackageRecipeData(base_branch);
+
+CREATE INDEX sourcepackagerecipedatainstruction__branch__idx
+ON SourcepackageRecipeDataInstruction(branch);
+
+CREATE INDEX sourcepackagerecipe__registrant__idx
+ON SourcepackageRecipe(registrant);
+
+--CREATE INDEX sourcepackagerecipe__owner__idx
+--ON SourcepackageRecipe(owner);
+
+CREATE INDEX sourcepackagerecipebuild__distroseries__idx
+ON SourcepackageRecipeBuild(distroseries);
+
+CREATE INDEX sourcepackagerecipebuild__sourcepackagename__idx
+ON SourcepackageRecipeBuild(sourcepackagename);
+
+CREATE INDEX sourcepackagerecipebuild__build_log__idx
+ON SourcepackageRecipeBuild(build_log) WHERE build_log IS NOT NULL;
+
+CREATE INDEX sourcepackagerecipebuild__builder__idx
+ON SourcepackageRecipeBuild(builder);
+
+CREATE INDEX sourcepackagerecipebuild__requester__idx
+ON SourcepackageRecipeBuild(requester);
+
+CREATE INDEX sourcepackagerecipebuild__recipe__idx
+ON SourcepackageRecipeBuild(recipe);
+
+CREATE INDEX sourcepackagerecipebuild__archive__idx
+ON SourcepackageRecipeBuild(archive);
+
+CREATE INDEX sourcepackagebuildupload__registrant__idx
+ON SourcepackageRecipeBuildUpload(registrant);
+
+CREATE INDEX sourcepackagerecipebuildupload__archive__idx
+ON SourcepackageRecipeBuildUpload(archive);
+
+CREATE INDEX sourcepackagerecipebuildupload__upload_log__idx
+ON SourcepackageRecipeBuildUpload(upload_log) WHERE upload_log IS NOT NULL;
+
+CREATE INDEX sourcepackagerelease__sourcepackage_recipe_build__idx
+ON SourcepackageRelease(sourcepackage_recipe_build);
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 25, 0);

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-01-06 14:25:01 +0000
+++ database/schema/security.cfg	2010-01-13 05:13:16 +0000
@@ -275,6 +275,11 @@
 public.sourcepackagepublishinghistory   = SELECT
 public.seriessourcepackagebranch        = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackageformatselection     = SELECT
+public.sourcepackagerecipe              = SELECT, INSERT, UPDATE, DELETE
+public.sourcepackagerecipebuild         = SELECT, INSERT, UPDATE, DELETE
+public.sourcepackagerecipebuildupload   = SELECT, INSERT, UPDATE, DELETE
+public.sourcepackagerecipedata          = SELECT, INSERT, UPDATE, DELETE
+public.sourcepackagerecipedatainstruction = SELECT, INSERT, UPDATE, DELETE
 public.specificationbranch              = SELECT, INSERT, UPDATE, DELETE
 public.specificationbug                 = SELECT, INSERT, DELETE
 public.specificationdependency          = SELECT, INSERT, DELETE
@@ -403,6 +408,8 @@
 public.shippingrun                      = SELECT
 public.sprint                           = SELECT
 public.sourcepackagereleasefile         = SELECT
+public.sourcepackagerecipebuild         = SELECT
+public.sourcepackagerecipebuildupload   = SELECT
 public.temporaryblobstorage             = SELECT, DELETE
 public.translationimportqueueentry      = SELECT
 

=== modified file 'lib/lp/code/doc/branch.txt'
--- lib/lp/code/doc/branch.txt	2009-12-10 04:38:46 +0000
+++ lib/lp/code/doc/branch.txt	2010-01-13 05:13:16 +0000
@@ -601,6 +601,8 @@
     productseries.branch
     productseries.translations_branch
     seriessourcepackagebranch.branch
+    sourcepackagerecipedata.base_branch
+    sourcepackagerecipedatainstruction.branch
     specificationbranch.branch
 
 (Unfortunately, references can form a cycle-- note that codereviewcomments

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2009-12-11 00:56:16 +0000
+++ lib/lp/code/model/branch.py	2010-01-13 05:13:16 +0000
@@ -613,6 +613,7 @@
         series_set = getUtility(IFindOfficialBranchLinks)
         alteration_operations.extend(
             map(ClearOfficialPackageBranch, series_set.findForBranch(self)))
+        # XXX MichaelHudson 2010-01-13: Handle sourcepackagerecipes here.
         return (alteration_operations, deletion_operations)
 
     def deletionRequirements(self):

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2010-01-07 06:27:46 +0000
+++ lib/lp/registry/model/person.py	2010-01-13 05:13:16 +0000
@@ -2838,6 +2838,8 @@
             (decorator_table.lower(), person_pointer_column.lower()))
 
     def _mergeBranches(self, cur, from_id, to_id):
+        # XXX MichaelHudson 2010-01-13 bug=506630: This code does not account
+        # for package branches.
         cur.execute('''
             SELECT product, name FROM Branch WHERE owner = %(to_id)d
             ''' % vars())
@@ -3348,6 +3350,10 @@
         self._mergeBranches(cur, from_id, to_id)
         skip.append(('branch','owner'))
 
+        # XXX MichaelHudson 2010-01-13: Write _mergeSourcePackageRecipes!
+        #self._mergeSourcePackageRecipes(cur, from_id, to_id))
+        skip.append(('sourcepackagerecipe','owner'))
+
         self._mergeMailingListSubscriptions(cur, from_id, to_id)
         skip.append(('mailinglistsubscription', 'person'))