X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FBase.pm;h=28d2bac22780eb94bb59595a754af2bf1a837e21;hb=b1d11550f638228695e0ce1120352bfae3c00be5;hp=076536bad4bd5265b8bb931f7463cf21cc2984de;hpb=fa994d3c6ada53f4610e6384fe924d4bf8163a68;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 076536b..28d2bac 100644 --- a/lib/DBIx/Class/Schema/Loader/Base.pm +++ b/lib/DBIx/Class/Schema/Loader/Base.pm @@ -2,16 +2,30 @@ package DBIx::Class::Schema::Loader::Base; use strict; use warnings; -use base qw/Class::Accessor::Fast/; +use base qw/Class::Accessor::Grouped Class::C3::Componentised/; +use namespace::autoclean; use Class::C3; use Carp::Clan qw/^DBIx::Class/; -use UNIVERSAL::require; use DBIx::Class::Schema::Loader::RelBuilder; use Data::Dump qw/ dump /; use POSIX qw//; +use File::Spec qw//; +use Cwd qw//; +use Digest::MD5 qw//; +use Lingua::EN::Inflect::Number qw//; +use Lingua::EN::Inflect::Phrase qw//; +use File::Temp qw//; +use Class::Unload; +use Class::Inspector (); +use Data::Dumper::Concise; +use Scalar::Util 'looks_like_number'; +use File::Slurp 'slurp'; +use DBIx::Class::Schema::Loader::Utils 'split_name'; require DBIx::Class; -__PACKAGE__->mk_ro_accessors(qw/ +our $VERSION = '0.07000'; + +__PACKAGE__->mk_group_ro_accessors('simple', qw/ schema schema_class @@ -22,21 +36,53 @@ __PACKAGE__->mk_ro_accessors(qw/ left_base_classes components resultset_components - relationships + skip_relationships + skip_load_external moniker_map + custom_column_info inflect_singular inflect_plural debug dump_directory dump_overwrite + really_erase_my_files + resultset_namespace + default_resultset_class + schema_base_class + result_base_class + overwrite_modifications - legacy_default_inflections + relationship_attrs db_schema _tables classes + _upgrading_classes monikers - /); + dynamic + naming + datetime_timezone + datetime_locale + config_file + loader_class + qualify_objects +/); + + +__PACKAGE__->mk_group_accessors('simple', qw/ + version_to_dump + schema_version_to_dump + _upgrading_from + _upgrading_from_load_classes + _downgrading_to_load_classes + _rewriting_result_namespace + use_namespaces + result_namespace + generate_pod + pod_comment_mode + pod_comment_spillover_length + preserve_case +/); =head1 NAME @@ -54,11 +100,167 @@ classes, and implements the common functionality between them. =head1 CONSTRUCTOR OPTIONS These constructor options are the base options for -L. Available constructor options are: +L. Available constructor options are: + +=head2 skip_relationships + +Skip setting up relationships. The default is to attempt the loading +of relationships. + +=head2 skip_load_external + +Skip loading of other classes in @INC. The default is to merge all other classes +with the same name found in @INC into the schema file we are creating. + +=head2 naming + +Static schemas (ones dumped to disk) will, by default, use the new-style +relationship names and singularized Results, unless you're overwriting an +existing dump made by an older version of L, in +which case the backward compatible RelBuilder will be activated, and the +appropriate monikerization used. + +Specifying + + naming => 'current' + +will disable the backward-compatible RelBuilder and use +the new-style relationship names along with singularized Results, even when +overwriting a dump made with an earlier version. + +The option also takes a hashref: + + naming => { relationships => 'v7', monikers => 'v7' } + +The keys are: + +=over 4 + +=item relationships + +How to name relationship accessors. + +=item monikers + +How to name Result classes. + +=item column_accessors + +How to name column accessors in Result classes. + +=back + +The values can be: + +=over 4 + +=item current + +Latest style, whatever that happens to be. + +=item v4 + +Unsingularlized monikers, C only relationships with no _id stripping. + +=item v5 + +Monikers singularized as whole words, C relationships for FKs on +C constraints, C<_id> stripping for belongs_to relationships. + +Some of the C<_id> stripping edge cases in C<0.05003> have been reverted for +the v5 RelBuilder. + +=item v6 + +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 +singularize Results for backward compatibility, to activate the new RelBuilder +and singularization put this in your C file: + + __PACKAGE__->naming('current'); + +Or if you prefer to use 0.05XXX features but insure that nothing breaks in the +next major version upgrade: + + __PACKAGE__->naming('v5'); + +=head2 generate_pod + +By default POD will be generated for columns and relationships, using database +metadata for the text if available and supported. + +Reading database metadata (e.g. C) is only +supported for Postgres right now. + +Set this to C<0> to turn off all POD generation. + +=head2 pod_comment_mode + +Controls where table comments appear in the generated POD. Smaller table +comments are appended to the C section of the documentation, and larger +ones are inserted into C instead. You can force a C +section to be generated with the comment always, only use C, or choose +the length threshold at which the comment is forced into the description. + +=over 4 + +=item name + +Use C section only. + +=item description + +Force C always. + +=item auto + +Use C if length > L, this is the +default. + +=back -=head2 relationships +=head2 pod_comment_spillover_length -Try to automatically detect/setup has_a and has_many relationships. +When pod_comment_mode is set to C, this is the length of the comment at +which it will be forced into a separate description section. + +The default is C<60> + +=head2 relationship_attrs + +Hashref of attributes to pass to each generated relationship, listed +by type. Also supports relationship type 'all', containing options to +pass to all generated relationships. Attributes set for more specific +relationship types override those set in 'all'. + +For example: + + relationship_attrs => { + belongs_to => { is_deferrable => 1 }, + }, + +use this to make your foreign key constraints DEFERRABLE. =head2 debug @@ -88,16 +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: 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 | LuserOpts + Table Name | Moniker Name + --------------------------------- + luser | Luser + luser_group | LuserGroup + luser-opts | LuserOpt + stations_visited | StationVisited + routeChange | RouteChange =head2 inflect_plural @@ -111,6 +314,15 @@ L. As L above, but for singularizing relationship names. Default behavior is to utilize L. +=head2 schema_base_class + +Base class for your schema classes. Defaults to 'DBIx::Class::Schema'. + +=head2 result_base_class + +Base class for your table classes (aka result classes). Defaults to +'DBIx::Class::Core'. + =head2 additional_base_classes List of additional base classes all of your table classes will use. @@ -127,7 +339,8 @@ List of additional classes which all of your table classes will use. =head2 components List of additional components to be loaded into all of your table -classes. A good example would be C. +classes. A good example would be +L =head2 resultset_components @@ -136,18 +349,17 @@ classes. A good example would be C. Component C will be automatically added to the above C list if this option is set. -=head2 legacy_default_inflections +=head2 use_namespaces -Setting this option changes the default fallback for L to -utilize L, and L to a no-op. -Those choices produce substandard results, but might be necessary to support -your existing code if you started developing on a version prior to 0.03 and -don't wish to go around updating all your relationship names to the new -defaults. +This is now the default, to go back to L pass +a C<0>. -This option will continue to be supported until at least version 0.05xxx, -but may dissappear sometime thereafter. It is recommended that you update -your code to use the newer-style inflections when you have the time. +Generate result class names suitable for +L and call that instead of +L. When using this option you can also +specify any of the options for C (i.e. C, +C, C), and they will be added +to the call (and the generated result class names adjusted appropriately). =head2 dump_directory @@ -161,11 +373,7 @@ in memory. The created schema class will have the same classname as the one on which you are setting this option (and the ResultSource classes will be -based on this name as well). Therefore it is wise to note that if you -point the C option of a schema class at the live libdir -where that class is currently located, it will overwrite itself with a -manual version of itself. This might be a really good or bad thing -depending on your situation and perspective. +based on this name as well). Normally you wouldn't hard-code this setting in your schema class, as it is meant for one-time manual usage. @@ -175,37 +383,110 @@ recommended way to access this functionality. =head2 dump_overwrite -If set to a true value, the dumping code will overwrite existing files. -The default is false, which means the dumping code will die if it encounters -an existing file. +Deprecated. See L below, which does *not* mean +the same thing as the old C setting from previous releases. + +=head2 really_erase_my_files + +Default false. If true, Loader will unconditionally delete any existing +files before creating the new ones from scratch when dumping a schema to disk. + +The default behavior is instead to only replace the top portion of the +file, up to and including the final stanza which contains +C<# DO NOT MODIFY THIS OR ANYTHING ABOVE!> +leaving any customizations you placed after that as they were. + +When C is not set, if the output file already exists, +but the aforementioned final stanza is not found, or the checksum +contained there does not match the generated contents, Loader will +croak and not touch the file. + +You should really be using version control on your schema classes (and all +of the rest of your code for that matter). Don't blame me if a bug in this +code wipes something out when it shouldn't have, you've been warned. + +=head2 overwrite_modifications + +Default false. If false, when updating existing files, Loader will +refuse to modify any Loader-generated code that has been modified +since its last run (as determined by the checksum Loader put in its +comment lines). + +If true, Loader will discard any manual modifications that have been +made to Loader-generated code. + +Again, you should be using version control on your schema classes. Be +careful with this option. + +=head2 custom_column_info + +Hook for adding extra attributes to the +L for a column. + +Must be a coderef that returns a hashref with the extra attributes. + +Receives the table name, column name and column_info. + +For example: + + custom_column_info => sub { + my ($table_name, $column_name, $column_info) = @_; + + if ($column_name eq 'dog' && $column_info->{default_value} eq 'snoopy') { + return { is_snoopy => 1 }; + } + }, + +This attribute can also be used to set C on a non-datetime +column so it also receives the L and/or L. + +=head2 datetime_timezone + +Sets the timezone attribute for L for all +columns with the DATE/DATETIME/TIMESTAMP data_types. -=head1 DEPRECATED CONSTRUCTOR OPTIONS +=head2 datetime_locale -B +Sets the locale attribute for L for all +columns with the DATE/DATETIME/TIMESTAMP data_types. -=head2 inflect_map +=head1 config_file -Equivalent to L. +File in Perl format, which should return a HASH reference, from which to read +loader options. -=head2 inflect +=head1 preserve_case -Equivalent to L. +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. -=head2 connect_info, dsn, user, password, options +Drivers for case sensitive databases like Sybase ASE or MSSQL with a +case-sensitive collation will turn this option on unconditionally. -You connect these schemas the same way you would any L, -which is by calling either C or C on a schema class -or object. These options are only supported via the deprecated -C interface, which is also being removed in 0.04000. +Currently the drivers for SQLite, mysql, MSSQL and Firebird/InterBase support +setting this option. + +=head1 qualify_objects + +Set to true to prepend the L to table names for C<< +__PACKAGE__->table >> calls, and to some other things like Oracle sequences. =head1 METHODS None of these methods are intended for direct invocation by regular -users of L. Anything you can find here -can also be found via standard L methods somehow. +users of L. Some are proxied via +L. =cut +my $CURRENT_V = 'v7'; + +my @CLASS_ARGS = qw( + schema_base_class result_base_class additional_base_classes + left_base_classes additional_classes components resultset_components +); + # ensure that a peice of object data is a valid arrayref, creating # an empty one or encapsulating whatever's there. sub _ensure_arrayref { @@ -232,7 +513,18 @@ sub new { bless $self => $class; - $self->{db_schema} ||= ''; + if (my $config_file = $self->config_file) { + my $config_opts = do $config_file; + + croak "Error reading config from $config_file: $@" if $@; + + croak "Config file $config_file must be a hashref" unless ref($config_opts) eq 'HASH'; + + while (my ($k, $v) = each %$config_opts) { + $self->{$k} = $v unless exists $self->{$k}; + } + } + $self->_ensure_arrayref(qw/additional_classes additional_base_classes left_base_classes @@ -240,64 +532,368 @@ sub new { resultset_components /); + $self->_validate_class_args; + push(@{$self->{components}}, 'ResultSetManager') if @{$self->{resultset_components}}; $self->{monikers} = {}; $self->{classes} = {}; - - # Support deprecated arguments - for(qw/inflect_map inflect/) { - warn "Argument $_ is deprecated in favor of 'inflect_plural'" - . ", and will be removed in 0.04000" - if $self->{$_}; - } - $self->{inflect_plural} ||= $self->{inflect_map} || $self->{inflect}; + $self->{_upgrading_classes} = {}; $self->{schema_class} ||= ( ref $self->{schema} || $self->{schema} ); $self->{schema} ||= $self->{schema_class}; + croak "dump_overwrite is deprecated. Please read the" + . " DBIx::Class::Schema::Loader::Base documentation" + if $self->{dump_overwrite}; + + $self->{dynamic} = ! $self->{dump_directory}; + $self->{temp_directory} ||= File::Temp::tempdir( 'dbicXXXX', + TMPDIR => 1, + CLEANUP => 1, + ); + + $self->{dump_directory} ||= $self->{temp_directory}; + + $self->version_to_dump($DBIx::Class::Schema::Loader::VERSION); + $self->schema_version_to_dump($DBIx::Class::Schema::Loader::VERSION); + + if ((not ref $self->naming) && defined $self->naming) { + my $naming_ver = $self->naming; + $self->{naming} = { + relationships => $naming_ver, + monikers => $naming_ver, + column_accessors => $naming_ver, + }; + } + + if ($self->naming) { + for (values %{ $self->naming }) { + $_ = $CURRENT_V if $_ eq 'current'; + } + } + $self->{naming} ||= {}; + + if ($self->custom_column_info && ref $self->custom_column_info ne 'CODE') { + croak 'custom_column_info must be a CODE ref'; + } + + $self->_check_back_compat; + + $self->use_namespaces(1) unless defined $self->use_namespaces; + $self->generate_pod(1) unless defined $self->generate_pod; + $self->pod_comment_mode('auto') unless defined $self->pod_comment_mode; + $self->pod_comment_spillover_length(60) unless defined $self->pod_comment_spillover_length; + $self; } -sub _load_external { +sub _check_back_compat { + my ($self) = @_; + +# dynamic schemas will always be in 0.04006 mode, unless overridden + if ($self->dynamic) { +# just in case, though no one is likely to dump a dynamic schema + $self->schema_version_to_dump('0.04006'); + + if (not %{ $self->naming }) { + warn < 1' if/when upgrading. + +See perldoc DBIx::Class::Schema::Loader::Manual::UpgradingFromV4 for more +details. +EOF + } + else { + $self->_upgrading_from('v4'); + } + + $self->naming->{relationships} ||= 'v4'; + $self->naming->{monikers} ||= 'v4'; + + if ($self->use_namespaces) { + $self->_upgrading_from_load_classes(1); + } + else { + $self->use_namespaces(0); + } + + return; + } + +# otherwise check if we need backcompat mode for a static schema + my $filename = $self->_get_dump_filename($self->schema_class); + return unless -e $filename; + + open(my $fh, '<', $filename) + or croak "Cannot open '$filename' for reading: $!"; + + my $load_classes = 0; + my $result_namespace = ''; + + while (<$fh>) { + if (/^__PACKAGE__->load_classes;/) { + $load_classes = 1; + } elsif (/result_namespace => '([^']+)'/) { + $result_namespace = $1; + } elsif (my ($real_ver) = + /^# Created by DBIx::Class::Schema::Loader v(\d+\.\d+)/) { + + if ($load_classes && (not defined $self->use_namespaces)) { + warn <<"EOF" unless $ENV{SCHEMA_LOADER_BACKCOMPAT}; + +'load_classes;' static schema detected, turning off 'use_namespaces'. + +Set the 'use_namespaces' attribute or the SCHEMA_LOADER_BACKCOMPAT environment +variable to disable this warning. + +See perldoc DBIx::Class::Schema::Loader::Manual::UpgradingFromV4 for more +details. +EOF + $self->use_namespaces(0); + } + elsif ($load_classes && $self->use_namespaces) { + $self->_upgrading_from_load_classes(1); + } + elsif ((not $load_classes) && defined $self->use_namespaces + && (not $self->use_namespaces)) { + $self->_downgrading_to_load_classes( + $result_namespace || 'Result' + ); + } + elsif ((not defined $self->use_namespaces) + || $self->use_namespaces) { + if (not $self->result_namespace) { + $self->result_namespace($result_namespace || 'Result'); + } + elsif ($result_namespace ne $self->result_namespace) { + $self->_rewriting_result_namespace( + $result_namespace || 'Result' + ); + } + } + + # XXX when we go past .0 this will need fixing + my ($v) = $real_ver =~ /([1-9])/; + $v = "v$v"; + + last if $v eq $CURRENT_V || $real_ver =~ /^0\.\d\d999/; + + if (not %{ $self->naming }) { + warn <<"EOF" unless $ENV{SCHEMA_LOADER_BACKCOMPAT}; + +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 + } + else { + $self->_upgrading_from($v); + last; + } + + $self->naming->{relationships} ||= $v; + $self->naming->{monikers} ||= $v; + $self->naming->{column_accessors} ||= $v; + + $self->schema_version_to_dump($real_ver); + + last; + } + } + close $fh; +} + +sub _validate_class_args { my $self = shift; + my $args = shift; + + foreach my $k (@CLASS_ARGS) { + next unless $self->$k; + + my @classes = ref $self->$k eq 'ARRAY' ? @{ $self->$k } : $self->$k; + foreach my $c (@classes) { + # components default to being under the DBIx::Class namespace unless they + # are preceeded with a '+' + if ( $k =~ m/components$/ && $c !~ s/^\+// ) { + $c = 'DBIx::Class::' . $c; + } - foreach my $table_class (values %{$self->classes}) { - $table_class->require; - if($@ && $@ !~ /^Can't locate /) { - croak "Failed to load external class definition" - . " for '$table_class': $@"; + # 1 == installed, 0 == not installed, undef == invalid classname + my $installed = Class::Inspector->installed($c); + if ( defined($installed) ) { + if ( $installed == 0 ) { + croak qq/$c, as specified in the loader option "$k", is not installed/; + } + } else { + croak qq/$c, as specified in the loader option "$k", is an invalid class name/; + } } - next if $@; # "Can't locate" error + } +} + +sub _find_file_in_inc { + my ($self, $file) = @_; + foreach my $prefix (@INC) { + my $fullpath = File::Spec->catfile($prefix, $file); + return $fullpath if -f $fullpath + # abs_path throws on Windows for nonexistant files + and eval { Cwd::abs_path($fullpath) } ne + (eval { Cwd::abs_path(File::Spec->catfile($self->dump_directory, $file)) } || ''); + } + + return; +} + +sub _class_path { + my ($self, $class) = @_; + + my $class_path = $class; + $class_path =~ s{::}{/}g; + $class_path .= '.pm'; + + return $class_path; +} + +sub _find_class_in_inc { + my ($self, $class) = @_; + + return $self->_find_file_in_inc($self->_class_path($class)); +} + +sub _rewriting { + my $self = shift; + + return $self->_upgrading_from + || $self->_upgrading_from_load_classes + || $self->_downgrading_to_load_classes + || $self->_rewriting_result_namespace + ; +} + +sub _rewrite_old_classnames { + my ($self, $code) = @_; + + return $code unless $self->_rewriting; + + my %old_classes = reverse %{ $self->_upgrading_classes }; + + my $re = join '|', keys %old_classes; + $re = qr/\b($re)\b/; + + $code =~ s/$re/$old_classes{$1} || $1/eg; + + return $code; +} + +sub _load_external { + my ($self, $class) = @_; + + return if $self->{skip_load_external}; + + # so that we don't load our own classes, under any circumstances + local *INC = [ grep $_ ne $self->dump_directory, @INC ]; + + my $real_inc_path = $self->_find_class_in_inc($class); + + my $old_class = $self->_upgrading_classes->{$class} + if $self->_rewriting; + + my $old_real_inc_path = $self->_find_class_in_inc($old_class) + if $old_class && $old_class ne $class; + + return unless $real_inc_path || $old_real_inc_path; + + if ($real_inc_path) { # If we make it to here, we loaded an external definition - warn qq/# Loaded external class definition for '$table_class'\n/ + warn qq/# Loaded external class definition for '$class'\n/ if $self->debug; - if($self->dump_directory) { - my $class_path = $table_class; - $class_path =~ s{::}{/}g; - $class_path .= '.pm'; - my $filename = $INC{$class_path}; - croak 'Failed to locate actual external module file for ' - . "'$table_class'" - if !$filename; - open(my $fh, '<', $filename) - or croak "Failed to open $filename for reading: $!"; - $self->_raw_stmt($table_class, - q|# These lines loaded from user-supplied external file: | - ); - while(<$fh>) { - chomp; - $self->_raw_stmt($table_class, $_); - } - $self->_raw_stmt($table_class, - q|# End of lines loaded from user-supplied external file | - ); - close($fh) - or croak "Failed to close $filename: $!"; + open(my $fh, '<', $real_inc_path) + or croak "Failed to open '$real_inc_path' for reading: $!"; + my $code = do { local $/; <$fh> }; + close($fh) + or croak "Failed to close $real_inc_path: $!"; + $code = $self->_rewrite_old_classnames($code); + + if ($self->dynamic) { # load the class too + # kill redefined warnings + my $warn_handler = $SIG{__WARN__} || sub { warn @_ }; + local $SIG{__WARN__} = sub { + $warn_handler->(@_) + unless $_[0] =~ /^Subroutine \S+ redefined/; + }; + eval $code; + die $@ if $@; + } + + $self->_ext_stmt($class, + qq|# These lines were loaded from '$real_inc_path' found in \@INC.\n| + .qq|# They are now part of the custom portion of this file\n| + .qq|# for you to hand-edit. If you do not either delete\n| + .qq|# this section or remove that file from \@INC, this section\n| + .qq|# will be repeated redundantly when you re-create this\n| + .qq|# file again via Loader! See skip_load_external to disable\n| + .qq|# this feature.\n| + ); + chomp $code; + $self->_ext_stmt($class, $code); + $self->_ext_stmt($class, + qq|# End of lines loaded from '$real_inc_path' | + ); + } + + if ($old_real_inc_path) { + my $code = slurp $old_real_inc_path; + + $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 older +# version of the Loader. For a static schema, this happens only once during +# upgrade. See skip_load_external to disable this feature. +EOF + + $code = $self->_rewrite_old_classnames($code); + + if ($self->dynamic) { + warn <<"EOF"; + +Detected external content in '$old_real_inc_path', a class name that would have +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. +EOF + # kill redefined warnings + my $warn_handler = $SIG{__WARN__} || sub { warn @_ }; + local $SIG{__WARN__} = sub { + $warn_handler->(@_) + unless $_[0] =~ /^Subroutine \S+ redefined/; + }; + eval $code; + die $@ if $@; } + + chomp $code; + $self->_ext_stmt($class, $code); + $self->_ext_stmt($class, + qq|# End of lines loaded from '$old_real_inc_path' | + ); } } @@ -310,15 +906,223 @@ Does the actual schema-construction work. sub load { my $self = shift; - $self->_load_classes; - $self->_load_relationships if $self->relationships; - $self->_load_external; - $self->_dump_to_dir if $self->dump_directory; + $self->_load_tables( + $self->_tables_list({ constraint => $self->constraint, exclude => $self->exclude }) + ); +} + +=head2 rescan + +Arguments: schema + +Rescan the database for changes. Returns a list of the newly added table +monikers. + +The schema argument should be the schema class or object to be affected. It +should probably be derived from the original schema_class used during L. + +=cut + +sub rescan { + my ($self, $schema) = @_; + + $self->{schema} = $schema; + $self->_relbuilder->{schema} = $schema; + + 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); + } + } + + delete $self->{_dump_storage}; + delete $self->{_relations_started}; + + my $loaded = $self->_load_tables(@current); + + return map { $self->monikers->{$_} } @created; +} + +sub _relbuilder { + no warnings 'uninitialized'; + my ($self) = @_; + + return if $self->{skip_relationships}; + + if ($self->naming->{relationships} eq 'v4') { + 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->relationship_attrs, + ); + } + elsif ($self->naming->{relationships} eq 'v5') { + require DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_05; + return $self->{relbuilder} ||= DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_05->new ( + $self->schema, + $self->inflect_plural, + $self->inflect_singular, + $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, + $self->inflect_plural, + $self->inflect_singular, + $self->relationship_attrs, + ); +} + +sub _load_tables { + my ($self, @tables) = @_; + + # Save the new tables to the tables list + foreach (@tables) { + $self->{_tables}->{$_} = 1; + } + + $self->_make_src_class($_) for @tables; + + # sanity-check for moniker clashes + my $inverse_moniker_idx; + for (keys %{$self->monikers}) { + push @{$inverse_moniker_idx->{$self->monikers->{$_}}}, $_; + } + + my @clashes; + for (keys %$inverse_moniker_idx) { + my $tables = $inverse_moniker_idx->{$_}; + if (@$tables > 1) { + push @clashes, sprintf ("tables %s reduced to the same source moniker '%s'", + join (', ', map { "'$_'" } @$tables), + $_, + ); + } + } + + if (@clashes) { + die 'Unable to load schema - chosen moniker/class naming style results in moniker clashes. ' + . 'Either change the naming style, or supply an explicit moniker_map: ' + . join ('; ', @clashes) + . "\n" + ; + } + + + $self->_setup_src_meta($_) for @tables; + + if(!$self->skip_relationships) { + # The relationship loader needs a working schema + $self->{quiet} = 1; + local $self->{dump_directory} = $self->{temp_directory}; + $self->_reload_classes(\@tables); + $self->_load_relationships($_) for @tables; + $self->{quiet} = 0; + + # Remove that temp dir from INC so it doesn't get reloaded + @INC = grep $_ ne $self->dump_directory, @INC; + } + + $self->_load_external($_) + for map { $self->classes->{$_} } @tables; + + # Reload without unloading first to preserve any symbols from external + # packages. + $self->_reload_classes(\@tables, 0); # Drop temporary cache delete $self->{_cache}; - 1; + return \@tables; +} + +sub _reload_classes { + my ($self, $tables, $unload) = @_; + + my @tables = @$tables; + $unload = 1 unless defined $unload; + + # so that we don't repeat custom sections + @INC = grep $_ ne $self->dump_directory, @INC; + + $self->_dump_to_dir(map { $self->classes->{$_} } @tables); + + unshift @INC, $self->dump_directory; + + my @to_register; + my %have_source = map { $_ => $self->schema->source($_) } + $self->schema->sources; + + for my $table (@tables) { + my $moniker = $self->monikers->{$table}; + my $class = $self->classes->{$table}; + + { + no warnings 'redefine'; + local *Class::C3::reinitialize = sub {}; + use warnings; + + Class::Unload->unload($class) if $unload; + my ($source, $resultset_class); + if ( + ($source = $have_source{$moniker}) + && ($resultset_class = $source->resultset_class) + && ($resultset_class ne 'DBIx::Class::ResultSet') + ) { + my $has_file = Class::Inspector->loaded_filename($resultset_class); + Class::Unload->unload($resultset_class) if $unload; + $self->_reload_class($resultset_class) if $has_file; + } + $self->_reload_class($class); + } + push @to_register, [$moniker, $class]; + } + + Class::C3->reinitialize; + for (@to_register) { + $self->schema->register_class(@$_); + } +} + +# We use this instead of ensure_class_loaded when there are package symbols we +# want to preserve. +sub _reload_class { + my ($self, $class) = @_; + + my $class_path = $self->_class_path($class); + delete $INC{ $class_path }; + +# kill redefined warnings + my $warn_handler = $SIG{__WARN__} || sub { warn @_ }; + local $SIG{__WARN__} = sub { + $warn_handler->(@_) + unless $_[0] =~ /^Subroutine \S+ redefined/; + }; + eval "require $class;"; } sub _get_dump_filename { @@ -332,68 +1136,221 @@ sub _ensure_dump_subdirs { my ($self, $class) = (@_); my @name_parts = split(/::/, $class); - pop @name_parts; + pop @name_parts; # we don't care about the very last element, + # which is a filename + my $dir = $self->dump_directory; - foreach (@name_parts) { - $dir .= q{/} . $_; - if(! -d $dir) { + while (1) { + if(!-d $dir) { mkdir($dir) or croak "mkdir('$dir') failed: $!"; } + last if !@name_parts; + $dir = File::Spec->catdir($dir, shift @name_parts); } } sub _dump_to_dir { - my ($self) = @_; + my ($self, @classes) = @_; + + my $schema_class = $self->schema_class; + my $schema_base_class = $self->schema_base_class || 'DBIx::Class::Schema'; my $target_dir = $self->dump_directory; + warn "Dumping manual schema for $schema_class to directory $target_dir ...\n" + unless $self->{dynamic} or $self->{quiet}; - my $schema_class = $self->schema_class; + my $schema_text = + qq|package $schema_class;\n\n| + . qq|# Created by DBIx::Class::Schema::Loader\n| + . qq|# DO NOT MODIFY THE FIRST PART OF THIS FILE\n\n| + . qq|use strict;\nuse warnings;\n\n| + . qq|use base '$schema_base_class';\n\n|; + + if ($self->use_namespaces) { + $schema_text .= qq|__PACKAGE__->load_namespaces|; + my $namespace_options; + + my @attr = qw/resultset_namespace default_resultset_class/; + + unshift @attr, 'result_namespace' unless (not $self->result_namespace) || $self->result_namespace eq 'Result'; + + for my $attr (@attr) { + if ($self->$attr) { + $namespace_options .= qq| $attr => '| . $self->$attr . qq|',\n| + } + } + $schema_text .= qq|(\n$namespace_options)| if $namespace_options; + $schema_text .= qq|;\n|; + } + else { + $schema_text .= qq|__PACKAGE__->load_classes;\n|; + } + + { + local $self->{version_to_dump} = $self->schema_version_to_dump; + $self->_write_classfile($schema_class, $schema_text, 1); + } + + my $result_base_class = $self->result_base_class || 'DBIx::Class::Core'; - croak "Must specify target directory for dumping!" if ! $target_dir; + foreach my $src_class (@classes) { + my $src_text = + qq|package $src_class;\n\n| + . qq|# Created by DBIx::Class::Schema::Loader\n| + . qq|# DO NOT MODIFY THE FIRST PART OF THIS FILE\n\n| + . qq|use strict;\nuse warnings;\n\n| + . qq|use base '$result_base_class';\n\n|; - warn "Dumping manual schema for $schema_class to directory $target_dir ...\n"; + $self->_write_classfile($src_class, $src_text); + } + + # remove Result dir if downgrading from use_namespaces, and there are no + # files left. + if (my $result_ns = $self->_downgrading_to_load_classes + || $self->_rewriting_result_namespace) { + my $result_namespace = $self->_result_namespace( + $schema_class, + $result_ns, + ); - if(! -d $target_dir) { - mkdir($target_dir) or croak "mkdir('$target_dir') failed: $!"; + (my $result_dir = $result_namespace) =~ s{::}{/}g; + $result_dir = $self->dump_directory . '/' . $result_dir; + + unless (my @files = glob "$result_dir/*") { + rmdir $result_dir; + } } - my $verstr = $DBIx::Class::Schema::Loader::VERSION; - my $datestr = POSIX::strftime('%Y-%m-%d %H:%M:%S', localtime); - my $tagline = qq|# Created by DBIx::Class::Schema::Loader v$verstr @ $datestr|; + warn "Schema dump completed.\n" unless $self->{dynamic} or $self->{quiet}; + +} + +sub _sig_comment { + my ($self, $version, $ts) = @_; + return qq|\n\n# Created by DBIx::Class::Schema::Loader| + . qq| v| . $version + . q| @ | . $ts + . qq|\n# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:|; +} + +sub _write_classfile { + my ($self, $class, $text, $is_schema) = @_; + + my $filename = $self->_get_dump_filename($class); + $self->_ensure_dump_subdirs($class); + + if (-f $filename && $self->really_erase_my_files) { + warn "Deleting existing file '$filename' due to " + . "'really_erase_my_files' setting\n" unless $self->{quiet}; + unlink($filename); + } - $self->_ensure_dump_subdirs($schema_class); + my ($custom_content, $old_md5, $old_ver, $old_ts) = $self->_get_custom_content($class, $filename); - my $schema_fn = $self->_get_dump_filename($schema_class); - croak "$schema_fn exists, will not overwrite" - if -f $schema_fn && !$self->dump_overwrite; - open(my $schema_fh, '>', $schema_fn) - or croak "Cannot open $schema_fn for writing: $!"; - print $schema_fh qq|package $schema_class;\n\n$tagline\n\n|; - print $schema_fh qq|use strict;\nuse warnings;\n\n|; - print $schema_fh qq|use base 'DBIx::Class::Schema';\n\n|; - print $schema_fh qq|__PACKAGE__->load_classes;\n|; - print $schema_fh qq|\n1;\n\n|; - close($schema_fh) - or croak "Cannot close $schema_fn: $!"; + if (my $old_class = $self->_upgrading_classes->{$class}) { + my $old_filename = $self->_get_dump_filename($old_class); - foreach my $src_class (sort keys %{$self->{_dump_storage}}) { - $self->_ensure_dump_subdirs($src_class); - my $src_fn = $self->_get_dump_filename($src_class); - croak "$src_fn exists, will not overwrite" - if -f $src_fn && !$self->dump_overwrite; - open(my $src_fh, '>', $src_fn) - or croak "Cannot open $src_fn for writing: $!"; - print $src_fh qq|package $src_class;\n\n$tagline\n\n|; - print $src_fh qq|use strict;\nuse warnings;\n\n|; - print $src_fh qq|use base 'DBIx::Class';\n\n|; - print $src_fh qq|$_\n| - for @{$self->{_dump_storage}->{$src_class}}; - print $src_fh qq|\n1;\n\n|; - close($src_fh) - or croak "Cannot close $src_fn: $!"; + my ($old_custom_content) = $self->_get_custom_content( + $old_class, $old_filename, 0 # do not add default comment + ); + + $old_custom_content =~ s/\n\n# You can replace.*\n1;\n//; + + if ($old_custom_content) { + $custom_content = + "\n" . $old_custom_content . "\n" . $custom_content; + } + + unlink $old_filename; + } + + $custom_content = $self->_rewrite_old_classnames($custom_content); + + $text .= qq|$_\n| + for @{$self->{_dump_storage}->{$class} || []}; + + # Check and see if the dump is infact differnt + + my $compare_to; + if ($old_md5) { + $compare_to = $text . $self->_sig_comment($old_ver, $old_ts); + + + if (Digest::MD5::md5_base64($compare_to) eq $old_md5) { + return unless $self->_upgrading_from && $is_schema; + } } - warn "Schema dump completed.\n"; + $text .= $self->_sig_comment( + $self->version_to_dump, + POSIX::strftime('%Y-%m-%d %H:%M:%S', localtime) + ); + + open(my $fh, '>', $filename) + or croak "Cannot open '$filename' for writing: $!"; + + # Write the top half and its MD5 sum + print $fh $text . Digest::MD5::md5_base64($text) . "\n"; + + # Write out anything loaded via external partial class file in @INC + print $fh qq|$_\n| + for @{$self->{_ext_storage}->{$class} || []}; + + # Write out any custom content the user has added + print $fh $custom_content; + + close($fh) + or croak "Error closing '$filename': $!"; +} + +sub _default_custom_content { + return qq|\n\n# You can replace this text with custom| + . qq| content, and it will be preserved on regeneration| + . qq|\n1;\n|; +} + +sub _get_custom_content { + my ($self, $class, $filename, $add_default) = @_; + + $add_default = 1 unless defined $add_default; + + return ($self->_default_custom_content) if ! -f $filename; + + open(my $fh, '<', $filename) + or croak "Cannot open '$filename' for reading: $!"; + + my $mark_re = + qr{^(# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:)([A-Za-z0-9/+]{22})\n}; + + my $buffer = ''; + my ($md5, $ts, $ver); + while(<$fh>) { + if(!$md5 && /$mark_re/) { + $md5 = $2; + my $line = $1; + + # Pull out the previous version and timestamp + ($ver, $ts) = $buffer =~ m/# Created by DBIx::Class::Schema::Loader v(.*?) @ (.*?)$/s; + + $buffer .= $line; + croak "Checksum mismatch in '$filename', the auto-generated part of the file has been modified outside of this loader. Aborting.\nIf you want to overwrite these modifications, set the 'overwrite_modifications' loader option.\n" + if !$self->overwrite_modifications && Digest::MD5::md5_base64($buffer) ne $md5; + + $buffer = ''; + } + else { + $buffer .= $_; + } + } + + croak "Cannot not overwrite '$filename' without 'really_erase_my_files'," + . " it does not appear to have been generated by Loader" + if !$md5; + + # Default custom content: + $buffer ||= $self->_default_custom_content if $add_default; + + return ($buffer, $md5, $ver, $ts); } sub _use { @@ -401,11 +1358,8 @@ sub _use { my $target = shift; foreach (@_) { - $_->require or croak ($_ . "->require: $@"); + warn "$target: use $_;" if $self->debug; $self->_raw_stmt($target, "use $_;"); - warn "$target: use $_" if $self->debug; - eval "package $target; use $_;"; - croak "use $_: $@" if $@; } } @@ -415,94 +1369,222 @@ sub _inject { my $schema_class = $self->schema_class; my $blist = join(q{ }, @_); + warn "$target: use base qw/ $blist /;" if $self->debug && @_; $self->_raw_stmt($target, "use base qw/ $blist /;") if @_; - warn "$target: use base qw/ $blist /" if $self->debug && @_; - foreach (@_) { - $_->require or croak ($_ . "->require: $@"); - $schema_class->inject_base($target, $_); +} + +sub _result_namespace { + my ($self, $schema_class, $ns) = @_; + my @result_namespace; + + if ($ns =~ /^\+(.*)/) { + # Fully qualified namespace + @result_namespace = ($1) } + else { + # Relative namespace + @result_namespace = ($schema_class, $ns); + } + + return wantarray ? @result_namespace : join '::', @result_namespace; } -# Load and setup classes -sub _load_classes { - my $self = shift; +# Create class with applicable bases, setup monikers, etc +sub _make_src_class { + my ($self, $table) = @_; my $schema = $self->schema; my $schema_class = $self->schema_class; - my $constraint = $self->constraint; - my $exclude = $self->exclude; - my @tables = sort $self->_tables_list; - warn "No tables found in database, nothing to load" if !@tables; + my $table_moniker = $self->_table2moniker($table); + my @result_namespace = ($schema_class); + if ($self->use_namespaces) { + my $result_namespace = $self->result_namespace || 'Result'; + @result_namespace = $self->_result_namespace( + $schema_class, + $result_namespace, + ); + } + my $table_class = join(q{::}, @result_namespace, $table_moniker); + + if ((my $upgrading_v = $self->_upgrading_from) + || $self->_rewriting) { + local $self->naming->{monikers} = $upgrading_v + if $upgrading_v; + + my @result_namespace = @result_namespace; + if ($self->_upgrading_from_load_classes) { + @result_namespace = ($schema_class); + } + elsif (my $ns = $self->_downgrading_to_load_classes) { + @result_namespace = $self->_result_namespace( + $schema_class, + $ns, + ); + } + elsif ($ns = $self->_rewriting_result_namespace) { + @result_namespace = $self->_result_namespace( + $schema_class, + $ns, + ); + } - if(@tables) { - @tables = grep { /$constraint/ } @tables if $constraint; - @tables = grep { ! /$exclude/ } @tables if $exclude; + my $old_class = join(q{::}, @result_namespace, + $self->_table2moniker($table)); - warn "All tables excluded by constraint/exclude, nothing to load" - if !@tables; + $self->_upgrading_classes->{$table_class} = $old_class + unless $table_class eq $old_class; } - $self->{_tables} = \@tables; +# this was a bad idea, should be ok now without it +# my $table_normalized = lc $table; +# $self->classes->{$table_normalized} = $table_class; +# $self->monikers->{$table_normalized} = $table_moniker; - foreach my $table (@tables) { - my $table_moniker = $self->_table2moniker($table); - my $table_class = $schema_class . q{::} . $table_moniker; + $self->classes->{$table} = $table_class; + $self->monikers->{$table} = $table_moniker; - my $table_normalized = lc $table; - $self->classes->{$table} = $table_class; - $self->classes->{$table_normalized} = $table_class; - $self->monikers->{$table} = $table_moniker; - $self->monikers->{$table_normalized} = $table_moniker; + $self->_use ($table_class, @{$self->additional_classes}); + $self->_inject($table_class, @{$self->left_base_classes}); - no warnings 'redefine'; - local *Class::C3::reinitialize = sub { }; - use warnings; + if (my @components = @{ $self->components }) { + $self->_dbic_stmt($table_class, 'load_components', @components); + } + + $self->_dbic_stmt($table_class, 'load_resultset_components', @{$self->resultset_components}) + if @{$self->resultset_components}; + $self->_inject($table_class, @{$self->additional_base_classes}); +} + +sub _resolve_col_accessor_collisions { + my ($self, $col_info) = @_; - { no strict 'refs'; @{"${table_class}::ISA"} = qw/DBIx::Class/ } + my $base = $self->result_base_class || 'DBIx::Class::Core'; + my @components = map "DBIx::Class::$_", @{ $self->components || [] }; - $self->_use ($table_class, @{$self->additional_classes}); - $self->_inject($table_class, @{$self->additional_base_classes}); + my @methods; - $self->_dbic_stmt($table_class, 'load_components', @{$self->components}, qw/PK::Auto Core/); + for my $class ($base, @components) { + eval "require ${class};"; + die $@ if $@; - $self->_dbic_stmt($table_class, 'load_resultset_components', @{$self->resultset_components}) - if @{$self->resultset_components}; - $self->_inject($table_class, @{$self->left_base_classes}); + push @methods, @{ Class::Inspector->methods($class) || [] }; } - Class::C3::reinitialize; + my %methods; + @methods{@methods} = (); - foreach my $table (@tables) { - my $table_class = $self->classes->{$table}; - my $table_moniker = $self->monikers->{$table}; + while (my ($col, $info) = each %$col_info) { + my $accessor = $info->{accessor} || $col; - $self->_dbic_stmt($table_class,'table',$table); + next if $accessor eq 'id'; # special case (very common column) - my $cols = $self->_table_columns($table); - my $col_info; - eval { $col_info = $schema->storage->columns_info_for($table) }; - if($@) { - $self->_dbic_stmt($table_class,'add_columns',@$cols); + if (exists $methods{$accessor}) { + $info->{accessor} = undef; } - else { - my %cols_hash; - foreach my $col (@$cols) { - $cols_hash{$col} = \%{($col_info->{$col})}; + } +} + +sub _make_column_accessor_name { + my ($self, $column_name) = @_; + + return join '_', map lc, split_name $column_name; +} + +# Set up metadata (cols, pks, etc) +sub _setup_src_meta { + my ($self, $table) = @_; + + my $schema = $self->schema; + my $schema_class = $self->schema_class; + + my $table_class = $self->classes->{$table}; + my $table_moniker = $self->monikers->{$table}; + + my $table_name = $table; + my $name_sep = $self->schema->storage->sql_maker->name_sep; + + if ($name_sep && $table_name =~ /\Q$name_sep\E/) { + $table_name = \ $self->_quote_table_name($table_name); + } + + my $full_table_name = ($self->qualify_objects ? ($self->db_schema . '.') : '') . (ref $table_name ? $$table_name : $table_name); + + # be careful to not create refs Data::Dump can "optimize" + $full_table_name = \do {"".$full_table_name} if ref $table_name; + + $self->_dbic_stmt($table_class, 'table', $full_table_name); + + my $cols = $self->_table_columns($table); + my $col_info = $self->__columns_info_for($table); + + while (my ($col, $info) = each %$col_info) { + if ($col =~ /\W/) { + ($info->{accessor} = $col) =~ s/\W+/_/g; + } + } + + if ($self->preserve_case) { + while (my ($col, $info) = each %$col_info) { + if ($col ne lc($col)) { + if ((not exists $self->naming->{column_accessors}) || (($self->naming->{column_accessors} =~ /(\d+)/)[0] >= 7)) { + $info->{accessor} = $self->_make_column_accessor_name($info->{accessor} || $col); + } + else { + $info->{accessor} = lc($info->{accessor} || $col); + } } - $self->_dbic_stmt($table_class,'add_columns',%cols_hash); } + } + else { + # XXX this needs to go away + $col_info = { map { lc($_), $col_info->{$_} } keys %$col_info }; + } + + $self->_resolve_col_accessor_collisions($col_info); + + my $fks = $self->_table_fk_info($table); + + for my $fkdef (@$fks) { + for my $col (@{ $fkdef->{local_columns} }) { + $col_info->{$col}{is_foreign_key} = 1; + } + } + $self->_dbic_stmt( + $table_class, + 'add_columns', + map { $_, ($col_info->{$_}||{}) } @$cols + ); + + my %uniq_tag; # used to eliminate duplicate uniqs - my $pks = $self->_table_pk_info($table) || []; - @$pks ? $self->_dbic_stmt($table_class,'set_primary_key',@$pks) - : carp("$table has no primary key"); + my $pks = $self->_table_pk_info($table) || []; + @$pks ? $self->_dbic_stmt($table_class,'set_primary_key',@$pks) + : carp("$table has no primary key"); + $uniq_tag{ join("\0", @$pks) }++ if @$pks; # pk is a uniq - my $uniqs = $self->_table_uniq_info($table) || []; - $self->_dbic_stmt($table_class,'add_unique_constraint',@$_) for (@$uniqs); + my $uniqs = $self->_table_uniq_info($table) || []; + for (@$uniqs) { + my ($name, $cols) = @$_; + next if $uniq_tag{ join("\0", @$cols) }++; # skip duplicates + $self->_dbic_stmt($table_class,'add_unique_constraint', $name, $cols); + } + +} + +sub __columns_info_for { + my ($self, $table) = @_; - $schema_class->register_class($table_moniker, $table_class); - $schema->register_class($table_moniker, $table_class) if $schema ne $schema_class; + my $result = $self->_columns_info_for($table); + + while (my ($col, $info) = each %$result) { + $info = { %$info, %{ $self->_custom_column_info ($table, $col, $info) } }; + $info = { %$info, %{ $self->_datetime_column_info($table, $col, $info) } }; + + $result->{$col} = $info; } + + return $result; } =head2 tables @@ -515,10 +1597,36 @@ names. sub tables { my $self = shift; - return @{$self->_tables}; + return keys %{$self->_tables}; } # Make a moniker from a table +sub _default_table2moniker { + no warnings 'uninitialized'; + my ($self, $table) = @_; + + if ($self->naming->{monikers} eq 'v4') { + return join '', map ucfirst, split /[\W_]+/, lc $table; + } + elsif ($self->naming->{monikers} eq 'v5') { + 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_name $table; + my $as_phrase = join ' ', @words; + + my $inflected = Lingua::EN::Inflect::Phrase::to_S($as_phrase); + + return join '', map ucfirst, split /\W+/, $inflected; +} + sub _table2moniker { my ( $self, $table ) = @_; @@ -531,33 +1639,24 @@ sub _table2moniker { $moniker = $self->moniker_map->($table); } - $moniker ||= join '', map ucfirst, split /[\W_]+/, lc $table; + $moniker ||= $self->_default_table2moniker($table); return $moniker; } sub _load_relationships { - my $self = shift; + my ($self, $table) = @_; - # Construct the fk_info RelBuilder wants to see, by - # translating table names to monikers in the _fk_info output - my %fk_info; - foreach my $table ($self->tables) { - my $tbl_fk_info = $self->_table_fk_info($table); - foreach my $fkdef (@$tbl_fk_info) { - $fkdef->{remote_source} = - $self->monikers->{delete $fkdef->{remote_table}}; - } - my $moniker = $self->monikers->{$table}; - $fk_info{$moniker} = $tbl_fk_info; + my $tbl_fk_info = $self->_table_fk_info($table); + foreach my $fkdef (@$tbl_fk_info) { + $fkdef->{remote_source} = + $self->monikers->{delete $fkdef->{remote_table}}; } + my $tbl_uniq_info = $self->_table_uniq_info($table); - my $relbuilder = DBIx::Class::Schema::Loader::RelBuilder->new( - $self->schema_class, \%fk_info, $self->inflect_plural, - $self->inflect_singular - ); + my $local_moniker = $self->monikers->{$table}; + my $rel_stmts = $self->_relbuilder->generate_code($local_moniker, $tbl_fk_info, $tbl_uniq_info); - my $rel_stmts = $relbuilder->generate_code; foreach my $src_class (sort keys %$rel_stmts) { my $src_stmts = $rel_stmts->{$src_class}; foreach my $stmt (@$src_stmts) { @@ -587,28 +1686,185 @@ sub _tables_list { croak "ABSTRACT METHOD" } # Execute a constructive DBIC class method, with debug/dump_to_dir hooks. sub _dbic_stmt { - my $self = shift; - my $class = shift; + my $self = shift; + my $class = shift; my $method = shift; - if(!$self->debug && !$self->dump_directory) { - $class->$method(@_); - return; - } + # generate the pod for this statement, storing it with $self->_pod + $self->_make_pod( $class, $method, @_ ) if $self->generate_pod; my $args = dump(@_); $args = '(' . $args . ')' if @_ < 2; my $stmt = $method . $args . q{;}; warn qq|$class\->$stmt\n| if $self->debug; - $class->$method(@_); $self->_raw_stmt($class, '__PACKAGE__->' . $stmt); + return; +} + +# generates the accompanying pod for a DBIC class method statement, +# storing it with $self->_pod +sub _make_pod { + my $self = shift; + my $class = shift; + my $method = shift; + + if ( $method eq 'table' ) { + my ($table) = @_; + my $pcm = $self->pod_comment_mode; + my ($comment, $comment_overflows, $comment_in_name, $comment_in_desc); + if ( $self->can('_table_comment') ) { + $comment = $self->_table_comment($table); + $comment_overflows = ($comment and length $comment > $self->pod_comment_spillover_length); + $comment_in_name = ($pcm eq 'name' or ($pcm eq 'auto' and !$comment_overflows)); + $comment_in_desc = ($pcm eq 'description' or ($pcm eq 'auto' and $comment_overflows)); + } + $self->_pod( $class, "=head1 NAME" ); + my $table_descr = $class; + $table_descr .= " - " . $comment if $comment and $comment_in_name; + $self->{_class2table}{ $class } = $table; + $self->_pod( $class, $table_descr ); + if ($comment and $comment_in_desc) { + $self->_pod( $class, "=head1 DESCRIPTION" ); + $self->_pod( $class, $comment ); + } + $self->_pod_cut( $class ); + } elsif ( $method eq 'add_columns' ) { + $self->_pod( $class, "=head1 ACCESSORS" ); + my $col_counter = 0; + my @cols = @_; + while( my ($name,$attrs) = splice @cols,0,2 ) { + $col_counter++; + $self->_pod( $class, '=head2 ' . $name ); + $self->_pod( $class, + join "\n", map { + my $s = $attrs->{$_}; + $s = !defined $s ? 'undef' : + length($s) == 0 ? '(empty string)' : + ref($s) eq 'SCALAR' ? $$s : + ref($s) ? do { + my $dd = Dumper; + $dd->Indent(0); + $dd->Values([$s]); + $dd->Dump; + } : + looks_like_number($s) ? $s : + qq{'$s'} + ; + + " $_: $s" + } sort keys %$attrs, + ); + + if( $self->can('_column_comment') + and my $comment = $self->_column_comment( $self->{_class2table}{$class}, $col_counter) + ) { + $self->_pod( $class, $comment ); + } + } + $self->_pod_cut( $class ); + } elsif ( $method =~ /^(belongs_to|has_many|might_have)$/ ) { + $self->_pod( $class, "=head1 RELATIONS" ) unless $self->{_relations_started} { $class } ; + my ( $accessor, $rel_class ) = @_; + $self->_pod( $class, "=head2 $accessor" ); + $self->_pod( $class, 'Type: ' . $method ); + $self->_pod( $class, "Related object: L<$rel_class>" ); + $self->_pod_cut( $class ); + $self->{_relations_started} { $class } = 1; + } +} + +# Stores a POD documentation +sub _pod { + my ($self, $class, $stmt) = @_; + $self->_raw_stmt( $class, "\n" . $stmt ); +} + +sub _pod_cut { + my ($self, $class ) = @_; + $self->_raw_stmt( $class, "\n=cut\n" ); } # Store a raw source line for a class (for dumping purposes) sub _raw_stmt { my ($self, $class, $stmt) = @_; - push(@{$self->{_dump_storage}->{$class}}, $stmt) if $self->dump_directory; + push(@{$self->{_dump_storage}->{$class}}, $stmt); +} + +# Like above, but separately for the externally loaded stuff +sub _ext_stmt { + my ($self, $class, $stmt) = @_; + push(@{$self->{_ext_storage}->{$class}}, $stmt); +} + +sub _quote_table_name { + my ($self, $table) = @_; + + my $qt = $self->schema->storage->sql_maker->quote_char; + + return $table unless $qt; + + if (ref $qt) { + return $qt->[0] . $table . $qt->[1]; + } + + return $qt . $table . $qt; +} + +sub _custom_column_info { + my ( $self, $table_name, $column_name, $column_info ) = @_; + + if (my $code = $self->custom_column_info) { + return $code->($table_name, $column_name, $column_info) || {}; + } + return {}; +} + +sub _datetime_column_info { + my ( $self, $table_name, $column_name, $column_info ) = @_; + my $result = {}; + my $type = $column_info->{data_type} || ''; + if ((grep $_, @{ $column_info }{map "inflate_$_", qw/date datetime timestamp/}) + or ($type =~ /date|timestamp/i)) { + $result->{timezone} = $self->datetime_timezone if $self->datetime_timezone; + $result->{locale} = $self->datetime_locale if $self->datetime_locale; + } + 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; + + @INC = grep $_ ne $self->dump_directory, @INC; } =head2 monikers @@ -629,6 +1885,16 @@ names, as above in L. L +=head1 AUTHOR + +See L and L. + +=head1 LICENSE + +This library is free software; you can redistribute it and/or modify it under +the same terms as Perl itself. + =cut 1; +# vim:et sts=4 sw=4 tw=0: