X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FBase.pm;h=61c8f4f495305ac44d3c50c99c0f8364dbc26176;hb=f3a657ef586cfc7a47a4b72080acd18d9f9c305b;hp=74b777e4eaf56e3b3caffaf67a22110331fd28f1;hpb=1e4730815c9321bd2381dd7db176ee496f84a8d4;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 74b777e..61c8f4f 100644 --- a/lib/DBIx/Class/Schema/Loader/Base.pm +++ b/lib/DBIx/Class/Schema/Loader/Base.pm @@ -22,7 +22,7 @@ use Scalar::Util 'looks_like_number'; use File::Slurp 'slurp'; require DBIx::Class; -our $VERSION = '0.06001'; +our $VERSION = '0.07000'; __PACKAGE__->mk_group_ro_accessors('simple', qw/ schema @@ -79,6 +79,7 @@ __PACKAGE__->mk_group_accessors('simple', qw/ generate_pod pod_comment_mode pod_comment_spillover_length + preserve_case /); =head1 NAME @@ -141,6 +142,10 @@ How to name relationship accessors. How to name Result classes. +=item column_accessors + +How to name column accessors in Result classes. + =back The values can be: @@ -165,11 +170,26 @@ the v5 RelBuilder. =item v6 -All monikers and relationships inflected using L, -more aggressive C<_id> stripping from relationships. +All monikers and relationships are inflected using +L, and there is more aggressive C<_id> stripping +from relationship names. In general, there is very little difference between v5 and v6 schemas. +=item v7 + +This mode is identical to C mode, except that monikerization of CamelCase +table names is also done correctly. + +CamelCase column names in case-preserving mode will also be handled correctly +for relationship name inflection. See L. + +In this mode, CamelCase L are normalized based on case +transition instead of just being lowercased, so C becomes C. + +If you don't have any CamelCase table or column names, you can upgrade without +breaking any of your code. + =back Dynamic schemas will always default to the 0.04XXX relationship names and won't @@ -242,9 +262,6 @@ For example: will set the C option to 0 for all generated relationships, except for C, which will have cascade_delete as 1. -NOTE: this option is not supported if v4 backward-compatible naming is -set either globally (naming => 'v4') or just for relationships. - =head2 debug If set to true, each constructive L statement the loader @@ -273,17 +290,17 @@ a scalar moniker. If the hash entry does not exist, or the function returns a false value, the code falls back to default behavior for that table name. -The default behavior is to singularize the table name, and: C, which is to say: lowercase everything, -split up the table name into chunks anywhere a non-alpha-numeric character -occurs, change the case of first letter of each chunk to upper case, and put -the chunks back together. Examples: +The default behavior is to split on case transition and non-alphanumeric +boundaries, singularize the resulting phrase, then join the titlecased words +together. Examples: - Table Name | Moniker Name - --------------------------- - luser | Luser - luser_group | LuserGroup - luser-opts | LuserOpt + Table Name | Moniker Name + --------------------------------- + luser | Luser + luser_group | LuserGroup + luser-opts | LuserOpt + stations_visited | StationVisited + routeChange | RouteChange =head2 inflect_plural @@ -437,6 +454,18 @@ columns with the DATE/DATETIME/TIMESTAMP data_types. File in Perl format, which should return a HASH reference, from which to read loader options. +=head1 preserve_case + +Usually column names are lowercased, to make them easier to work with in +L. This option lets you turn this behavior off, if the driver +supports it. + +Drivers for case sensitive databases like Sybase ASE or MSSQL with a +case-sensitive collation will turn this option on unconditionally. + +Currently the drivers for SQLite, mysql, MSSQL and Firebird/InterBase support +setting this option. + =head1 METHODS None of these methods are intended for direct invocation by regular @@ -445,7 +474,7 @@ L. =cut -my $CURRENT_V = 'v6'; +my $CURRENT_V = 'v7'; my @CLASS_ARGS = qw( schema_base_class result_base_class additional_base_classes @@ -529,6 +558,7 @@ sub new { $self->{naming} = { relationships => $naming_ver, monikers => $naming_ver, + column_accessors => $naming_ver, }; } @@ -658,6 +688,8 @@ Version $real_ver static schema detected, turning on backcompat mode. Set the 'naming' attribute or the SCHEMA_LOADER_BACKCOMPAT environment variable to disable this warning. +See: 'naming' in perldoc DBIx::Class::Schema::Loader::Base . + See perldoc DBIx::Class::Schema::Loader::Manual::UpgradingFromV4 if upgrading from version 0.04006. EOF @@ -667,8 +699,9 @@ EOF last; } - $self->naming->{relationships} ||= $v; - $self->naming->{monikers} ||= $v; + $self->naming->{relationships} ||= $v; + $self->naming->{monikers} ||= $v; + $self->naming->{column_accessors} ||= $v; $self->schema_version_to_dump($real_ver); @@ -824,7 +857,7 @@ sub _load_external { $self->_ext_stmt($class, <<"EOF"); # These lines were loaded from '$old_real_inc_path', -# based on the Result class name that would have been created by an 0.04006 +# based on the Result class name that would have been created by an older # version of the Loader. For a static schema, this happens only once during # upgrade. See skip_load_external to disable this feature. EOF @@ -836,7 +869,7 @@ EOF warn <<"EOF"; Detected external content in '$old_real_inc_path', a class name that would have -been used by an 0.04006 version of the Loader. +been used by an older version of the Loader. * PLEASE RENAME THIS CLASS: from '$old_class' to '$class', as that is the new name of the Result. @@ -896,12 +929,21 @@ sub rescan { my @created; my @current = $self->_tables_list({ constraint => $self->constraint, exclude => $self->exclude }); + foreach my $table (@current) { if(!exists $self->{_tables}->{$table}) { push(@created, $table); } } + my %current; + @current{@current} = (); + foreach my $table (keys %{ $self->{_tables} }) { + if (not exists $current{$table}) { + $self->_unregister_source_for_table($table); + } + } + my $loaded = $self->_load_tables(@created); return map { $self->monikers->{$_} } @$loaded; @@ -917,7 +959,10 @@ sub _relbuilder { require DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_040; return $self->{relbuilder} ||= DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_040->new( - $self->schema, $self->inflect_plural, $self->inflect_singular + $self->schema, + $self->inflect_plural, + $self->inflect_singular, + $self->relationship_attrs, ); } elsif ($self->naming->{relationships} eq 'v5') { @@ -929,6 +974,15 @@ sub _relbuilder { $self->relationship_attrs, ); } + elsif ($self->naming->{relationships} eq 'v6') { + require DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_06; + return $self->{relbuilder} ||= DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_06->new ( + $self->schema, + $self->inflect_plural, + $self->inflect_singular, + $self->relationship_attrs, + ); + } return $self->{relbuilder} ||= DBIx::Class::Schema::Loader::RelBuilder->new ( $self->schema, @@ -1418,7 +1472,7 @@ sub _resolve_col_accessor_collisions { while (my ($col, $info) = each %$col_info) { my $accessor = $info->{accessor} || $col; - next if $accessor eq 'id'; # XXX fix this in DBIC + next if $accessor eq 'id'; # special case (very common column) if (exists $methods{$accessor}) { $info->{accessor} = undef; @@ -1426,6 +1480,12 @@ sub _resolve_col_accessor_collisions { } } +sub _make_column_accessor_name { + my ($self, $column_name) = @_; + + return join '_', map lc, split /(?<=[[:lower:]])[\W_]*(?=[[:upper:]])|[\W_]+/, $column_name; +} + # Set up metadata (cols, pks, etc) sub _setup_src_meta { my ($self, $table) = @_; @@ -1447,12 +1507,20 @@ sub _setup_src_meta { my $cols = $self->_table_columns($table); my $col_info = $self->__columns_info_for($table); - if ($self->_is_case_sensitive) { + if ($self->preserve_case) { for my $col (keys %$col_info) { - $col_info->{$col}{accessor} = lc $col - if $col ne lc($col); + if ($col ne lc($col)) { + if ((not exists $self->naming->{column_accessors}) || (($self->naming->{column_accessors} =~ /(\d+)/)[0] >= 7)) { + $col_info->{$col}{accessor} = $self->_make_column_accessor_name($col); + } + else { + $col_info->{$col}{accessor} = lc $col; + } + } } - } else { + } + else { + # XXX this needs to go away $col_info = { map { lc($_), $col_info->{$_} } keys %$col_info }; } @@ -1527,8 +1595,16 @@ sub _default_table2moniker { return join '', map ucfirst, split /[\W_]+/, Lingua::EN::Inflect::Number::to_S(lc $table); } + elsif ($self->naming->{monikers} eq 'v6') { + (my $as_phrase = lc $table) =~ s/_+/ /g; + my $inflected = Lingua::EN::Inflect::Phrase::to_S($as_phrase); + + return join '', map ucfirst, split /\W+/, $inflected; + } + + my @words = map lc, split /(?<=[[:lower:]])[\W_]*(?=[[:upper:]])|[\W_]+/, $table; + my $as_phrase = join ' ', @words; - (my $as_phrase = lc $table) =~ s/_+/ /g; my $inflected = Lingua::EN::Inflect::Phrase::to_S($as_phrase); return join '', map ucfirst, split /\W+/, $inflected; @@ -1718,8 +1794,6 @@ sub _quote_table_name { return $qt . $table . $qt; } -sub _is_case_sensitive { 0 } - sub _custom_column_info { my ( $self, $table_name, $column_name, $column_info ) = @_; @@ -1741,6 +1815,34 @@ sub _datetime_column_info { return $result; } +sub _lc { + my ($self, $name) = @_; + + return $self->preserve_case ? $name : lc($name); +} + +sub _uc { + my ($self, $name) = @_; + + return $self->preserve_case ? $name : uc($name); +} + +sub _unregister_source_for_table { + my ($self, $table) = @_; + + eval { + local $@; + my $schema = $self->schema; + # in older DBIC it's a private method + my $unregister = $schema->can('unregister_source') || $schema->can('_unregister_source'); + $schema->$unregister($self->_table2moniker($table)); + delete $self->monikers->{$table}; + delete $self->classes->{$table}; + delete $self->_upgrading_classes->{$table}; + delete $self->{_tables}{$table}; + }; +} + # remove the dump dir from @INC on destruction sub DESTROY { my $self = shift;