use Moose;
no warnings 'uninitialized';
-our $VERSION = '0.24';
+our $VERSION = '0.45';
+$VERSION = eval $VERSION;
use Carp;
use Tie::IxHash ();
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 File::Find 'finddepth';
+use Try::Tiny;
+use Cwd 'getcwd';
=head1 NAME
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<DBIx::Class::Schema::Loader::Base> for a list of options
Create a dynamic DBIx::Class::Schema::Loader-based Schema,
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
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;
$self->traits(\@traits);
$helper->{traits} = '['
- .(join ',' => map { qq{'$_'} } ($self->traits->flatten))
+ .(join ',' => map { qq{'$_'} } @traits)
.']';
splice @args, $traits_idx, 1, ();
$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;
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);
%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);
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)) {
}
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;
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') };
+
+ 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 (-f $schema_file) {
- my $schema_code = do { local (@ARGV, $/) = $schema_file; <> };
- return 1 if $schema_code =~ /->load_classes/;
+ if (not $result_namespace) {
+ if ($code =~ /->load_classes/) {
+ $result_namespace = '';
+ }
+ else {
+ $result_namespace = 'Result';
+ }
}
- 0;
+ return $result_namespace;
}
sub _data_struct_to_string {
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;
}
sub _is_struct {
my ($self, $val) = @_;
- return $val =~ /^\s*[[{]/;
+ return $val =~ /^\s*(?:sub|[[{])/;
}
sub _quote {
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}";
}
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(
=head1 AUTHOR
-Brandon L Black, C<blblack@gmail.com>
+See L<Catalyst::Model::DBIC::Schema/AUTHOR> and
+L<Catalyst::Model::DBIC::Schema/CONTRIBUTORS>.
-Contributors:
+=head1 COPYRIGHT
-Rafael Kitover, C<rkitover at cpan.org>
+See L<Catalyst::Model::DBIC::Schema/COPYRIGHT>.
=head1 LICENSE