Rename DB::ReportExtraFields to ReportExtraField.

It was not being caught by rerun_dbic_loader.pl otherwise.

4 files changed, 13 insertions, 9 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin/ReportExtraFields.pm b/perllib/FixMyStreet/App/Controller/Admin/ReportExtraFields.pm
index 337fb4bed..0ddbb01f7 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/ReportExtraFields.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/ReportExtraFields.pm
@@ -9,7 +9,7 @@ BEGIN { extends 'Catalyst::Controller'; }
 sub index : Path : Args(0) {
     my ( $self, $c ) = @_;
 
-    my @extras = $c->model('DB::ReportExtraFields')->search(
+    my @extras = $c->model('DB::ReportExtraField')->search(
         undef,
         {
             order_by => 'name'
@@ -24,9 +24,9 @@ sub edit : Path : Args(1) {
 
     my $extra;
     if ( $extra_id eq 'new' ) {
-        $extra = $c->model('DB::ReportExtraFields')->new({});
+        $extra = $c->model('DB::ReportExtraField')->new({});
     } else {
-        $extra = $c->model('DB::ReportExtraFields')->find( $extra_id )
+        $extra = $c->model('DB::ReportExtraField')->find( $extra_id )
             or $c->detach( '/page_error_404_not_found' );
     }
 
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 83d0f8572..8944a9307 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -757,7 +757,7 @@ sub setup_report_extra_fields : Private {
 
     return unless $c->cobrand->allow_report_extra_fields;
 
-    my @extras = $c->model('DB::ReportExtraFields')->for_cobrand($c->cobrand)->for_language($c->stash->{lang_code})->all;
+    my @extras = $c->model('DB::ReportExtraField')->for_cobrand($c->cobrand)->for_language($c->stash->{lang_code})->all;
     $c->stash->{report_extra_fields} = \@extras;
 }
 
diff --git a/perllib/FixMyStreet/DB/Result/ReportExtraFields.pm b/perllib/FixMyStreet/DB/Result/ReportExtraField.pm
index 27a6bd2c6..f88169bba 100644
--- a/perllib/FixMyStreet/DB/Result/ReportExtraFields.pm
+++ b/perllib/FixMyStreet/DB/Result/ReportExtraField.pm
@@ -1,5 +1,5 @@
 use utf8;
-package FixMyStreet::DB::Result::ReportExtraFields;
+package FixMyStreet::DB::Result::ReportExtraField;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
@@ -8,7 +8,11 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-__PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
+__PACKAGE__->load_components(
+  "FilterColumn",
+  "FixMyStreet::InflateColumn::DateTime",
+  "FixMyStreet::EncodedColumn",
+);
 __PACKAGE__->table("report_extra_fields");
 __PACKAGE__->add_columns(
   "id",
@@ -30,8 +34,8 @@ __PACKAGE__->add_columns(
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07035 @ 2017-07-28 09:51:34
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LkfbsUInnEyXowdcCEPjUQ
+# Created by DBIx::Class::Schema::Loader v0.07035 @ 2019-04-25 15:41:27
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yRF676ybdkfalMwZ9V+yhw
 
 __PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn");
 __PACKAGE__->rabx_column('extra');
diff --git a/perllib/FixMyStreet/DB/ResultSet/ReportExtraFields.pm b/perllib/FixMyStreet/DB/ResultSet/ReportExtraField.pm
index 1348df3c2..9c47b1894 100644
--- a/perllib/FixMyStreet/DB/ResultSet/ReportExtraFields.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/ReportExtraField.pm
@@ -1,4 +1,4 @@
-package FixMyStreet::DB::ResultSet::ReportExtraFields;
+package FixMyStreet::DB::ResultSet::ReportExtraField;
 use base 'DBIx::Class::ResultSet';
 
 use strict;