From: Peter Rabbitson Date: Fri, 8 Nov 2013 09:12:09 +0000 (+0100) Subject: Fix nonsensical result class names introduced by a test in 45f8858e6 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6cedc92eb55ac9bb732a3c19361ee20ba5c59996;p=dbsrgits%2FDBIx-Class-Historic.git Fix nonsensical result class names introduced by a test in 45f8858e6 --- diff --git a/t/39load_namespaces_rt41083.t b/t/39load_namespaces_rt41083.t index 79c9c7a..2584290 100644 --- a/t/39load_namespaces_rt41083.t +++ b/t/39load_namespaces_rt41083.t @@ -32,7 +32,7 @@ sub _verify_sources { package DBICNSTest::RtBug41083; use base 'DBIx::Class::Schema'; __PACKAGE__->load_namespaces( - result_namespace => 'Schema_A', + result_namespace => 'Result_A', resultset_namespace => 'ResultSet_A', default_resultset_class => 'ResultSet' ); @@ -52,8 +52,6 @@ sub _verify_sources { package DBICNSTest::RtBug41083; use base 'DBIx::Class::Schema'; __PACKAGE__->load_namespaces( - result_namespace => 'Schema', - resultset_namespace => 'ResultSet', default_resultset_class => 'ResultSet' ); }; diff --git a/t/lib/DBICNSTest/RtBug41083/Schema/Foo.pm b/t/lib/DBICNSTest/RtBug41083/Result/Foo.pm similarity index 72% rename from t/lib/DBICNSTest/RtBug41083/Schema/Foo.pm rename to t/lib/DBICNSTest/RtBug41083/Result/Foo.pm index 4c98495..703e59c 100644 --- a/t/lib/DBICNSTest/RtBug41083/Schema/Foo.pm +++ b/t/lib/DBICNSTest/RtBug41083/Result/Foo.pm @@ -1,4 +1,4 @@ -package DBICNSTest::RtBug41083::Schema::Foo; +package DBICNSTest::RtBug41083::Result::Foo; use strict; use warnings; use base 'DBIx::Class::Core'; diff --git a/t/lib/DBICNSTest/RtBug41083/Result/Foo/Sub.pm b/t/lib/DBICNSTest/RtBug41083/Result/Foo/Sub.pm new file mode 100644 index 0000000..6d48de7 --- /dev/null +++ b/t/lib/DBICNSTest/RtBug41083/Result/Foo/Sub.pm @@ -0,0 +1,5 @@ +package DBICNSTest::RtBug41083::Result::Foo::Sub; +use strict; +use warnings; +use base 'DBICNSTest::RtBug41083::Result::Foo'; +1; diff --git a/t/lib/DBICNSTest/RtBug41083/Schema_A/A.pm b/t/lib/DBICNSTest/RtBug41083/Result_A/A.pm similarity index 71% rename from t/lib/DBICNSTest/RtBug41083/Schema_A/A.pm rename to t/lib/DBICNSTest/RtBug41083/Result_A/A.pm index 6a3995f..2494685 100644 --- a/t/lib/DBICNSTest/RtBug41083/Schema_A/A.pm +++ b/t/lib/DBICNSTest/RtBug41083/Result_A/A.pm @@ -1,4 +1,4 @@ -package DBICNSTest::RtBug41083::Schema_A::A; +package DBICNSTest::RtBug41083::Result_A::A; use strict; use warnings; use base 'DBIx::Class::Core'; diff --git a/t/lib/DBICNSTest/RtBug41083/Result_A/A/Sub.pm b/t/lib/DBICNSTest/RtBug41083/Result_A/A/Sub.pm new file mode 100644 index 0000000..dbb6ba0 --- /dev/null +++ b/t/lib/DBICNSTest/RtBug41083/Result_A/A/Sub.pm @@ -0,0 +1,5 @@ +package DBICNSTest::RtBug41083::Result_A::A::Sub; +use strict; +use warnings; +use base 'DBICNSTest::RtBug41083::Result_A::A'; +1; diff --git a/t/lib/DBICNSTest/RtBug41083/Schema/Foo/Sub.pm b/t/lib/DBICNSTest/RtBug41083/Schema/Foo/Sub.pm deleted file mode 100644 index 73ec679..0000000 --- a/t/lib/DBICNSTest/RtBug41083/Schema/Foo/Sub.pm +++ /dev/null @@ -1,5 +0,0 @@ -package DBICNSTest::RtBug41083::Schema::Foo::Sub; -use strict; -use warnings; -use base 'DBICNSTest::RtBug41083::Schema::Foo'; -1; diff --git a/t/lib/DBICNSTest/RtBug41083/Schema_A/A/Sub.pm b/t/lib/DBICNSTest/RtBug41083/Schema_A/A/Sub.pm deleted file mode 100644 index 1128e1e..0000000 --- a/t/lib/DBICNSTest/RtBug41083/Schema_A/A/Sub.pm +++ /dev/null @@ -1,5 +0,0 @@ -package DBICNSTest::RtBug41083::Schema_A::A::Sub; -use strict; -use warnings; -use base 'DBICNSTest::RtBug41083::Schema_A::A'; -1;