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=8c8d0f60fcf66f87b88ceceec1df7d623ff7baf5;hpb=a75b6e588e4dfc332d5d6b342ca6386c550b7092;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 8c8d0f6..4ed267b 100644 --- a/lib/Catalyst/Helper/Model/DBIC/Schema.pm +++ b/lib/Catalyst/Helper/Model/DBIC/Schema.pm @@ -1,17 +1,23 @@ 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 (); use Data::Dumper (); use List::Util 'first'; -use MooseX::Types::Moose qw/Str HashRef Bool/; - -use namespace::clean -except => 'meta'; +use MooseX::Types::Moose qw/Str HashRef Bool ArrayRef/; +use Catalyst::Model::DBIC::Schema::Types 'CreateOption'; +use List::MoreUtils 'firstidx'; +use Scalar::Util 'looks_like_number'; +use File::Find 'finddepth'; +use Try::Tiny; +use Cwd 'getcwd'; =head1 NAME @@ -20,7 +26,7 @@ Catalyst::Helper::Model::DBIC::Schema - Helper for DBIC Schema Models =head1 SYNOPSIS script/create.pl model CatalystModelName DBIC::Schema MyApp::SchemaClass \ - [ create=dynamic | create=static ] [ roles=role1,role2... ] \ + [ create=dynamic | create=static ] [ traits=trait1,trait2... ] \ [ Schema::Loader opts ] [ dsn user pass ] \ [ other connect_info args ] @@ -52,7 +58,7 @@ L at runtime, and will not automatically adapt itself to changes in your database structure. You can edit the generated classes by hand to refine them. -C is the list of roles to apply to the model, see +C is the list of traits to apply to the model, see L for details. C are described in L below. @@ -84,6 +90,10 @@ user and pass can be omitted for sqlite, since they are always empty AutoCommit=1 cursor_class=DBIx::Class::Cursor::Cached \ on_connect_do='["select 1", "select 2"]' quote_char='"' +If using a 2 character quote_char: + + script/myapp_create.pl ... quote_char='[]' + B In C the above example would be: @@ -97,9 +107,17 @@ Same, but with extra Schema::Loader args (separate multiple values by commas): script/myapp_create.pl model CatalystModelName DBIC::Schema \ MyApp::SchemaClass create=static db_schema=foodb components=Foo,Bar \ - exclude='^wibble|wobble$' moniker_map='{ foo => "FOO" }' \ + 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, @@ -121,13 +139,16 @@ in your app config, or [not recommended] in the schema itself). =cut has helper => (is => 'ro', isa => 'Catalyst::Helper', required => 1); - +has create => (is => 'rw', isa => CreateOption); +has args => (is => 'ro', isa => ArrayRef); +has traits => (is => 'rw', isa => ArrayRef); 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 @@ -141,46 +162,79 @@ files. sub mk_compclass { my ($package, $helper, $schema_class, @args) = @_; - my $self = $package->new(helper => $helper, schema_class => $schema_class); + my $self = $package->new( + helper => $helper, + schema_class => $schema_class, + args => \@args + ); - $helper->{schema_class} = $schema_class; + $self->run; +} + +sub BUILD { + my $self = shift; + my $helper = $self->helper; + my @args = @{ $self->args || [] }; + + $helper->{schema_class} = $self->schema_class; @args = $self->_cleanup_args(\@args); - my $create = ''; - if ($args[0] && $args[0] =~ /^create=(dynamic|static)\z/) { - $create = $1; - shift @args; + my ($traits_idx, $traits); + if (($traits_idx = firstidx { ($traits) = /^traits=(\S*)\z/ } @args) != -1) { + my @traits = split /,/ => $traits; - if ($args[0] && $args[0] =~ /^roles=(.*)\z/) { - $helper->{roles} = '[' - .(join ',' => map { qq{'$_'} } (split /,/ => $1)) - .']'; - shift @args; - } + $self->traits(\@traits); + + $helper->{traits} = '[' + .(join ',' => map { qq{'$_'} } @traits) + .']'; + + splice @args, $traits_idx, 1, (); + } + + if ($args[0] && $args[0] =~ /^create=(\S*)\z/) { + $self->create($1); + shift @args; if (@args) { $self->_parse_loader_args(\@args); - if (first { /^dbi:/i } @args) { - $helper->{setup_connect_info} = 1; + $helper->{loader_args} = $self->_build_helper_loader_args; + } + } - $helper->{connect_info} = - $self->_build_helper_connect_info(\@args); + 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'; - $self->_parse_connect_info(\@args) if $create eq 'static'; - } - } + $helper->{setup_connect_info} = 1; + + $helper->{connect_info} = + $self->_build_helper_connect_info(\@args); + + $self->_parse_connect_info(\@args); } $helper->{generator} = ref $self; $helper->{generator_version} = $VERSION; +} + +=head2 run + +Can be called on an instance to generate the files. + +=cut - if ($create eq 'dynamic') { +sub run { + my $self = shift; + + if ($self->create eq 'dynamic') { $self->_print_dynamic_deprecation_warning; - $self->helper->{loader_args} = $self->_build_helper_loader_args; $self->_gen_dynamic_schema; - } elsif ($create eq 'static') { + } elsif ($self->create eq 'static') { $self->_gen_static_schema; } @@ -195,13 +249,17 @@ sub _parse_loader_args { while (my ($key, $val) = each %loader_args) { next if $key =~ /^(?:components|constraint|exclude)\z/; - $loader_args{$key} = eval $val; + $loader_args{$key} = $self->_eval($val); die "syntax error for loader args key '$key' with value '$val': $@" 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); for my $re_opt (qw/constraint exclude/) { $loader_args{$re_opt} = qr/$loader_args{$re_opt}/ @@ -212,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); @@ -231,10 +291,12 @@ 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 ((my @vals = split /,/ => $val) > 1) { + if ($self->_is_struct($val)) { + $loader_args{$key} = $val; + } elsif ((my @vals = split /,/ => $val) > 1) { $loader_args{$key} = \@vals; } else { $loader_args{$key} = $val; @@ -263,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; @@ -292,7 +355,7 @@ sub _build_helper_connect_info { for (@connect_info) { if (/^\s*{.*}\s*\z/) { - my $hash = eval $_; + my $hash = $self->_eval($_); die "Syntax errorr in connect_info hash: $_: $@" if $@; my %hash = %$hash; @@ -302,7 +365,7 @@ sub _build_helper_connect_info { if (ref $val) { $val = $self->_data_struct_to_string($val); } else { - $val = qq{'$val'}; + $val = $self->_quote($val); } $helper_connect_info{$key} = $val; @@ -313,7 +376,13 @@ sub _build_helper_connect_info { my ($key, $val) = split /=/, $_, 2; - $helper_connect_info{$key} = $self->_quote_unless_struct($val); + if ($key eq 'quote_char') { + $helper_connect_info{$key} = length($val) == 1 ? + $self->_quote($val) : + $self->_data_struct_to_string([split //, $val]); + } else { + $helper_connect_info{$key} = $self->_quote_unless_struct($val); + } } \%helper_connect_info @@ -322,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; + + 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') }; - if (-f $schema_file) { - my $schema_code = do { local (@ARGV, $/) = $schema_file; <> }; - return 1 if $schema_code =~ /->load_classes/; + 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 { @@ -354,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; } @@ -374,7 +503,7 @@ sub _parse_connect_info { for (@connect_info) { if (/^\s*{.*}\s*\z/) { - my $hash = eval $_; + my $hash = $self->_eval($_); die "Syntax errorr in connect_info hash: $_: $@" if $@; %connect_info = (%connect_info, %$hash); @@ -384,10 +513,12 @@ sub _parse_connect_info { my ($key, $val) = split /=/, $_, 2; - if ($key =~ /^(?:quote_char|name_sep)\z/) { + if ($key eq 'quote_char') { + $connect_info{$key} = length($val) == 1 ? $val : [split //, $val]; + } elsif ($key =~ /^(?:name_sep|limit_dialect)\z/) { $connect_info{$key} = $val; } else { - $connect_info{$key} = eval $val; + $connect_info{$key} = $self->_eval($val); } die "syntax error for connect_info key '$key' with value '$val': $@" @@ -399,12 +530,34 @@ sub _parse_connect_info { \%connect_info } +sub _is_struct { + my ($self, $val) = @_; + + return $val =~ /^\s*(?:sub|[[{])/; +} + +sub _quote { + my ($self, $val) = @_; + + return 'q{'.$val.'}'; +} + sub _quote_unless_struct { my ($self, $val) = @_; - $val = qq{'$val'} if $val !~ /^\s*[[{]/; + $val = $self->_quote($val) if not $self->_is_struct($val); + + return $val; +} + +sub _eval { + my ($self, $code) = @_; + + return $code if looks_like_number $code; + + return $code if not $self->_is_struct($code); - $val; + return eval "{no strict; $code}"; } sub _gen_dynamic_schema { @@ -435,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( @@ -493,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 @@ -562,7 +716,7 @@ use base 'Catalyst::Model::DBIC::Schema'; __PACKAGE__->config( schema_class => '[% schema_class %]', - [% IF roles %]roles => [% roles %],[% END %] + [% IF traits %]traits => [% traits %],[% END %] [% IF setup_connect_info %]connect_info => { [%- FOREACH key = connect_info.keys %] [% key %] => [% connect_info.${key} %],