X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FBase.pm;h=4fdc9e79c32d4dfed8845d2dd23a74d38cb1c887;hb=9ae3eecd42f2c70ee84a5322fb2754c84fae5d2c;hp=eff9baf6c9cc9447cb72f74260be3248c08703d6;hpb=13f976151b00bb55786299a0d8ac6a251313c3cb;p=dbsrgits%2FDBIx-Class-Schema-Loader.git
diff --git a/lib/DBIx/Class/Schema/Loader/Base.pm b/lib/DBIx/Class/Schema/Loader/Base.pm
index eff9baf..4fdc9e7 100644
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@ -28,9 +28,10 @@ use DBIx::Class ();
use Encode qw/encode decode/;
use List::Util qw/all any none/;
use File::Temp 'tempfile';
+use curry;
use namespace::clean;
-our $VERSION = '0.07046';
+our $VERSION = '0.07049';
__PACKAGE__->mk_group_ro_accessors('simple', qw/
schema
@@ -418,9 +419,9 @@ this hash of parameters (as a list):
rel_type # the type of the relationship: 'belongs_to', 'has_many' or 'might_have'
local_source # the DBIx::Class::ResultSource object for the source the rel is *from*
remote_source # the DBIx::Class::ResultSource object for the source the rel is *to*
- local_table # a DBIx::Class::Schema::Loader::Table object for the table of the source the rel is from
+ local_table # the DBIx::Class::Schema::Loader::Table object for the table of the source the rel is from
local_cols # an arrayref of column names of columns used in the rel in the source it is from
- remote_table # a DBIx::Class::Schema::Loader::Table object for the table of the source the rel is to
+ remote_table # the DBIx::Class::Schema::Loader::Table object for the table of the source the rel is to
remote_cols # an arrayref of column names of columns used in the rel in the source it is to
attrs # the attributes that would be set
@@ -613,14 +614,27 @@ a hashref of unqualified table name keys and moniker values
=item *
-a coderef for a translator function taking a L
argument (which stringifies to the
-unqualified table name) and returning a scalar moniker
+a coderef that returns the moniker, which is called with the following
+arguments:
-The function is also passed a coderef that can be called with either
-of the hashref forms to get the moniker mapped accordingly. This is
-useful if you need to handle some monikers specially, but want to use
-the hashref form for the rest.
+=over
+
+=item *
+
+the L object for the table
+
+=item *
+
+the default moniker that DBIC would ordinarily give this table
+
+=item *
+
+a coderef that can be called with either of the hashref forms to get
+the moniker mapped accordingly. This is useful if you need to handle
+some monikers specially, but want to use the hashref form for the
+rest.
+
+=back
=back
@@ -643,7 +657,7 @@ together. Examples:
Map for overriding the monikerization of individual L.
The keys are the moniker part to override, the value is either a
-hashref of coderef for mapping the corresponding part of the
+hashref or coderef for mapping the corresponding part of the
moniker. If a coderef is used, it gets called with the moniker part
and the hash key the code ref was found under.
@@ -664,23 +678,36 @@ L takes precedence over this.
Same as moniker_map, but for column accessor names. The nested
hashref form is traversed according to L, with an
extra level at the bottom for the column name. If a coderef is
-passed, the code is called with arguments of
+passed, the code is called with the following arguments:
+
+=over
+
+=item *
+
+the L object for the column
+
+=item *
+
+the default accessor name that DBICSL would ordinarily give this column
+
+=item *
+
+a hashref of this form:
- the DBIx::Class::Schema::Loader::Column object for the column,
- default accessor name that DBICSL would ordinarily give this column,
{
table_class => name of the DBIC class we are building,
table_moniker => calculated moniker for this table (after moniker_map if present),
- table => table object of interface DBIx::Class::Schema::Loader::Table,
+ table => the DBIx::Class::Schema::Loader::Table object for the table,
full_table_name => schema-qualified name of the database table (RDBMS specific),
schema_class => name of the schema class we are building,
column_info => hashref of column info (data_type, is_nullable, etc),
}
- coderef ref that can be called with a hashref map
-The L and
-L objects stringify to their
-unqualified names.
+=item *
+
+a coderef that can be called with a hashref map
+
+=back
=head2 rel_name_map
@@ -716,9 +743,9 @@ If it is a coderef, it will be passed a hashref of this form:
remote_moniker => moniker of the DBIC class we are related to,
remote_columns => columns in the other table in the relationship,
# for type => "many_to_many" only:
- link_class => name of the DBIC class for the link table
- link_moniker => moniker of the DBIC class for the link table
- link_rel_name => name of the relationship to the link table
+ link_class => name of the DBIC class for the link table,
+ link_moniker => moniker of the DBIC class for the link table,
+ link_rel_name => name of the relationship to the link table,
}
In addition it is passed a coderef that can be called with a hashref map.
@@ -885,8 +912,8 @@ L for a column.
Must be a coderef that returns a hashref with the extra attributes.
-Receives the L (which
-stringifies to the unqualified table name), column name and column_info.
+Receives the L object, column name
+and column_info.
For example:
@@ -963,12 +990,13 @@ are methods, which will cause namespace::autoclean to spare them from removal.
This prevents the "Hey, where'd my overloads go?!" effect.
-If you don't care about operator overloads, enabling this option falls back to
-just using L itself.
+If you don't care about operator overloads (or if you know your Moose is at at
+least version 2.1400, where MooseX::MarkAsMethods is no longer necessary),
+enabling this option falls back to just using L itself.
If none of the above made any sense, or you don't have some pressing need to
only use L, leaving this set to the default is
-recommended.
+just fine.
=head2 col_collision_map
@@ -1154,9 +1182,17 @@ sub new {
$self->_validate_result_roles_map;
if ($self->use_moose) {
- if (not DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for('use_moose')) {
- die sprintf "You must install the following CPAN modules to enable the use_moose option: %s.\n",
- DBIx::Class::Schema::Loader::Optional::Dependencies->req_missing_for('use_moose');
+ if ($self->only_autoclean) {
+ if (not DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for('use_moose_only_autoclean')) {
+ die sprintf "You must install the following CPAN modules to enable the use_moose and only_autoclean options: %s.\n",
+ DBIx::Class::Schema::Loader::Optional::Dependencies->req_missing_for('use_moose_only_autoclean');
+ }
+ }
+ else {
+ if (not DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for('use_moose')) {
+ die sprintf "You must install the following CPAN modules to enable the use_moose option: %s.\n",
+ DBIx::Class::Schema::Loader::Optional::Dependencies->req_missing_for('use_moose');
+ }
}
}
@@ -2250,7 +2286,7 @@ sub _parse_generated_file {
my $mark_md5 = $2;
# Pull out the version and timestamp from the line above
- ($ver, $ts) = $gen =~ m/^# Created by DBIx::Class::Schema::Loader( v[\d.]+)?( @ [\d-]+ [\d:]+)?\r?\Z/m;
+ ($ver, $ts) = $gen =~ m/^# Created by DBIx::Class::Schema::Loader( v[\d._]+)?( @ [\d-]+ [\d:]+)?\r?\Z/m;
$ver =~ s/^ v// if $ver;
$ts =~ s/^ @ // if $ts;
@@ -2568,7 +2604,7 @@ sub _make_column_accessor_name {
my $accessor = $self->_run_user_map(
$self->col_accessor_map,
- sub { $self->_default_column_accessor_name( shift ) },
+ $self->curry::_default_column_accessor_name,
$column_name,
$column_context_info,
);
@@ -2821,7 +2857,7 @@ sub _table2moniker {
$self->_run_user_map(
$self->moniker_map,
- sub { $self->_default_table2moniker( shift ) },
+ $self->curry::_default_table2moniker,
$table
);
}