From 397d13a3000b3b8cf626c68fa39276a98d932b0a Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 26 Aug 2021 12:03:00 -0400 Subject: [PATCH] DBIx::Class: migrate to use_namespaces This gives us a place to put helper functions that act on entire tables, not just individual records. This should be a backwards compatible change, except in places we're manually using result class names. --- src/lib/Hydra/Schema.pm | 6 +- .../{ => Result}/AggregateConstituents.pm | 16 ++-- .../Hydra/Schema/{ => Result}/BuildInputs.pm | 16 ++-- .../Hydra/Schema/{ => Result}/BuildMetrics.pm | 20 ++--- .../Hydra/Schema/{ => Result}/BuildOutputs.pm | 12 +-- .../Schema/{ => Result}/BuildProducts.pm | 12 +-- .../Schema/{ => Result}/BuildStepOutputs.pm | 16 ++-- .../Hydra/Schema/{ => Result}/BuildSteps.pm | 20 ++--- src/lib/Hydra/Schema/{ => Result}/Builds.pm | 74 +++++++++---------- .../Schema/{ => Result}/CachedBazaarInputs.pm | 8 +- .../Schema/{ => Result}/CachedCVSInputs.pm | 8 +- .../Schema/{ => Result}/CachedDarcsInputs.pm | 8 +- .../Schema/{ => Result}/CachedGitInputs.pm | 8 +- .../Schema/{ => Result}/CachedHgInputs.pm | 8 +- .../Schema/{ => Result}/CachedPathInputs.pm | 8 +- .../{ => Result}/CachedSubversionInputs.pm | 8 +- .../Schema/{ => Result}/EvaluationErrors.pm | 12 +-- .../Hydra/Schema/{ => Result}/FailedPaths.pm | 8 +- .../Schema/{ => Result}/JobsetEvalInputs.pm | 16 ++-- .../Schema/{ => Result}/JobsetEvalMembers.pm | 16 ++-- .../Hydra/Schema/{ => Result}/JobsetEvals.pm | 26 +++---- .../Schema/{ => Result}/JobsetInputAlts.pm | 12 +-- .../Hydra/Schema/{ => Result}/JobsetInputs.pm | 16 ++-- .../Schema/{ => Result}/JobsetRenames.pm | 16 ++-- src/lib/Hydra/Schema/{ => Result}/Jobsets.pm | 44 +++++------ .../Hydra/Schema/{ => Result}/NewsItems.pm | 12 +-- src/lib/Hydra/Schema/{ => Result}/NrBuilds.pm | 8 +- .../Schema/{ => Result}/ProjectMembers.pm | 16 ++-- src/lib/Hydra/Schema/{ => Result}/Projects.pm | 36 ++++----- .../Schema/{ => Result}/SchemaVersion.pm | 8 +- .../Hydra/Schema/{ => Result}/StarredJobs.pm | 20 ++--- .../Hydra/Schema/{ => Result}/SystemStatus.pm | 8 +- .../Hydra/Schema/{ => Result}/SystemTypes.pm | 8 +- .../Hydra/Schema/{ => Result}/UriRevMapper.pm | 8 +- .../Hydra/Schema/{ => Result}/UserRoles.pm | 12 +-- src/lib/Hydra/Schema/{ => Result}/Users.pm | 28 +++---- src/lib/Makefile.am | 2 + src/sql/update-dbix.pl | 1 + 38 files changed, 292 insertions(+), 289 deletions(-) rename src/lib/Hydra/Schema/{ => Result}/AggregateConstituents.pm (77%) rename src/lib/Hydra/Schema/{ => Result}/BuildInputs.pm (87%) rename src/lib/Hydra/Schema/{ => Result}/BuildMetrics.pm (82%) rename src/lib/Hydra/Schema/{ => Result}/BuildOutputs.pm (80%) rename src/lib/Hydra/Schema/{ => Result}/BuildProducts.pm (86%) rename src/lib/Hydra/Schema/{ => Result}/BuildStepOutputs.pm (80%) rename src/lib/Hydra/Schema/{ => Result}/BuildSteps.pm (87%) rename src/lib/Hydra/Schema/{ => Result}/Builds.pm (84%) rename src/lib/Hydra/Schema/{ => Result}/CachedBazaarInputs.pm (82%) rename src/lib/Hydra/Schema/{ => Result}/CachedCVSInputs.pm (85%) rename src/lib/Hydra/Schema/{ => Result}/CachedDarcsInputs.pm (84%) rename src/lib/Hydra/Schema/{ => Result}/CachedGitInputs.pm (85%) rename src/lib/Hydra/Schema/{ => Result}/CachedHgInputs.pm (84%) rename src/lib/Hydra/Schema/{ => Result}/CachedPathInputs.pm (83%) rename src/lib/Hydra/Schema/{ => Result}/CachedSubversionInputs.pm (81%) rename src/lib/Hydra/Schema/{ => Result}/EvaluationErrors.pm (79%) rename src/lib/Hydra/Schema/{ => Result}/FailedPaths.pm (77%) rename src/lib/Hydra/Schema/{ => Result}/JobsetEvalInputs.pm (85%) rename src/lib/Hydra/Schema/{ => Result}/JobsetEvalMembers.pm (78%) rename src/lib/Hydra/Schema/{ => Result}/JobsetEvals.pm (84%) rename src/lib/Hydra/Schema/{ => Result}/JobsetInputAlts.pm (83%) rename src/lib/Hydra/Schema/{ => Result}/JobsetInputs.pm (84%) rename src/lib/Hydra/Schema/{ => Result}/JobsetRenames.pm (78%) rename src/lib/Hydra/Schema/{ => Result}/Jobsets.pm (87%) rename src/lib/Hydra/Schema/{ => Result}/NewsItems.pm (82%) rename src/lib/Hydra/Schema/{ => Result}/NrBuilds.pm (80%) rename src/lib/Hydra/Schema/{ => Result}/ProjectMembers.pm (77%) rename src/lib/Hydra/Schema/{ => Result}/Projects.pm (82%) rename src/lib/Hydra/Schema/{ => Result}/SchemaVersion.pm (74%) rename src/lib/Hydra/Schema/{ => Result}/StarredJobs.pm (79%) rename src/lib/Hydra/Schema/{ => Result}/SystemStatus.pm (79%) rename src/lib/Hydra/Schema/{ => Result}/SystemTypes.pm (79%) rename src/lib/Hydra/Schema/{ => Result}/UriRevMapper.pm (79%) rename src/lib/Hydra/Schema/{ => Result}/UserRoles.pm (77%) rename src/lib/Hydra/Schema/{ => Result}/Users.pm (86%) diff --git a/src/lib/Hydra/Schema.pm b/src/lib/Hydra/Schema.pm index 6533cd06..5e252621 100644 --- a/src/lib/Hydra/Schema.pm +++ b/src/lib/Hydra/Schema.pm @@ -9,11 +9,11 @@ use warnings; use base 'DBIx::Class::Schema'; -__PACKAGE__->load_classes; +__PACKAGE__->load_namespaces; -# Created by DBIx::Class::Schema::Loader v0.07014 @ 2011-12-05 14:08:56 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BpPjKT5Pb1RYMHo+oKdZ+w +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:SW2xMZ1YBA/LJSnP+ClOfA # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/AggregateConstituents.pm b/src/lib/Hydra/Schema/Result/AggregateConstituents.pm similarity index 77% rename from src/lib/Hydra/Schema/AggregateConstituents.pm rename to src/lib/Hydra/Schema/Result/AggregateConstituents.pm index c4de2170..3d1e1c7d 100644 --- a/src/lib/Hydra/Schema/AggregateConstituents.pm +++ b/src/lib/Hydra/Schema/Result/AggregateConstituents.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::AggregateConstituents; +package Hydra::Schema::Result::AggregateConstituents; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::AggregateConstituents +Hydra::Schema::Result::AggregateConstituents =cut @@ -76,13 +76,13 @@ __PACKAGE__->set_primary_key("aggregate", "constituent"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "aggregate", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { id => "aggregate" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); @@ -91,20 +91,20 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "constituent", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { id => "constituent" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:bQfQoSstlaFy7zw8i1R+ow +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ksBE6gQqcu58rdZfbqEK/w # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/BuildInputs.pm b/src/lib/Hydra/Schema/Result/BuildInputs.pm similarity index 87% rename from src/lib/Hydra/Schema/BuildInputs.pm rename to src/lib/Hydra/Schema/Result/BuildInputs.pm index 65b936b1..44c6199a 100644 --- a/src/lib/Hydra/Schema/BuildInputs.pm +++ b/src/lib/Hydra/Schema/Result/BuildInputs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::BuildInputs; +package Hydra::Schema::Result::BuildInputs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::BuildInputs +Hydra::Schema::Result::BuildInputs =cut @@ -145,13 +145,13 @@ __PACKAGE__->set_primary_key("id"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "build", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { id => "build" }, { is_deferrable => 0, @@ -165,13 +165,13 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "dependency", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { id => "dependency" }, { is_deferrable => 0, @@ -182,8 +182,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/Fwb8emBsvwrZlEab2X+gQ +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:IBNdR4VPMGusDQex5omT+g my %hint = ( columns => [ diff --git a/src/lib/Hydra/Schema/BuildMetrics.pm b/src/lib/Hydra/Schema/Result/BuildMetrics.pm similarity index 82% rename from src/lib/Hydra/Schema/BuildMetrics.pm rename to src/lib/Hydra/Schema/Result/BuildMetrics.pm index 2e5d6c6a..d842df91 100644 --- a/src/lib/Hydra/Schema/BuildMetrics.pm +++ b/src/lib/Hydra/Schema/Result/BuildMetrics.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::BuildMetrics; +package Hydra::Schema::Result::BuildMetrics; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::BuildMetrics +Hydra::Schema::Result::BuildMetrics =cut @@ -119,13 +119,13 @@ __PACKAGE__->set_primary_key("build", "name"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "build", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { id => "build" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); @@ -134,13 +134,13 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "jobset", - "Hydra::Schema::Jobsets", + "Hydra::Schema::Result::Jobsets", { name => "jobset", project => "project" }, { is_deferrable => 0, on_delete => "NO ACTION", on_update => "CASCADE" }, ); @@ -149,20 +149,20 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "project", - "Hydra::Schema::Projects", + "Hydra::Schema::Result::Projects", { name => "project" }, { is_deferrable => 0, on_delete => "NO ACTION", on_update => "CASCADE" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-05-27 17:40:41 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AYUVs6RdefFKw+g9Yxcu/A +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yp/kl6bkrm/CSEle7Y3How sub json_hint { return { columns => ['value', 'unit'] }; diff --git a/src/lib/Hydra/Schema/BuildOutputs.pm b/src/lib/Hydra/Schema/Result/BuildOutputs.pm similarity index 80% rename from src/lib/Hydra/Schema/BuildOutputs.pm rename to src/lib/Hydra/Schema/Result/BuildOutputs.pm index 4a2b00f7..9fc4f7c7 100644 --- a/src/lib/Hydra/Schema/BuildOutputs.pm +++ b/src/lib/Hydra/Schema/Result/BuildOutputs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::BuildOutputs; +package Hydra::Schema::Result::BuildOutputs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::BuildOutputs +Hydra::Schema::Result::BuildOutputs =cut @@ -82,20 +82,20 @@ __PACKAGE__->set_primary_key("build", "name"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "build", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { id => "build" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:71R9clwAP6vzDh10EukTaw +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gU+kZ6A0ISKpaXGRGve8mg my %hint = ( columns => [ diff --git a/src/lib/Hydra/Schema/BuildProducts.pm b/src/lib/Hydra/Schema/Result/BuildProducts.pm similarity index 86% rename from src/lib/Hydra/Schema/BuildProducts.pm rename to src/lib/Hydra/Schema/Result/BuildProducts.pm index 788cc390..8f25b4f9 100644 --- a/src/lib/Hydra/Schema/BuildProducts.pm +++ b/src/lib/Hydra/Schema/Result/BuildProducts.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::BuildProducts; +package Hydra::Schema::Result::BuildProducts; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::BuildProducts +Hydra::Schema::Result::BuildProducts =cut @@ -124,20 +124,20 @@ __PACKAGE__->set_primary_key("build", "productnr"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "build", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { id => "build" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-07-27 18:21:03 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:O4R8b/GukNaUmmAErb3Jlw +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6vyZPg5I2zbgpw1a6JsVjw my %hint = ( columns => [ diff --git a/src/lib/Hydra/Schema/BuildStepOutputs.pm b/src/lib/Hydra/Schema/Result/BuildStepOutputs.pm similarity index 80% rename from src/lib/Hydra/Schema/BuildStepOutputs.pm rename to src/lib/Hydra/Schema/Result/BuildStepOutputs.pm index 19034c9b..016a35fe 100644 --- a/src/lib/Hydra/Schema/BuildStepOutputs.pm +++ b/src/lib/Hydra/Schema/Result/BuildStepOutputs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::BuildStepOutputs; +package Hydra::Schema::Result::BuildStepOutputs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::BuildStepOutputs +Hydra::Schema::Result::BuildStepOutputs =cut @@ -92,13 +92,13 @@ __PACKAGE__->set_primary_key("build", "stepnr", "name"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "build", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { id => "build" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); @@ -107,20 +107,20 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "buildstep", - "Hydra::Schema::BuildSteps", + "Hydra::Schema::Result::BuildSteps", { build => "build", stepnr => "stepnr" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Y6DpbTM6z4cOGoYIhD3i1A +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gxp8rOjpRVen4YbIjomHTw # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/BuildSteps.pm b/src/lib/Hydra/Schema/Result/BuildSteps.pm similarity index 87% rename from src/lib/Hydra/Schema/BuildSteps.pm rename to src/lib/Hydra/Schema/Result/BuildSteps.pm index dd6a4dbf..02e4e8c1 100644 --- a/src/lib/Hydra/Schema/BuildSteps.pm +++ b/src/lib/Hydra/Schema/Result/BuildSteps.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::BuildSteps; +package Hydra::Schema::Result::BuildSteps; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::BuildSteps +Hydra::Schema::Result::BuildSteps =cut @@ -168,13 +168,13 @@ __PACKAGE__->set_primary_key("build", "stepnr"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "build", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { id => "build" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); @@ -183,13 +183,13 @@ __PACKAGE__->belongs_to( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "buildstepoutputs", - "Hydra::Schema::BuildStepOutputs", + "Hydra::Schema::Result::BuildStepOutputs", { "foreign.build" => "self.build", "foreign.stepnr" => "self.stepnr" }, undef, ); @@ -198,13 +198,13 @@ __PACKAGE__->has_many( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "propagatedfrom", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { id => "propagatedfrom" }, { is_deferrable => 0, @@ -215,8 +215,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AMjHq4g/fSUv/lZuZOljYg +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GzztRd7OwomaT3Xi7NB2RQ my %hint = ( columns => [ diff --git a/src/lib/Hydra/Schema/Builds.pm b/src/lib/Hydra/Schema/Result/Builds.pm similarity index 84% rename from src/lib/Hydra/Schema/Builds.pm rename to src/lib/Hydra/Schema/Result/Builds.pm index 4e3c9523..081e6238 100644 --- a/src/lib/Hydra/Schema/Builds.pm +++ b/src/lib/Hydra/Schema/Result/Builds.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::Builds; +package Hydra::Schema::Result::Builds; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::Builds +Hydra::Schema::Result::Builds =cut @@ -278,13 +278,13 @@ __PACKAGE__->set_primary_key("id"); Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "aggregateconstituents_aggregates", - "Hydra::Schema::AggregateConstituents", + "Hydra::Schema::Result::AggregateConstituents", { "foreign.aggregate" => "self.id" }, undef, ); @@ -293,13 +293,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "aggregateconstituents_constituents", - "Hydra::Schema::AggregateConstituents", + "Hydra::Schema::Result::AggregateConstituents", { "foreign.constituent" => "self.id" }, undef, ); @@ -308,13 +308,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "buildinputs_builds", - "Hydra::Schema::BuildInputs", + "Hydra::Schema::Result::BuildInputs", { "foreign.build" => "self.id" }, undef, ); @@ -323,13 +323,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "buildinputs_dependencies", - "Hydra::Schema::BuildInputs", + "Hydra::Schema::Result::BuildInputs", { "foreign.dependency" => "self.id" }, undef, ); @@ -338,13 +338,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "buildmetrics", - "Hydra::Schema::BuildMetrics", + "Hydra::Schema::Result::BuildMetrics", { "foreign.build" => "self.id" }, undef, ); @@ -353,13 +353,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "buildoutputs", - "Hydra::Schema::BuildOutputs", + "Hydra::Schema::Result::BuildOutputs", { "foreign.build" => "self.id" }, undef, ); @@ -368,13 +368,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "buildproducts", - "Hydra::Schema::BuildProducts", + "Hydra::Schema::Result::BuildProducts", { "foreign.build" => "self.id" }, undef, ); @@ -383,13 +383,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "buildstepoutputs", - "Hydra::Schema::BuildStepOutputs", + "Hydra::Schema::Result::BuildStepOutputs", { "foreign.build" => "self.id" }, undef, ); @@ -398,13 +398,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "buildsteps", - "Hydra::Schema::BuildSteps", + "Hydra::Schema::Result::BuildSteps", { "foreign.build" => "self.id" }, undef, ); @@ -413,13 +413,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "buildsteps_propagatedfroms", - "Hydra::Schema::BuildSteps", + "Hydra::Schema::Result::BuildSteps", { "foreign.propagatedfrom" => "self.id" }, undef, ); @@ -428,13 +428,13 @@ __PACKAGE__->has_many( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "jobset", - "Hydra::Schema::Jobsets", + "Hydra::Schema::Result::Jobsets", { id => "jobset_id" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); @@ -443,13 +443,13 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "jobset_project_jobset", - "Hydra::Schema::Jobsets", + "Hydra::Schema::Result::Jobsets", { name => "jobset", project => "project" }, { is_deferrable => 0, on_delete => "NO ACTION", on_update => "CASCADE" }, ); @@ -458,13 +458,13 @@ __PACKAGE__->belongs_to( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "jobsetevalinputs", - "Hydra::Schema::JobsetEvalInputs", + "Hydra::Schema::Result::JobsetEvalInputs", { "foreign.dependency" => "self.id" }, undef, ); @@ -473,13 +473,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "jobsetevalmembers", - "Hydra::Schema::JobsetEvalMembers", + "Hydra::Schema::Result::JobsetEvalMembers", { "foreign.build" => "self.id" }, undef, ); @@ -488,13 +488,13 @@ __PACKAGE__->has_many( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "project", - "Hydra::Schema::Projects", + "Hydra::Schema::Result::Projects", { name => "project" }, { is_deferrable => 0, on_delete => "NO ACTION", on_update => "CASCADE" }, ); @@ -528,12 +528,12 @@ __PACKAGE__->many_to_many( ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-01-22 07:11:57 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Df5N0EByYJqoSUqA0dld/A +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WHdSVHhQykmUz0tR/TExVg __PACKAGE__->has_many( "dependents", - "Hydra::Schema::BuildInputs", + "Hydra::Schema::Result::BuildInputs", { "foreign.dependency" => "self.id" }, ); @@ -541,13 +541,13 @@ __PACKAGE__->many_to_many(dependentBuilds => 'dependents', 'build'); __PACKAGE__->has_many( "inputs", - "Hydra::Schema::BuildInputs", + "Hydra::Schema::Result::BuildInputs", { "foreign.build" => "self.id" }, ); __PACKAGE__->has_one( "actualBuildStep", - "Hydra::Schema::BuildSteps", + "Hydra::Schema::Result::BuildSteps", { 'foreign.drvpath' => 'self.drvpath' , 'foreign.build' => 'self.id' }, diff --git a/src/lib/Hydra/Schema/CachedBazaarInputs.pm b/src/lib/Hydra/Schema/Result/CachedBazaarInputs.pm similarity index 82% rename from src/lib/Hydra/Schema/CachedBazaarInputs.pm rename to src/lib/Hydra/Schema/Result/CachedBazaarInputs.pm index 6d02c69c..e89cca7d 100644 --- a/src/lib/Hydra/Schema/CachedBazaarInputs.pm +++ b/src/lib/Hydra/Schema/Result/CachedBazaarInputs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::CachedBazaarInputs; +package Hydra::Schema::Result::CachedBazaarInputs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::CachedBazaarInputs +Hydra::Schema::Result::CachedBazaarInputs =cut @@ -83,8 +83,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("uri", "revision"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:X8L4C57lMOctdqOKSmfA/g +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/9cCRtmGzlDGxjqBEPI2Mw # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/CachedCVSInputs.pm b/src/lib/Hydra/Schema/Result/CachedCVSInputs.pm similarity index 85% rename from src/lib/Hydra/Schema/CachedCVSInputs.pm rename to src/lib/Hydra/Schema/Result/CachedCVSInputs.pm index 8f19dd20..4fbbfc1b 100644 --- a/src/lib/Hydra/Schema/CachedCVSInputs.pm +++ b/src/lib/Hydra/Schema/Result/CachedCVSInputs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::CachedCVSInputs; +package Hydra::Schema::Result::CachedCVSInputs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::CachedCVSInputs +Hydra::Schema::Result::CachedCVSInputs =cut @@ -99,8 +99,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("uri", "module", "sha256hash"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6eQ+i/th+oVZNRiDPd2luA +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yQt8poWCs/wI6WbE4/YdxA # You can replace this text with custom content, and it will be preserved on regeneration 1; diff --git a/src/lib/Hydra/Schema/CachedDarcsInputs.pm b/src/lib/Hydra/Schema/Result/CachedDarcsInputs.pm similarity index 84% rename from src/lib/Hydra/Schema/CachedDarcsInputs.pm rename to src/lib/Hydra/Schema/Result/CachedDarcsInputs.pm index 9d218390..cac68a94 100644 --- a/src/lib/Hydra/Schema/CachedDarcsInputs.pm +++ b/src/lib/Hydra/Schema/Result/CachedDarcsInputs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::CachedDarcsInputs; +package Hydra::Schema::Result::CachedDarcsInputs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::CachedDarcsInputs +Hydra::Schema::Result::CachedDarcsInputs =cut @@ -90,8 +90,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("uri", "revision"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Buwq42sBXQVfYUy01WMyYw +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:20pTv4R98jXytvlWbriWRg # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/CachedGitInputs.pm b/src/lib/Hydra/Schema/Result/CachedGitInputs.pm similarity index 85% rename from src/lib/Hydra/Schema/CachedGitInputs.pm rename to src/lib/Hydra/Schema/Result/CachedGitInputs.pm index 4a2b102b..9166b164 100644 --- a/src/lib/Hydra/Schema/CachedGitInputs.pm +++ b/src/lib/Hydra/Schema/Result/CachedGitInputs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::CachedGitInputs; +package Hydra::Schema::Result::CachedGitInputs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::CachedGitInputs +Hydra::Schema::Result::CachedGitInputs =cut @@ -101,7 +101,7 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("uri", "branch", "revision", "isdeepclone"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-06-19 17:26:24 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Wr0grsFTaqRlMeM9vpXjrw +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:IxG58lqBfLgZ8RTZm1GQKA 1; diff --git a/src/lib/Hydra/Schema/CachedHgInputs.pm b/src/lib/Hydra/Schema/Result/CachedHgInputs.pm similarity index 84% rename from src/lib/Hydra/Schema/CachedHgInputs.pm rename to src/lib/Hydra/Schema/Result/CachedHgInputs.pm index c1d37091..922eff91 100644 --- a/src/lib/Hydra/Schema/CachedHgInputs.pm +++ b/src/lib/Hydra/Schema/Result/CachedHgInputs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::CachedHgInputs; +package Hydra::Schema::Result::CachedHgInputs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::CachedHgInputs +Hydra::Schema::Result::CachedHgInputs =cut @@ -92,8 +92,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("uri", "branch", "revision"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dYfjQ0SJG/mBrsZemAW3zw +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:meKBitAelYYc4TPT8NINYQ # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/CachedPathInputs.pm b/src/lib/Hydra/Schema/Result/CachedPathInputs.pm similarity index 83% rename from src/lib/Hydra/Schema/CachedPathInputs.pm rename to src/lib/Hydra/Schema/Result/CachedPathInputs.pm index 1657c7c1..d6dccd6c 100644 --- a/src/lib/Hydra/Schema/CachedPathInputs.pm +++ b/src/lib/Hydra/Schema/Result/CachedPathInputs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::CachedPathInputs; +package Hydra::Schema::Result::CachedPathInputs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::CachedPathInputs +Hydra::Schema::Result::CachedPathInputs =cut @@ -90,7 +90,7 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("srcpath", "sha256hash"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oV7tbWLNEMC8byKf9UnAlw +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:PZAkRje22dqftpqfU2jyGg 1; diff --git a/src/lib/Hydra/Schema/CachedSubversionInputs.pm b/src/lib/Hydra/Schema/Result/CachedSubversionInputs.pm similarity index 81% rename from src/lib/Hydra/Schema/CachedSubversionInputs.pm rename to src/lib/Hydra/Schema/Result/CachedSubversionInputs.pm index bf31de20..7afe99a2 100644 --- a/src/lib/Hydra/Schema/CachedSubversionInputs.pm +++ b/src/lib/Hydra/Schema/Result/CachedSubversionInputs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::CachedSubversionInputs; +package Hydra::Schema::Result::CachedSubversionInputs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::CachedSubversionInputs +Hydra::Schema::Result::CachedSubversionInputs =cut @@ -83,7 +83,7 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("uri", "revision"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VGt/0HG84eNZr9OIA8jzow +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6kWslezt4Pb1H8gTW4EU6w 1; diff --git a/src/lib/Hydra/Schema/EvaluationErrors.pm b/src/lib/Hydra/Schema/Result/EvaluationErrors.pm similarity index 79% rename from src/lib/Hydra/Schema/EvaluationErrors.pm rename to src/lib/Hydra/Schema/Result/EvaluationErrors.pm index e3fafc9a..7033fa5e 100644 --- a/src/lib/Hydra/Schema/EvaluationErrors.pm +++ b/src/lib/Hydra/Schema/Result/EvaluationErrors.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::EvaluationErrors; +package Hydra::Schema::Result::EvaluationErrors; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::EvaluationErrors +Hydra::Schema::Result::EvaluationErrors =cut @@ -86,20 +86,20 @@ __PACKAGE__->set_primary_key("id"); Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "jobsetevals", - "Hydra::Schema::JobsetEvals", + "Hydra::Schema::Result::JobsetEvals", { "foreign.evaluationerror_id" => "self.id" }, undef, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-02-01 20:17:39 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:sZIg35KWCO8MOsQ5cfN1IA +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QA8C+0TfW7unnM4xzOHXdA __PACKAGE__->add_column( "+id" => { retrieve_on_insert => 1 } diff --git a/src/lib/Hydra/Schema/FailedPaths.pm b/src/lib/Hydra/Schema/Result/FailedPaths.pm similarity index 77% rename from src/lib/Hydra/Schema/FailedPaths.pm rename to src/lib/Hydra/Schema/Result/FailedPaths.pm index a3a49733..0f1c9f8f 100644 --- a/src/lib/Hydra/Schema/FailedPaths.pm +++ b/src/lib/Hydra/Schema/Result/FailedPaths.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::FailedPaths; +package Hydra::Schema::Result::FailedPaths; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::FailedPaths +Hydra::Schema::Result::FailedPaths =cut @@ -57,8 +57,8 @@ __PACKAGE__->add_columns("path", { data_type => "text", is_nullable => 0 }); __PACKAGE__->set_primary_key("path"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jr3XiGO4lWAzqfATbsMwFw +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:V/Ce4LuWe5qRHFAU32xXlw # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/JobsetEvalInputs.pm b/src/lib/Hydra/Schema/Result/JobsetEvalInputs.pm similarity index 85% rename from src/lib/Hydra/Schema/JobsetEvalInputs.pm rename to src/lib/Hydra/Schema/Result/JobsetEvalInputs.pm index ed39ad45..b3a0cf7e 100644 --- a/src/lib/Hydra/Schema/JobsetEvalInputs.pm +++ b/src/lib/Hydra/Schema/Result/JobsetEvalInputs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::JobsetEvalInputs; +package Hydra::Schema::Result::JobsetEvalInputs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::JobsetEvalInputs +Hydra::Schema::Result::JobsetEvalInputs =cut @@ -134,13 +134,13 @@ __PACKAGE__->set_primary_key("eval", "name", "altnr"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "dependency", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { id => "dependency" }, { is_deferrable => 0, @@ -154,20 +154,20 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "eval", - "Hydra::Schema::JobsetEvals", + "Hydra::Schema::Result::JobsetEvals", { id => "eval" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/cFQGBLhvpmBO1UJztgIAg +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AgMH2XIxp7519fFaYgesVw my %hint = ( columns => [ diff --git a/src/lib/Hydra/Schema/JobsetEvalMembers.pm b/src/lib/Hydra/Schema/Result/JobsetEvalMembers.pm similarity index 78% rename from src/lib/Hydra/Schema/JobsetEvalMembers.pm rename to src/lib/Hydra/Schema/Result/JobsetEvalMembers.pm index 9448a203..06db9b75 100644 --- a/src/lib/Hydra/Schema/JobsetEvalMembers.pm +++ b/src/lib/Hydra/Schema/Result/JobsetEvalMembers.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::JobsetEvalMembers; +package Hydra::Schema::Result::JobsetEvalMembers; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::JobsetEvalMembers +Hydra::Schema::Result::JobsetEvalMembers =cut @@ -83,13 +83,13 @@ __PACKAGE__->set_primary_key("eval", "build"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "build", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { id => "build" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); @@ -98,20 +98,20 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "eval", - "Hydra::Schema::JobsetEvals", + "Hydra::Schema::Result::JobsetEvals", { id => "eval" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:T+dJFh/sDO8WsasqYVLRSQ +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QBT9/VToFEwbuXSF8IeySQ # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/JobsetEvals.pm b/src/lib/Hydra/Schema/Result/JobsetEvals.pm similarity index 84% rename from src/lib/Hydra/Schema/JobsetEvals.pm rename to src/lib/Hydra/Schema/Result/JobsetEvals.pm index af2c69bc..f94d63ce 100644 --- a/src/lib/Hydra/Schema/JobsetEvals.pm +++ b/src/lib/Hydra/Schema/Result/JobsetEvals.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::JobsetEvals; +package Hydra::Schema::Result::JobsetEvals; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::JobsetEvals +Hydra::Schema::Result::JobsetEvals =cut @@ -158,13 +158,13 @@ __PACKAGE__->set_primary_key("id"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "evaluationerror", - "Hydra::Schema::EvaluationErrors", + "Hydra::Schema::Result::EvaluationErrors", { id => "evaluationerror_id" }, { is_deferrable => 0, @@ -178,13 +178,13 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "jobset", - "Hydra::Schema::Jobsets", + "Hydra::Schema::Result::Jobsets", { id => "jobset_id" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "NO ACTION" }, ); @@ -193,13 +193,13 @@ __PACKAGE__->belongs_to( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "jobsetevalinputs", - "Hydra::Schema::JobsetEvalInputs", + "Hydra::Schema::Result::JobsetEvalInputs", { "foreign.eval" => "self.id" }, undef, ); @@ -208,24 +208,24 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "jobsetevalmembers", - "Hydra::Schema::JobsetEvalMembers", + "Hydra::Schema::Result::JobsetEvalMembers", { "foreign.eval" => "self.id" }, undef, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-02-01 20:17:39 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:SGtK0PwRkbxiMuitQvs4wQ +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5qvXXTBDdRzgTEmJz6xC/g __PACKAGE__->has_many( "buildIds", - "Hydra::Schema::JobsetEvalMembers", + "Hydra::Schema::Result::JobsetEvalMembers", { "foreign.eval" => "self.id" }, ); diff --git a/src/lib/Hydra/Schema/JobsetInputAlts.pm b/src/lib/Hydra/Schema/Result/JobsetInputAlts.pm similarity index 83% rename from src/lib/Hydra/Schema/JobsetInputAlts.pm rename to src/lib/Hydra/Schema/Result/JobsetInputAlts.pm index e8f030b3..054401a8 100644 --- a/src/lib/Hydra/Schema/JobsetInputAlts.pm +++ b/src/lib/Hydra/Schema/Result/JobsetInputAlts.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::JobsetInputAlts; +package Hydra::Schema::Result::JobsetInputAlts; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::JobsetInputAlts +Hydra::Schema::Result::JobsetInputAlts =cut @@ -109,19 +109,19 @@ __PACKAGE__->set_primary_key("project", "jobset", "input", "altnr"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "jobsetinput", - "Hydra::Schema::JobsetInputs", + "Hydra::Schema::Result::JobsetInputs", { jobset => "jobset", name => "input", project => "project" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nh8dQDL9FtgzXcwjDufDMQ +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7GE67QxkIj/ezwUX6c/a/A 1; diff --git a/src/lib/Hydra/Schema/JobsetInputs.pm b/src/lib/Hydra/Schema/Result/JobsetInputs.pm similarity index 84% rename from src/lib/Hydra/Schema/JobsetInputs.pm rename to src/lib/Hydra/Schema/Result/JobsetInputs.pm index dd3c28be..e714de26 100644 --- a/src/lib/Hydra/Schema/JobsetInputs.pm +++ b/src/lib/Hydra/Schema/Result/JobsetInputs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::JobsetInputs; +package Hydra::Schema::Result::JobsetInputs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::JobsetInputs +Hydra::Schema::Result::JobsetInputs =cut @@ -100,13 +100,13 @@ __PACKAGE__->set_primary_key("project", "jobset", "name"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "jobset", - "Hydra::Schema::Jobsets", + "Hydra::Schema::Result::Jobsets", { name => "jobset", project => "project" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" }, ); @@ -115,13 +115,13 @@ __PACKAGE__->belongs_to( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "jobsetinputalts", - "Hydra::Schema::JobsetInputAlts", + "Hydra::Schema::Result::JobsetInputAlts", { "foreign.input" => "self.name", "foreign.jobset" => "self.jobset", @@ -131,8 +131,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5uKwEhDXso4IR1TFmwRxiA +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CkU+hbVTmhfOzQhkHJHCsg use JSON; diff --git a/src/lib/Hydra/Schema/JobsetRenames.pm b/src/lib/Hydra/Schema/Result/JobsetRenames.pm similarity index 78% rename from src/lib/Hydra/Schema/JobsetRenames.pm rename to src/lib/Hydra/Schema/Result/JobsetRenames.pm index 794d6e16..974dcee6 100644 --- a/src/lib/Hydra/Schema/JobsetRenames.pm +++ b/src/lib/Hydra/Schema/Result/JobsetRenames.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::JobsetRenames; +package Hydra::Schema::Result::JobsetRenames; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::JobsetRenames +Hydra::Schema::Result::JobsetRenames =cut @@ -83,13 +83,13 @@ __PACKAGE__->set_primary_key("project", "from_"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "jobset", - "Hydra::Schema::Jobsets", + "Hydra::Schema::Result::Jobsets", { name => "to_", project => "project" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" }, ); @@ -98,20 +98,20 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "project", - "Hydra::Schema::Projects", + "Hydra::Schema::Result::Projects", { name => "project" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eOQbJ2O/p0G1317m3IC/KA +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Czt+7mIWn1e5IlzJYlj0vw # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/Jobsets.pm b/src/lib/Hydra/Schema/Result/Jobsets.pm similarity index 87% rename from src/lib/Hydra/Schema/Jobsets.pm rename to src/lib/Hydra/Schema/Result/Jobsets.pm index abcb05ae..8e3c1509 100644 --- a/src/lib/Hydra/Schema/Jobsets.pm +++ b/src/lib/Hydra/Schema/Result/Jobsets.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::Jobsets; +package Hydra::Schema::Result::Jobsets; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::Jobsets +Hydra::Schema::Result::Jobsets =cut @@ -243,13 +243,13 @@ __PACKAGE__->add_unique_constraint("jobsets_id_unique", ["id"]); Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "buildmetrics", - "Hydra::Schema::BuildMetrics", + "Hydra::Schema::Result::BuildMetrics", { "foreign.jobset" => "self.name", "foreign.project" => "self.project", @@ -261,13 +261,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "builds_jobset_ids", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { "foreign.jobset_id" => "self.id" }, undef, ); @@ -276,13 +276,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "builds_project_jobsets", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { "foreign.jobset" => "self.name", "foreign.project" => "self.project", @@ -294,13 +294,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "jobsetevals", - "Hydra::Schema::JobsetEvals", + "Hydra::Schema::Result::JobsetEvals", { "foreign.jobset_id" => "self.id" }, undef, ); @@ -309,13 +309,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "jobsetinputs", - "Hydra::Schema::JobsetInputs", + "Hydra::Schema::Result::JobsetInputs", { "foreign.jobset" => "self.name", "foreign.project" => "self.project", @@ -327,13 +327,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "jobsetrenames", - "Hydra::Schema::JobsetRenames", + "Hydra::Schema::Result::JobsetRenames", { "foreign.project" => "self.project", "foreign.to_" => "self.name" }, undef, ); @@ -342,13 +342,13 @@ __PACKAGE__->has_many( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "project", - "Hydra::Schema::Projects", + "Hydra::Schema::Result::Projects", { name => "project" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" }, ); @@ -357,13 +357,13 @@ __PACKAGE__->belongs_to( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "starredjobs", - "Hydra::Schema::StarredJobs", + "Hydra::Schema::Result::StarredJobs", { "foreign.jobset" => "self.name", "foreign.project" => "self.project", @@ -372,8 +372,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-01-25 14:38:14 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7XtIqrrGAIvReqly1kapog +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:iI44C3BFTo6IsS1tBwWYsg use JSON; @@ -381,13 +381,13 @@ use JSON; Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "builds", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { "foreign.jobset_id" => "self.id" }, undef, ); diff --git a/src/lib/Hydra/Schema/NewsItems.pm b/src/lib/Hydra/Schema/Result/NewsItems.pm similarity index 82% rename from src/lib/Hydra/Schema/NewsItems.pm rename to src/lib/Hydra/Schema/Result/NewsItems.pm index 0bd3f04b..efb1110c 100644 --- a/src/lib/Hydra/Schema/NewsItems.pm +++ b/src/lib/Hydra/Schema/Result/NewsItems.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::NewsItems; +package Hydra::Schema::Result::NewsItems; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::NewsItems +Hydra::Schema::Result::NewsItems =cut @@ -94,19 +94,19 @@ __PACKAGE__->set_primary_key("id"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "author", - "Hydra::Schema::Users", + "Hydra::Schema::Result::Users", { username => "author" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:r6vX8VG/+NQraIVKFgHzxQ +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:pJsP4RptP4rTmM2j4B5+oA 1; diff --git a/src/lib/Hydra/Schema/NrBuilds.pm b/src/lib/Hydra/Schema/Result/NrBuilds.pm similarity index 80% rename from src/lib/Hydra/Schema/NrBuilds.pm rename to src/lib/Hydra/Schema/Result/NrBuilds.pm index 7e6601b2..2d95d563 100644 --- a/src/lib/Hydra/Schema/NrBuilds.pm +++ b/src/lib/Hydra/Schema/Result/NrBuilds.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::NrBuilds; +package Hydra::Schema::Result::NrBuilds; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::NrBuilds +Hydra::Schema::Result::NrBuilds =cut @@ -67,8 +67,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("what"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:qv1I8Wu7KXHAs+pyBn2ofA +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8cLowAk8TYW7wSkJvtFWDQ # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/ProjectMembers.pm b/src/lib/Hydra/Schema/Result/ProjectMembers.pm similarity index 77% rename from src/lib/Hydra/Schema/ProjectMembers.pm rename to src/lib/Hydra/Schema/Result/ProjectMembers.pm index 78f02875..65df1c03 100644 --- a/src/lib/Hydra/Schema/ProjectMembers.pm +++ b/src/lib/Hydra/Schema/Result/ProjectMembers.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::ProjectMembers; +package Hydra::Schema::Result::ProjectMembers; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::ProjectMembers +Hydra::Schema::Result::ProjectMembers =cut @@ -76,13 +76,13 @@ __PACKAGE__->set_primary_key("project", "username"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "project", - "Hydra::Schema::Projects", + "Hydra::Schema::Result::Projects", { name => "project" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" }, ); @@ -91,20 +91,20 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "username", - "Hydra::Schema::Users", + "Hydra::Schema::Result::Users", { username => "username" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:e/hYmoNmcEUoGhRqtwdyQw +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2XEIyAyuVBJ9LtYV0mX/2Q # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/Projects.pm b/src/lib/Hydra/Schema/Result/Projects.pm similarity index 82% rename from src/lib/Hydra/Schema/Projects.pm rename to src/lib/Hydra/Schema/Result/Projects.pm index fab0d4fa..441c70a9 100644 --- a/src/lib/Hydra/Schema/Projects.pm +++ b/src/lib/Hydra/Schema/Result/Projects.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::Projects; +package Hydra::Schema::Result::Projects; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::Projects +Hydra::Schema::Result::Projects =cut @@ -131,13 +131,13 @@ __PACKAGE__->set_primary_key("name"); Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "buildmetrics", - "Hydra::Schema::BuildMetrics", + "Hydra::Schema::Result::BuildMetrics", { "foreign.project" => "self.name" }, undef, ); @@ -146,13 +146,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "builds", - "Hydra::Schema::Builds", + "Hydra::Schema::Result::Builds", { "foreign.project" => "self.name" }, undef, ); @@ -161,13 +161,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "jobsetrenames", - "Hydra::Schema::JobsetRenames", + "Hydra::Schema::Result::JobsetRenames", { "foreign.project" => "self.name" }, undef, ); @@ -176,13 +176,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "jobsets", - "Hydra::Schema::Jobsets", + "Hydra::Schema::Result::Jobsets", { "foreign.project" => "self.name" }, undef, ); @@ -191,13 +191,13 @@ __PACKAGE__->has_many( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "owner", - "Hydra::Schema::Users", + "Hydra::Schema::Result::Users", { username => "owner" }, { is_deferrable => 0, on_delete => "NO ACTION", on_update => "CASCADE" }, ); @@ -206,13 +206,13 @@ __PACKAGE__->belongs_to( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "projectmembers", - "Hydra::Schema::ProjectMembers", + "Hydra::Schema::Result::ProjectMembers", { "foreign.project" => "self.name" }, undef, ); @@ -221,13 +221,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "starredjobs", - "Hydra::Schema::StarredJobs", + "Hydra::Schema::Result::StarredJobs", { "foreign.project" => "self.name" }, undef, ); @@ -243,8 +243,8 @@ Composing rels: L -> username __PACKAGE__->many_to_many("usernames", "projectmembers", "username"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-01-25 14:38:14 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+4yWd9UjCyxxLZYDrVUAxA +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nKVZ8ZNCZQQ52zbpDAaoQQ use JSON; diff --git a/src/lib/Hydra/Schema/SchemaVersion.pm b/src/lib/Hydra/Schema/Result/SchemaVersion.pm similarity index 74% rename from src/lib/Hydra/Schema/SchemaVersion.pm rename to src/lib/Hydra/Schema/Result/SchemaVersion.pm index 4165de9d..5854d8a3 100644 --- a/src/lib/Hydra/Schema/SchemaVersion.pm +++ b/src/lib/Hydra/Schema/Result/SchemaVersion.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::SchemaVersion; +package Hydra::Schema::Result::SchemaVersion; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::SchemaVersion +Hydra::Schema::Result::SchemaVersion =cut @@ -45,8 +45,8 @@ __PACKAGE__->table("schemaversion"); __PACKAGE__->add_columns("version", { data_type => "integer", is_nullable => 0 }); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2wy4FsRYVVo2RTCWXcmgvg +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GAlywxH9wpqRoD36GobQvA # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/StarredJobs.pm b/src/lib/Hydra/Schema/Result/StarredJobs.pm similarity index 79% rename from src/lib/Hydra/Schema/StarredJobs.pm rename to src/lib/Hydra/Schema/Result/StarredJobs.pm index 04c9df39..cb17e206 100644 --- a/src/lib/Hydra/Schema/StarredJobs.pm +++ b/src/lib/Hydra/Schema/Result/StarredJobs.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::StarredJobs; +package Hydra::Schema::Result::StarredJobs; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::StarredJobs +Hydra::Schema::Result::StarredJobs =cut @@ -95,13 +95,13 @@ __PACKAGE__->set_primary_key("username", "project", "jobset", "job"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "jobset", - "Hydra::Schema::Jobsets", + "Hydra::Schema::Result::Jobsets", { name => "jobset", project => "project" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" }, ); @@ -110,13 +110,13 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "project", - "Hydra::Schema::Projects", + "Hydra::Schema::Result::Projects", { name => "project" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" }, ); @@ -125,20 +125,20 @@ __PACKAGE__->belongs_to( Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "username", - "Hydra::Schema::Users", + "Hydra::Schema::Result::Users", { username => "username" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-05-27 17:36:07 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:RRDQ6UQL/bjXPD+HO1s5ug +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:j+dXc22FIqlCSmP3mOX+Aw # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/SystemStatus.pm b/src/lib/Hydra/Schema/Result/SystemStatus.pm similarity index 79% rename from src/lib/Hydra/Schema/SystemStatus.pm rename to src/lib/Hydra/Schema/Result/SystemStatus.pm index 6b794fed..bd931955 100644 --- a/src/lib/Hydra/Schema/SystemStatus.pm +++ b/src/lib/Hydra/Schema/Result/SystemStatus.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::SystemStatus; +package Hydra::Schema::Result::SystemStatus; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::SystemStatus +Hydra::Schema::Result::SystemStatus =cut @@ -67,8 +67,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("what"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GeXpTVktMXjHENa/P3qOxw +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Ps8gKPEnK1tTa/hXYz+27A # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/SystemTypes.pm b/src/lib/Hydra/Schema/Result/SystemTypes.pm similarity index 79% rename from src/lib/Hydra/Schema/SystemTypes.pm rename to src/lib/Hydra/Schema/Result/SystemTypes.pm index f9efd973..6b606263 100644 --- a/src/lib/Hydra/Schema/SystemTypes.pm +++ b/src/lib/Hydra/Schema/Result/SystemTypes.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::SystemTypes; +package Hydra::Schema::Result::SystemTypes; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::SystemTypes +Hydra::Schema::Result::SystemTypes =cut @@ -68,7 +68,7 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("system"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fYeKQQSS5J8rjO3t+Hbz0g +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:skzz9Wqwox5QO35YSgVXbw 1; diff --git a/src/lib/Hydra/Schema/UriRevMapper.pm b/src/lib/Hydra/Schema/Result/UriRevMapper.pm similarity index 79% rename from src/lib/Hydra/Schema/UriRevMapper.pm rename to src/lib/Hydra/Schema/Result/UriRevMapper.pm index cd9d8567..6626efc1 100644 --- a/src/lib/Hydra/Schema/UriRevMapper.pm +++ b/src/lib/Hydra/Schema/Result/UriRevMapper.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::UriRevMapper; +package Hydra::Schema::Result::UriRevMapper; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::UriRevMapper +Hydra::Schema::Result::UriRevMapper =cut @@ -67,8 +67,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("baseuri"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FOg2/BVJK3yg8MAYMrqZOQ +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:prycgyKZhOx4ch18xkoj1w # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/UserRoles.pm b/src/lib/Hydra/Schema/Result/UserRoles.pm similarity index 77% rename from src/lib/Hydra/Schema/UserRoles.pm rename to src/lib/Hydra/Schema/Result/UserRoles.pm index a7ce5ed9..e693a9d5 100644 --- a/src/lib/Hydra/Schema/UserRoles.pm +++ b/src/lib/Hydra/Schema/Result/UserRoles.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::UserRoles; +package Hydra::Schema::Result::UserRoles; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::UserRoles +Hydra::Schema::Result::UserRoles =cut @@ -75,19 +75,19 @@ __PACKAGE__->set_primary_key("username", "role"); Type: belongs_to -Related object: L +Related object: L =cut __PACKAGE__->belongs_to( "username", - "Hydra::Schema::Users", + "Hydra::Schema::Result::Users", { username => "username" }, { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LUw2PDFvUHs0E0UZ3oHFxw +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:MZCKml/f7xn3GmsqocCuuQ 1; diff --git a/src/lib/Hydra/Schema/Users.pm b/src/lib/Hydra/Schema/Result/Users.pm similarity index 86% rename from src/lib/Hydra/Schema/Users.pm rename to src/lib/Hydra/Schema/Result/Users.pm index 9f2e1bc0..b3de6543 100644 --- a/src/lib/Hydra/Schema/Users.pm +++ b/src/lib/Hydra/Schema/Result/Users.pm @@ -1,12 +1,12 @@ use utf8; -package Hydra::Schema::Users; +package Hydra::Schema::Result::Users; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE =head1 NAME -Hydra::Schema::Users +Hydra::Schema::Result::Users =cut @@ -110,13 +110,13 @@ __PACKAGE__->set_primary_key("username"); Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "newsitems", - "Hydra::Schema::NewsItems", + "Hydra::Schema::Result::NewsItems", { "foreign.author" => "self.username" }, undef, ); @@ -125,13 +125,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "projectmembers", - "Hydra::Schema::ProjectMembers", + "Hydra::Schema::Result::ProjectMembers", { "foreign.username" => "self.username" }, undef, ); @@ -140,13 +140,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "projects_2s", - "Hydra::Schema::Projects", + "Hydra::Schema::Result::Projects", { "foreign.owner" => "self.username" }, undef, ); @@ -155,13 +155,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "starredjobs", - "Hydra::Schema::StarredJobs", + "Hydra::Schema::Result::StarredJobs", { "foreign.username" => "self.username" }, undef, ); @@ -170,13 +170,13 @@ __PACKAGE__->has_many( Type: has_many -Related object: L +Related object: L =cut __PACKAGE__->has_many( "userroles", - "Hydra::Schema::UserRoles", + "Hydra::Schema::Result::UserRoles", { "foreign.username" => "self.username" }, undef, ); @@ -192,8 +192,8 @@ Composing rels: L -> project __PACKAGE__->many_to_many("projects", "projectmembers", "project"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4/WZ95asbnGmK+nEHb4sLQ +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-08-26 12:02:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:qePTzHYl/TjCSjZrU2g/cg use Crypt::Passphrase; use Digest::SHA1 qw(sha1_hex); diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 2b44cf2f..434868e0 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -5,6 +5,8 @@ PERL_MODULES = \ $(wildcard Hydra/Model/*.pm) \ $(wildcard Hydra/View/*.pm) \ $(wildcard Hydra/Schema/*.pm) \ + $(wildcard Hydra/Schema/Result/*.pm) \ + $(wildcard Hydra/Schema/ResultSet/*.pm) \ $(wildcard Hydra/Controller/*.pm) \ $(wildcard Hydra/Base/*.pm) \ $(wildcard Hydra/Base/Controller/*.pm) \ diff --git a/src/sql/update-dbix.pl b/src/sql/update-dbix.pl index 086bf0ec..a9a18f0e 100644 --- a/src/sql/update-dbix.pl +++ b/src/sql/update-dbix.pl @@ -5,6 +5,7 @@ die "$0: dbi connection string required \n" if scalar @ARGV != 1; make_schema_at("Hydra::Schema", { naming => { ALL => "v5" }, relationships => 1, + use_namespaces => 1, moniker_map => { "aggregateconstituents" => "AggregateConstituents", "buildinputs" => "BuildInputs",