fix a couple tests

diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm
index e1508c1..daaa668 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader.pm
+++ b/lib/DBIx/Class/Schema/Loader.pm
@@ -171,7 +171,7 @@ sub _invoke_loader {
 
     my $impl = $loader_class || "DBIx::Class::Schema::Loader" . $self->storage_type;
     eval { $self->ensure_class_loaded($impl) };
-    croak qq/Could not load loader class "$impl": "$@"/ if $@;
+    croak qq/Could not load loader_class "$impl": "$@"/ if $@;
 
     $self->_loader($impl->new(%$args));
     $self->_loader->load;

diff --git a/t/21misc_fatal.t b/t/21misc_fatal.t
index a1ce752..e1f9e2e 100644 (file)
--- a/t/21misc_fatal.t
+++ b/t/21misc_fatal.t
@@ -21,6 +21,6 @@ plan tests => 1;
 eval { DBICTest::Schema->connect($make_dbictest_db::dsn) };
 like(
     $@,
-    qr/Could not load storage_type loader "DBIx::Class::Schema::Loader::xyzzy": /,
+    qr/Could not load loader_class "DBIx::Class::Schema::Loader::xyzzy": /,
     'Bad storage type dies correctly'
 );

diff --git a/t/23dumpmore.t b/t/23dumpmore.t
index 7ba8349..c2074f8 100644 (file)
--- a/t/23dumpmore.t
+++ b/t/23dumpmore.t
@@ -260,8 +260,8 @@ do_dump_test(
 qr/package DBICTest::DumpMore::1::Foo;/,
 qr/=head1 NAME\n\nDBICTest::DumpMore::1::Foo\n\n=cut\n\n/,
 qr/=head1 ACCESSORS\n\n/,
-qr/=head2 fooid\n\n  data_type: 'INTEGER'\n  is_nullable: 1\n\n/,
-qr/=head2 footext\n\n  data_type: 'TEXT'\n  default_value: 'footext'\n  extra: {is_footext => 1}\n  is_nullable: 1\n\n/,
+qr/=head2 fooid\n\n  data_type: 'integer'\n  is_nullable: 1\n\n/,
+qr/=head2 footext\n\n  data_type: 'text'\n  default_value: 'footext'\n  extra: {is_footext => 1}\n  is_nullable: 1\n\n/,
 qr/->set_primary_key/,
 qr/=head1 RELATIONS\n\n/,
 qr/=head2 bars\n\nType: has_many\n\nRelated object: L<DBICTest::DumpMore::1::Bar>\n\n=cut\n\n/,
@@ -271,8 +271,8 @@ qr/1;\n$/,
 qr/package DBICTest::DumpMore::1::Bar;/,
 qr/=head1 NAME\n\nDBICTest::DumpMore::1::Bar\n\n=cut\n\n/,
 qr/=head1 ACCESSORS\n\n/,
-qr/=head2 barid\n\n  data_type: 'INTEGER'\n  is_nullable: 1\n\n/,
-qr/=head2 fooref\n\n  data_type: 'INTEGER'\n  is_foreign_key: 1\n  is_nullable: 1\n\n/,
+qr/=head2 barid\n\n  data_type: 'integer'\n  is_nullable: 1\n\n/,
+qr/=head2 fooref\n\n  data_type: 'integer'\n  is_foreign_key: 1\n  is_nullable: 1\n\n/,
 qr/->set_primary_key/,
 qr/=head1 RELATIONS\n\n/,
 qr/=head2 fooref\n\nType: belongs_to\n\nRelated object: L<DBICTest::DumpMore::1::Foo>\n\n=cut\n\n/,