X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FBase.pm;h=f5afef237fabf3523c10e19343041bfa40f8dd1d;hb=b1ad1a8402a5eb0955c6b76310809c2ab29291a9;hp=47d965456f4ced92e3689b5769d1400f7d4b4621;hpb=32f784fcd9d5a62122ff08cb4b42f634120be007;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 47d9654..f5afef2 100644 --- a/lib/DBIx/Class/Schema/Loader/Base.pm +++ b/lib/DBIx/Class/Schema/Loader/Base.pm @@ -2,16 +2,21 @@ package DBIx::Class::Schema::Loader::Base; use strict; use warnings; -use base qw/Class::Accessor::Fast/; +use base qw/Class::Accessor::Fast Class::C3::Componentised/; 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 File::Temp qw//; +use Class::Unload; require DBIx::Class; -our $VERSION = '0.03999_01'; +our $VERSION = '0.04999_10'; __PACKAGE__->mk_ro_accessors(qw/ schema @@ -24,15 +29,20 @@ __PACKAGE__->mk_ro_accessors(qw/ left_base_classes components resultset_components - relationships + skip_relationships moniker_map inflect_singular inflect_plural debug dump_directory dump_overwrite - - legacy_default_inflections + really_erase_my_files + use_namespaces + result_namespace + resultset_namespace + default_resultset_class + schema_base_class + result_base_class db_schema _tables @@ -56,11 +66,12 @@ 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 relationships +=head2 skip_relationships -Try to automatically detect/setup has_a and has_many relationships. +Skip setting up relationships. The default is to attempt the loading +of relationships. =head2 debug @@ -113,6 +124,14 @@ 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'. + =head2 additional_base_classes List of additional base classes all of your table classes will use. @@ -138,18 +157,14 @@ 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 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 @@ -163,11 +178,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. @@ -177,28 +188,27 @@ 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 skip the already -existing files. - -=head1 DEPRECATED CONSTRUCTOR OPTIONS - -B +Deprecated. See L below, which does *not* mean +the same thing as the old C setting from previous releases. -=head2 inflect_map +=head2 really_erase_my_files -Equivalent to L. +Default false. If true, Loader will unconditionally delete any existing +files before creating the new ones from scratch when dumping a schema to disk. -=head2 inflect +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. -Equivalent to L. +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. -=head2 connect_info, dsn, user, password, options - -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. +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. =head1 METHODS @@ -234,7 +244,6 @@ sub new { bless $self => $class; - $self->{db_schema} ||= ''; $self->_ensure_arrayref(qw/additional_classes additional_base_classes left_base_classes @@ -248,59 +257,78 @@ sub new { $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->{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->{relbuilder} = DBIx::Class::Schema::Loader::RelBuilder->new( + $self->schema, $self->inflect_plural, $self->inflect_singular + ) if !$self->{skip_relationships}; + $self; } -sub _load_external { - my $self = shift; +sub _find_file_in_inc { + my ($self, $file) = @_; - foreach my $table_class (values %{$self->classes}) { - $table_class->require; - if($@ && $@ !~ /^Can't locate /) { - croak "Failed to load external class definition" - . " for '$table_class': $@"; - } - next if $@; # "Can't locate" error - - # If we make it to here, we loaded an external definition - warn qq/# Loaded external class definition for '$table_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: $!"; - } + foreach my $prefix (@INC) { + my $fullpath = File::Spec->catfile($prefix, $file); + return $fullpath if -f $fullpath + and Cwd::abs_path($fullpath) ne + Cwd::abs_path(File::Spec->catfile($self->dump_directory, $file)) || ''; } + + return; +} + +sub _load_external { + my ($self, $class) = @_; + + my $class_path = $class; + $class_path =~ s{::}{/}g; + $class_path .= '.pm'; + + my $real_inc_path = $self->_find_file_in_inc($class_path); + + return if !$real_inc_path; + + # If we make it to here, we loaded an external definition + warn qq/# Loaded external class definition for '$class'\n/ + if $self->debug; + + croak 'Failed to locate actual external module file for ' + . "'$class'" + if !$real_inc_path; + open(my $fh, '<', $real_inc_path) + or croak "Failed to open '$real_inc_path' for reading: $!"; + $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!\n| + ); + while(<$fh>) { + chomp; + $self->_ext_stmt($class, $_); + } + $self->_ext_stmt($class, + qq|# End of lines loaded from '$real_inc_path' | + ); + close($fh) + or croak "Failed to close $real_inc_path: $!"; } =head2 load @@ -312,15 +340,126 @@ 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); +} + +=head2 rescan + +Arguments: schema + +Rescan the database for newly added tables. Does +not process drops or 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; + foreach my $table ($self->_tables_list) { + if(!exists $self->{_tables}->{$table}) { + push(@created, $table); + } + } + + my $loaded = $self->_load_tables(@created); + + return map { $self->monikers->{$_} } @$loaded; +} + +sub _load_tables { + my ($self, @tables) = @_; + + # First, use _tables_list with constraint and exclude + # to get a list of tables to operate on + + my $constraint = $self->constraint; + my $exclude = $self->exclude; + + @tables = grep { /$constraint/ } @tables if $constraint; + @tables = grep { ! /$exclude/ } @tables if $exclude; + + # Save the new tables to the tables list + foreach (@tables) { + $self->{_tables}->{$_} = 1; + } + + $self->_make_src_class($_) for @tables; + $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; + + $self->_reload_classes(@tables); # Drop temporary cache delete $self->{_cache}; - 1; + return \@tables; +} + +sub _reload_classes { + my ($self, @tables) = @_; + + $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); + 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); + $self->ensure_class_loaded($resultset_class) if $has_file; + } + $self->ensure_class_loaded($class); + } + push @to_register, [$moniker, $class]; + } + + Class::C3->reinitialize; + for (@to_register) { + $self->schema->register_class(@$_); + } } sub _get_dump_filename { @@ -334,88 +473,187 @@ 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_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; + for my $attr (qw(result_namespace + resultset_namespace + default_resultset_class)) { + 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|; + } - my $schema_class = $self->schema_class; + $self->_write_classfile($schema_class, $schema_text); - croak "Must specify target directory for dumping!" if ! $target_dir; + my $result_base_class = $self->result_base_class || 'DBIx::Class'; - warn "Dumping manual schema for $schema_class to directory $target_dir ...\n"; + 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|; - if(! -d $target_dir) { - mkdir($target_dir) or croak "mkdir('$target_dir') failed: $!"; + $self->_write_classfile($src_class, $src_text); } - 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}; - $self->_ensure_dump_subdirs($schema_class); +} - my $schema_fn = $self->_get_dump_filename($schema_class); - if (-f $schema_fn && !$self->dump_overwrite) { - warn "$schema_fn exists, will not overwrite\n"; - } - else { - 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: $!"; +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) = @_; + + 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); + } + + my ($custom_content, $old_md5, $old_ver, $old_ts) = $self->_get_custom_content($class, $filename); + + $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; + } } - foreach my $src_class (sort keys %{$self->{_dump_storage}}) { - $self->_ensure_dump_subdirs($src_class); - my $src_fn = $self->_get_dump_filename($src_class); - if (-f $src_fn && !$self->dump_overwrite) { - warn "$src_fn exists, will not overwrite\n"; - next; - } - 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: $!"; + $text .= $self->_sig_comment( + $DBIx::Class::Schema::Loader::VERSION, + 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) = @_; + + 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'" + if Digest::MD5::md5_base64($buffer) ne $md5; + + $buffer = ''; + } + else { + $buffer .= $_; + } } - warn "Schema dump completed.\n"; + 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; + + return ($buffer, $md5, $ver, $ts); } sub _use { my $self = shift; my $target = shift; - my $evalstr; foreach (@_) { warn "$target: use $_;" if $self->debug; $self->_raw_stmt($target, "use $_;"); - $_->require or croak ($_ . "->require: $@"); - $evalstr .= "package $target; use $_;"; } - eval $evalstr if $evalstr; - croak $@ if $@; } sub _inject { @@ -426,93 +664,109 @@ sub _inject { my $blist = join(q{ }, @_); warn "$target: use base qw/ $blist /;" if $self->debug && @_; $self->_raw_stmt($target, "use base qw/ $blist /;") if @_; - foreach (@_) { - $_->require or croak ($_ . "->require: $@"); - $schema_class->inject_base($target, $_); - } } -# 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; - if(@tables) { - @tables = grep { /$constraint/ } @tables if $constraint; - @tables = grep { ! /$exclude/ } @tables if $exclude; - - warn "All tables excluded by constraint/exclude, 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'; + if ($result_namespace =~ /^\+(.*)/) { + # Fully qualified namespace + @result_namespace = ($1) + } + else { + # Relative namespace + push @result_namespace, $result_namespace; + } } + my $table_class = join(q{::}, @result_namespace, $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->{_tables} = \@tables; + $self->_use ($table_class, @{$self->additional_classes}); + $self->_inject($table_class, @{$self->left_base_classes}); - foreach my $table (@tables) { - my $table_moniker = $self->_table2moniker($table); - my $table_class = $schema_class . q{::} . $table_moniker; + $self->_dbic_stmt($table_class, 'load_components', @{$self->components}, 'Core'); - 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->_dbic_stmt($table_class, 'load_resultset_components', @{$self->resultset_components}) + if @{$self->resultset_components}; + $self->_inject($table_class, @{$self->additional_base_classes}); +} - no warnings 'redefine'; - local *Class::C3::reinitialize = sub { }; - use warnings; +# Set up metadata (cols, pks, etc) +sub _setup_src_meta { + my ($self, $table) = @_; - { no strict 'refs'; @{"${table_class}::ISA"} = qw/DBIx::Class/ } + my $schema = $self->schema; + my $schema_class = $self->schema_class; - $self->_use ($table_class, @{$self->additional_classes}); - $self->_inject($table_class, @{$self->additional_base_classes}); + my $table_class = $self->classes->{$table}; + my $table_moniker = $self->monikers->{$table}; - $self->_dbic_stmt($table_class, 'load_components', @{$self->components}, qw/PK::Auto Core/); + my $table_name = $table; + my $name_sep = $self->schema->storage->sql_maker->name_sep; - $self->_dbic_stmt($table_class, 'load_resultset_components', @{$self->resultset_components}) - if @{$self->resultset_components}; - $self->_inject($table_class, @{$self->left_base_classes}); + if ($name_sep && $table_name =~ /\Q$name_sep\E/) { + $table_name = \ $self->_quote_table_name($table_name); } - Class::C3::reinitialize; + $self->_dbic_stmt($table_class,'table',$table_name); - foreach my $table (@tables) { - my $table_class = $self->classes->{$table}; - my $table_moniker = $self->monikers->{$table}; + my $cols = $self->_table_columns($table); + my $col_info; + eval { $col_info = $self->_columns_info_for($table) }; + if($@) { + $self->_dbic_stmt($table_class,'add_columns',@$cols); + } + else { + if ($self->_is_case_sensitive) { + for my $col (keys %$col_info) { + $col_info->{$col}{accessor} = lc $col + if $col ne lc($col); + } + } else { + $col_info = { map { lc($_), $col_info->{$_} } keys %$col_info }; + } - $self->_dbic_stmt($table_class,'table',$table); + my $fks = $self->_table_fk_info($table); - 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); - } - else { - my %col_info_lc = map { lc($_), $col_info->{$_} } keys %$col_info; - $self->_dbic_stmt( - $table_class, - 'add_columns', - map { $_, ($col_info_lc{$_}||{}) } @$cols - ); + 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 $pks = $self->_table_pk_info($table) || []; - @$pks ? $self->_dbic_stmt($table_class,'set_primary_key',@$pks) - : carp("$table has no primary key"); + my %uniq_tag; # used to eliminate duplicate uniqs - my $uniqs = $self->_table_uniq_info($table) || []; - $self->_dbic_stmt($table_class,'add_unique_constraint',@$_) for (@$uniqs); + 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 - $schema_class->register_class($table_moniker, $table_class); - $schema->register_class($table_moniker, $table_class) if $schema ne $schema_class; + 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); } + } =head2 tables @@ -525,10 +779,17 @@ names. sub tables { my $self = shift; - return @{$self->_tables}; + return keys %{$self->_tables}; } # Make a moniker from a table +sub _default_table2moniker { + my ($self, $table) = @_; + + return join '', map ucfirst, split /[\W_]+/, + Lingua::EN::Inflect::Number::to_S(lc $table); +} + sub _table2moniker { my ( $self, $table ) = @_; @@ -541,33 +802,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) { @@ -601,26 +853,42 @@ sub _dbic_stmt { my $class = shift; my $method = shift; - if(!$self->debug && !$self->dump_directory) { - $class->$method(@_); - return; - } - 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); } # 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 _is_case_sensitive { 0 } + =head2 monikers Returns a hashref of loaded table to moniker mappings. There will