From: Rafael Kitover Date: Sun, 25 Jul 2010 08:20:07 +0000 (-0400) Subject: Merge branch 'master' into 0.08 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2F0.08;p=dbsrgits%2FDBIx-Class-Schema-Loader.git Merge branch 'master' into 0.08 --- 9deda071795f057326346a73c9df279523779416 diff --cc lib/DBIx/Class/Schema/Loader/Base.pm index 1441ff6,42e2fa4..7f72358 --- a/lib/DBIx/Class/Schema/Loader/Base.pm +++ b/lib/DBIx/Class/Schema/Loader/Base.pm @@@ -16,14 -16,15 +16,15 @@@ use Lingua::EN::Inflect::Phrase qw// use File::Temp qw//; use Class::Unload; use Class::Inspector (); - use Data::Dumper::Concise; use Scalar::Util 'looks_like_number'; use File::Slurp 'slurp'; - use DBIx::Class::Schema::Loader::Utils 'split_name'; - require DBIx::Class; + use DBIx::Class::Schema::Loader::Utils qw/split_name dumper_squashed/; + use DBIx::Class::Schema::Loader::Optional::Dependencies (); + use Try::Tiny; + use DBIx::Class (); use namespace::clean; -our $VERSION = '0.07001'; +our $VERSION = '0.08000'; __PACKAGE__->mk_group_ro_accessors('simple', qw/ schema