X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Model-DBIC-Schema.git;a=blobdiff_plain;f=lib%2FCatalyst%2FHelper%2FModel%2FDBIC%2FSchema.pm;h=f50b2e553e5b92ab2f72ed6b07db72974fb3c5af;hp=7ab6ed912351ff6d7a28a851ac99fa7c97a4591b;hb=2a5644e8ea19e2db4136eaf8e458030d596071c4;hpb=1714a8a0ad486c7956ce7bd3f62e7b78a3d7222e

diff --git a/lib/Catalyst/Helper/Model/DBIC/Schema.pm b/lib/Catalyst/Helper/Model/DBIC/Schema.pm
index 7ab6ed9..f50b2e5 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.58';
+our $VERSION = '0.65';
 $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 $@;
 
@@ -502,6 +503,7 @@ sub _data_struct_to_string {
 
     local $Data::Dumper::Terse = 1;
     local $Data::Dumper::Quotekeys = 0;
+    local $Data::Dumper::Sortkeys = 1;
     local $Data::Dumper::Indent = 0;
     local $Data::Dumper::Useqq = 1;
 
@@ -622,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: $_";
@@ -641,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;