X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper%2FModel%2FDBIC%2FSchema.pm;h=33d5310b1616d360e4e5b3c113583bcc5b439ab1;hb=7b4f9ecee46f0ef2824ef0a320d273daf9a71526;hp=99fba191a3707385002b2ab678a01a8a21d04bf8;hpb=48c22703071419f7e710649d7cd21d0a75079012;p=catagits%2FCatalyst-Model-DBIC-Schema.git diff --git a/lib/Catalyst/Helper/Model/DBIC/Schema.pm b/lib/Catalyst/Helper/Model/DBIC/Schema.pm index 99fba19..33d5310 100644 --- a/lib/Catalyst/Helper/Model/DBIC/Schema.pm +++ b/lib/Catalyst/Helper/Model/DBIC/Schema.pm @@ -4,7 +4,7 @@ use namespace::autoclean; use Moose; no warnings 'uninitialized'; -our $VERSION = '0.61'; +our $VERSION = '0.62'; $VERSION = eval $VERSION; use Carp; @@ -18,6 +18,7 @@ use Scalar::Util 'looks_like_number'; use File::Find 'finddepth'; use Try::Tiny; use Cwd 'getcwd'; +use Module::Runtime 'use_module'; =head1 NAME @@ -312,7 +313,7 @@ sub _read_loader_args { } my $have_loader = try { - Class::MOP::load_class('DBIx::Class::Schema::Loader::Base'); + use_module('DBIx::Class::Schema::Loader::Base'); 1; }; @@ -477,7 +478,7 @@ sub _build_result_namespace { File::Spec->catfile($self->helper->{base}, 'lib', @schema_parts) . '.pm'; if (not -f $schema_pm) { - eval { Class::MOP::load_class('DBIx::Class::Schema::Loader') }; + eval { use_module('DBIx::Class::Schema::Loader') }; return 'Result' if $@; @@ -623,7 +624,7 @@ sub _gen_static_schema { my $schema_dir = File::Spec->catfile($helper->{base}, 'lib'); try { - Class::MOP::load_class('DBIx::Class::Schema::Loader') + use_module('DBIx::Class::Schema::Loader') } catch { die "Cannot load DBIx::Class::Schema::Loader: $_"; @@ -642,7 +643,7 @@ sub _gen_static_schema { require lib; lib->import($schema_dir); - Class::MOP::load_class($self->schema_class); + use_module($self->schema_class); my @sources = $self->schema_class->sources;