diff --git a/src/lib/Hydra/Schema/BuildInputs.pm b/src/lib/Hydra/Schema/BuildInputs.pm index 3ba61a46..bb9e9ad9 100644 --- a/src/lib/Hydra/Schema/BuildInputs.pm +++ b/src/lib/Hydra/Schema/BuildInputs.pm @@ -55,11 +55,6 @@ __PACKAGE__->table("BuildInputs"); data_type: 'text' is_nullable: 1 -=head2 tag - - data_type: 'text' - is_nullable: 1 - =head2 value data_type: 'text' @@ -96,8 +91,6 @@ __PACKAGE__->add_columns( { data_type => "text", is_nullable => 1 }, "revision", { data_type => "text", is_nullable => 1 }, - "tag", - { data_type => "text", is_nullable => 1 }, "value", { data_type => "text", is_nullable => 1 }, "dependency", @@ -153,7 +146,7 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07014 @ 2011-12-05 14:15:43 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yaqa9gcGx9Z+Nfr3xgX28g +# Created by DBIx::Class::Schema::Loader v0.07014 @ 2012-04-15 12:38:16 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:sav9OmLm3qA/jiK5k+KIjw 1; diff --git a/src/lib/Hydra/Schema/JobsetInputAlts.pm b/src/lib/Hydra/Schema/JobsetInputAlts.pm index 62810ae1..61c68fe4 100644 --- a/src/lib/Hydra/Schema/JobsetInputAlts.pm +++ b/src/lib/Hydra/Schema/JobsetInputAlts.pm @@ -56,11 +56,6 @@ __PACKAGE__->table("JobsetInputAlts"); data_type: 'text' is_nullable: 1 -=head2 tag - - data_type: 'text' - is_nullable: 1 - =cut __PACKAGE__->add_columns( @@ -76,8 +71,6 @@ __PACKAGE__->add_columns( { data_type => "text", is_nullable => 1 }, "revision", { data_type => "text", is_nullable => 1 }, - "tag", - { data_type => "text", is_nullable => 1 }, ); =head1 PRIMARY KEY @@ -116,7 +109,7 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07014 @ 2011-12-05 14:15:43 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jtiF1/FMZBz6iUKqIhSeVw +# Created by DBIx::Class::Schema::Loader v0.07014 @ 2012-04-15 12:38:16 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:M1pOjrCZ2RgULsIPZjN7sg 1; diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql index 7c384740..1976aeb4 100644 --- a/src/sql/hydra.sql +++ b/src/sql/hydra.sql @@ -72,7 +72,7 @@ create table JobsetInputs ( project text not null, jobset text not null, name text not null, - type text not null, -- "svn", "cvs", "path", "uri", "string", "boolean" + type text not null, -- "svn", "path", "uri", "string", "boolean" primary key (project, jobset, name), foreign key (project, jobset) references Jobsets(project, name) on delete cascade on update cascade ); @@ -86,8 +86,7 @@ create table JobsetInputAlts ( -- urgh value text, -- for most types, a URI; for 'path', an absolute path; for 'string', an arbitrary value - revision text, -- for type == 'svn' - tag text, -- for type == 'cvs' + revision text, -- for repositories primary key (project, jobset, input, altnr), foreign key (project, jobset, input) references JobsetInputs(project, jobset, name) on delete cascade on update cascade @@ -237,7 +236,6 @@ create table BuildInputs ( type text not null, uri text, revision text, - tag text, value text, dependency integer, -- build ID of the input, for type == 'build' diff --git a/src/sql/upgrade-5.sql b/src/sql/upgrade-5.sql new file mode 100644 index 00000000..df965afb --- /dev/null +++ b/src/sql/upgrade-5.sql @@ -0,0 +1,2 @@ +alter table BuildInputs drop column tag; +alter table JobsetInputAlts drop column tag;