X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper%2FModel%2FDBIC%2FSchema.pm;h=4ed267b74739d69ffe4bc3e21fd075ca128c2e93;hb=fb920729a373b9031c9efb5cea0091cb9dbf929d;hp=a479fdcaae510133b5a43c5a7ca0383fd9c9f581;hpb=c34bcab69a93411aaca477595289fa51e6fb8b11;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 a479fdc..4ed267b 100644 --- a/lib/Catalyst/Helper/Model/DBIC/Schema.pm +++ b/lib/Catalyst/Helper/Model/DBIC/Schema.pm @@ -1,9 +1,11 @@ package Catalyst::Helper::Model::DBIC::Schema; +use namespace::autoclean; use Moose; no warnings 'uninitialized'; -our $VERSION = '0.24'; +our $VERSION = '0.46'; +$VERSION = eval $VERSION; use Carp; use Tie::IxHash (); @@ -11,11 +13,11 @@ use Data::Dumper (); use List::Util 'first'; use MooseX::Types::Moose qw/Str HashRef Bool ArrayRef/; use Catalyst::Model::DBIC::Schema::Types 'CreateOption'; -use Moose::Autobox; use List::MoreUtils 'firstidx'; use Scalar::Util 'looks_like_number'; - -use namespace::clean -except => 'meta'; +use File::Find 'finddepth'; +use Try::Tiny; +use Cwd 'getcwd'; =head1 NAME @@ -108,6 +110,14 @@ Same, but with extra Schema::Loader args (separate multiple values by commas): exclude='^(wibble|wobble)$' moniker_map='{ foo => "FOO" }' \ dbi:Pg:dbname=foodb myuname mypass +Coderefs are also supported: + + script/myapp_create.pl model CatalystModelName DBIC::Schema \ + MyApp::SchemaClass create=static \ + inflect_singular='sub { $_[0] =~ /\A(.+?)(_id)?\z/; $1 }' \ + moniker_map='sub { join(q{}, map ucfirst, split(/[\W_]+/, lc $_[0])); }' \ + dbi:mysql:foodb myuname mypass + See L for a list of options Create a dynamic DBIx::Class::Schema::Loader-based Schema, @@ -136,6 +146,8 @@ has schema_class => (is => 'ro', isa => Str, required => 1); has loader_args => (is => 'rw', isa => HashRef); has connect_info => (is => 'rw', isa => HashRef); has old_schema => (is => 'rw', isa => Bool, lazy_build => 1); +has is_moose_schema => (is => 'rw', isa => Bool, lazy_build => 1); +has result_namespace => (is => 'rw', isa => Str, lazy_build => 1); has components => (is => 'rw', isa => ArrayRef); =head1 METHODS @@ -162,7 +174,7 @@ sub mk_compclass { sub BUILD { my $self = shift; my $helper = $self->helper; - my @args = $self->args->flatten if $self->args; + my @args = @{ $self->args || [] }; $helper->{schema_class} = $self->schema_class; @@ -175,7 +187,7 @@ sub BUILD { $self->traits(\@traits); $helper->{traits} = '[' - .(join ',' => map { qq{'$_'} } ($self->traits->flatten)) + .(join ',' => map { qq{'$_'} } @traits) .']'; splice @args, $traits_idx, 1, (); @@ -189,16 +201,21 @@ sub BUILD { $self->_parse_loader_args(\@args); $helper->{loader_args} = $self->_build_helper_loader_args; + } + } - if (first { /^dbi:/i } @args) { - $helper->{setup_connect_info} = 1; + my $dbi_dsn_part; + if (first { ($dbi_dsn_part) = /^(dbi):/i } @args) { + die +qq{DSN must start with 'dbi:' not '$dbi_dsn_part' (case matters!)} + if $dbi_dsn_part ne 'dbi'; - $helper->{connect_info} = - $self->_build_helper_connect_info(\@args); + $helper->{setup_connect_info} = 1; - $self->_parse_connect_info(\@args); - } - } + $helper->{connect_info} = + $self->_build_helper_connect_info(\@args); + + $self->_parse_connect_info(\@args); } $helper->{generator} = ref $self; @@ -237,8 +254,10 @@ sub _parse_loader_args { if $@; } - my @components = - $self->_build_loader_components(delete $loader_args{components}); + my @components = $self->_build_loader_components( + delete $loader_args{components}, + $loader_args{use_namespaces}, + ); $self->components(\@components); @@ -251,13 +270,15 @@ sub _parse_loader_args { %result = ( relationships => 1, - (%loader_args ? %loader_args : ()), + use_moose => $self->is_moose_schema ? 1 : 0, + col_collision_map => 'column_%s', (!$self->old_schema ? ( use_namespaces => 1 ) : ()), (@components ? ( components => \@components - ) : ()) + ) : ()), + (%loader_args ? %loader_args : ()), ); $self->loader_args(\%result); @@ -270,7 +291,7 @@ sub _read_loader_args { my %loader_args; - while (@$args && $args->[0] !~ /^dbi:/) { + while (@$args && $args->[0] !~ /^dbi:/i) { my ($key, $val) = split /=/, shift(@$args), 2; if ($self->_is_struct($val)) { @@ -304,9 +325,10 @@ sub _build_helper_loader_args { } sub _build_loader_components { - my ($self, $components) = @_; + my ($self, $components, $use_namespaces) = @_; - my @components = $self->old_schema ? () : ('InflateColumn::DateTime'); + my @components = $self->old_schema && (not $use_namespaces) ? () + : ('InflateColumn::DateTime'); if ($components) { $components = [ $components ] if !ref $components; @@ -369,17 +391,77 @@ sub _build_helper_connect_info { sub _build_old_schema { my $self = shift; - my @schema_pm = split '::', $self->schema_class; - $schema_pm[-1] .= '.pm'; - my $schema_file = - File::Spec->catfile($self->helper->{base}, 'lib', @schema_pm); + return $self->result_namespace eq '' ? 1 : 0; +} + +sub _build_is_moose_schema { + my $self = shift; + + my @schema_parts = split '::', $self->schema_class; + + my $result_dir = File::Spec->catfile( + $self->helper->{base}, 'lib', @schema_parts, $self->result_namespace + ); + + # assume yes for new schemas + return 1 if not -d $result_dir; + + my $uses_moose = 1; - if (-f $schema_file) { - my $schema_code = do { local (@ARGV, $/) = $schema_file; <> }; - return 1 if $schema_code =~ /->load_classes/; + my $cwd = getcwd; + + try { + finddepth(sub { + return if $File::Find::name !~ /\.pm\z/; + + open my $fh, '<', $File::Find::name + or die "Could not open $File::Find::name: $!"; + + my $code = do { local $/; <$fh> }; + close $fh; + + $uses_moose = 0 if $code !~ /\nuse Moose;\n/; + + die; + }, $result_dir); + }; + + chdir $cwd; + + return $uses_moose; +} + +sub _build_result_namespace { + my $self = shift; + + my @schema_parts = split '::', $self->schema_class; + my $schema_pm = + File::Spec->catfile($self->helper->{base}, 'lib', @schema_parts) . '.pm'; + + if (not -f $schema_pm) { + try { Class::MOP::load_class('DBIx::Class::Schema::Loader') }; + + return 'Result' if $@; + + return DBIx::Class::Schema::Loader->VERSION('0.05') ? 'Result' : ''; + } + + open my $fh, '<', $schema_pm or die "Could not open $schema_pm: $!"; + my $code = do { local $/; <$fh> }; + close $fh; + + my ($result_namespace) = $code =~ /result_namespace => '([^']+)'/; + + if (not $result_namespace) { + if ($code =~ /->load_classes/) { + $result_namespace = ''; + } + else { + $result_namespace = 'Result'; + } } - 0; + return $result_namespace; } sub _data_struct_to_string { @@ -401,7 +483,7 @@ sub _get_dsn_user_pass { if ($dsn =~ /sqlite/i) { ($user, $password) = ('', ''); - shift @$connect_info while $connect_info->[0] eq ''; + shift @$connect_info while @$connect_info and $connect_info->[0] eq ''; } else { ($user, $password) = splice @$connect_info, 0, 2; } @@ -451,7 +533,7 @@ sub _parse_connect_info { sub _is_struct { my ($self, $val) = @_; - return $val =~ /^\s*[[{]/; + return $val =~ /^\s*(?:sub|[[{])/; } sub _quote { @@ -473,7 +555,7 @@ sub _eval { return $code if looks_like_number $code; - return $code if $code =~ m{^[\w;:/]*\z}; + return $code if not $self->_is_struct($code); return eval "{no strict; $code}"; } @@ -506,7 +588,7 @@ sub _gen_static_schema { my $schema_dir = File::Spec->catfile($helper->{base}, 'lib'); - eval { Class::MOP::load_class('DBIx::Class::Schema::Loader') }; + try { Class::MOP::load_class('DBIx::Class::Schema::Loader') }; die "Cannot load DBIx::Class::Schema::Loader: $@" if $@; DBIx::Class::Schema::Loader->import( @@ -564,11 +646,12 @@ L, L =head1 AUTHOR -Brandon L Black, C +See L and +L. -Contributors: +=head1 COPYRIGHT -Rafael Kitover, C<> +See L. =head1 LICENSE