X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI.pm;h=c7539eccaafda86809956f3f0a97f595547201ac;hb=f671b6308c4f2210255b2eaa12fc47a49621d436;hp=4185ef5dd9598cbf76ff30f6b40895a9b6e14868;hpb=dc767cd32c6728d4d9c3504acd259c0b2f19da2b;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/lib/DBIx/Class/Schema/Loader/DBI.pm b/lib/DBIx/Class/Schema/Loader/DBI.pm index 4185ef5..c7539ec 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI.pm @@ -3,10 +3,10 @@ package DBIx::Class::Schema::Loader::DBI; use strict; use warnings; use base qw/DBIx::Class::Schema::Loader::Base/; -use Class::C3; +use mro 'c3'; use Carp::Clan qw/^DBIx::Class/; -our $VERSION = '0.05001'; +our $VERSION = '0.07002'; =head1 NAME @@ -35,19 +35,23 @@ things. sub new { my $self = shift->next::method(@_); - # rebless to vendor-specific class if it exists and loads - my $dbh = $self->schema->storage->dbh; - my $driver = $dbh->{Driver}->{Name}; + # rebless to vendor-specific class if it exists and loads and we're not in a + # custom class. + if (not $self->loader_class) { + my $dbh = $self->schema->storage->dbh; + my $driver = $dbh->{Driver}->{Name}; - my $subclass = 'DBIx::Class::Schema::Loader::DBI::' . $driver; - if ($self->load_optional_class($subclass)) { - bless $self, $subclass unless $self->isa($subclass); - $self->_rebless; + my $subclass = 'DBIx::Class::Schema::Loader::DBI::' . $driver; + if ($self->load_optional_class($subclass)) { + bless $self, $subclass unless $self->isa($subclass); + $self->_rebless; + } } # Set up the default quoting character and name seperators - $self->{_quoter} = $self->_build_quoter; + $self->{_quoter} = $self->_build_quoter; $self->{_namesep} = $self->_build_namesep; + # For our usage as regex matches, concatenating multiple quoter # values works fine (e.g. s/\Q<>\E// if quoter was [ '<', '>' ]) if( ref $self->{_quoter} eq 'ARRAY') { @@ -83,7 +87,7 @@ sub _rebless { } # Returns an array of table names sub _tables_list { - my $self = shift; + my ($self, $opts) = (shift, shift); my ($table, $type) = @_ ? @_ : ('%', '%'); @@ -101,15 +105,23 @@ sub _tables_list { } s/$qt//g for @tables; - return $self->_filter_tables(@tables); + return $self->_filter_tables(\@tables, $opts); } -# ignore bad tables and views +# apply constraint/exclude and ignore bad tables and views sub _filter_tables { - my ($self, @tables) = @_; + my ($self, $tables, $opts) = @_; + my @tables = @$tables; my @filtered_tables; + $opts ||= {}; + my $constraint = $opts->{constraint}; + my $exclude = $opts->{exclude}; + + @tables = grep { /$constraint/ } @$tables if defined $constraint; + @tables = grep { ! /$exclude/ } @$tables if defined $exclude; + for my $table (@tables) { eval { my $sth = $self->_sth_for($table, undef, \'1 = 0'); @@ -120,14 +132,7 @@ sub _filter_tables { } else { warn "Bad table or view '$table', ignoring: $@\n"; - local $@; - eval { - 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)); - }; + $self->_unregister_source_for_table($table); } } @@ -178,7 +183,7 @@ sub _table_columns { my $sth = $self->_sth_for($table, undef, \'1 = 0'); $sth->execute; - my $retval = \@{$sth->{NAME_lc}}; + my $retval = $self->preserve_case ? \@{$sth->{NAME}} : \@{$sth->{NAME_lc}}; $sth->finish; $retval; @@ -190,7 +195,7 @@ sub _table_pk_info { my $dbh = $self->schema->storage->dbh; - my @primary = map { lc } $dbh->primary_key('', $self->db_schema, $table); + my @primary = map { $self->_lc($_) } $dbh->primary_key('', $self->db_schema, $table); s/\Q$self->{_quoter}\E//g for @primary; return \@primary; @@ -247,15 +252,15 @@ sub _table_fk_info { my $i = 1; # for unnamed rels, which hopefully have only 1 column ... while(my $raw_rel = $sth->fetchrow_arrayref) { my $uk_tbl = $raw_rel->[2]; - my $uk_col = lc $raw_rel->[3]; - my $fk_col = lc $raw_rel->[7]; + my $uk_col = $self->_lc($raw_rel->[3]); + my $fk_col = $self->_lc($raw_rel->[7]); my $relid = ($raw_rel->[11] || ( "__dcsld__" . $i++ )); $uk_tbl =~ s/\Q$self->{_quoter}\E//g; $uk_col =~ s/\Q$self->{_quoter}\E//g; $fk_col =~ s/\Q$self->{_quoter}\E//g; $relid =~ s/\Q$self->{_quoter}\E//g; $rels{$relid}->{tbl} = $uk_tbl; - $rels{$relid}->{cols}->{$uk_col} = $fk_col; + $rels{$relid}->{cols}{$uk_col} = $fk_col; } $sth->finish; @@ -280,43 +285,71 @@ sub _columns_info_for { if ($dbh->can('column_info')) { my %result; eval { - my $sth = $dbh->column_info( undef, $self->db_schema, $table, '%' ); + my $sth = do { + # FIXME - seems to only warn on MySQL, and even then the output is valuable + # need to figure out how no to mask it away (and still have tests pass) + local $SIG{__WARN__} = sub {}; + $dbh->column_info( undef, $self->db_schema, $table, '%' ); + }; while ( my $info = $sth->fetchrow_hashref() ){ - my %column_info; - $column_info{data_type} = $info->{TYPE_NAME}; - $column_info{size} = $info->{COLUMN_SIZE}; - $column_info{is_nullable} = $info->{NULLABLE} ? 1 : 0; - $column_info{default_value} = $info->{COLUMN_DEF}; + my $column_info = {}; + $column_info->{data_type} = lc $info->{TYPE_NAME}; + + my $size = $info->{COLUMN_SIZE}; + + if (defined $size && defined $info->{DECIMAL_DIGITS}) { + $column_info->{size} = [$size, $info->{DECIMAL_DIGITS}]; + } + elsif (defined $size) { + $column_info->{size} = $size; + } + + $column_info->{is_nullable} = $info->{NULLABLE} ? 1 : 0; + $column_info->{default_value} = $info->{COLUMN_DEF} if defined $info->{COLUMN_DEF}; my $col_name = $info->{COLUMN_NAME}; $col_name =~ s/^\"(.*)\"$/$1/; - my $extra_info = $self->_extra_column_info($info) || {}; + my $extra_info = $self->_extra_column_info( + $table, $col_name, $column_info, $info + ) || {}; + $column_info = { %$column_info, %$extra_info }; - $result{$col_name} = { %column_info, %$extra_info }; + $result{$col_name} = $column_info; } $sth->finish; }; - return \%result if !$@ && scalar keys %result; + + return \%result if !$@ && scalar keys %result; } my %result; my $sth = $self->_sth_for($table, undef, \'1 = 0'); $sth->execute; - my @columns = @{$sth->{NAME_lc}}; + my @columns = @{ $self->preserve_case ? $sth->{NAME} : $sth->{NAME_lc} }; for my $i ( 0 .. $#columns ){ - my %column_info; - $column_info{data_type} = $sth->{TYPE}->[$i]; - $column_info{size} = $sth->{PRECISION}->[$i]; - $column_info{is_nullable} = $sth->{NULLABLE}->[$i] ? 1 : 0; - - if ($column_info{data_type} =~ m/^(.*?)\((.*?)\)$/) { - $column_info{data_type} = $1; - $column_info{size} = $2; + my $column_info = {}; + $column_info->{data_type} = lc $sth->{TYPE}->[$i]; + + my $size = $sth->{PRECISION}[$i]; + + if (defined $size && defined $sth->{SCALE}[$i]) { + $column_info->{size} = [$size, $sth->{SCALE}[$i]]; + } + elsif (defined $size) { + $column_info->{size} = $size; + } + + $column_info->{is_nullable} = $sth->{NULLABLE}->[$i] ? 1 : 0; + + if ($column_info->{data_type} =~ m/^(.*?)\((.*?)\)$/) { + $column_info->{data_type} = $1; + $column_info->{size} = $2; } - my $extra_info = $self->_extra_column_info($table, $columns[$i], $sth, $i) || {}; + my $extra_info = $self->_extra_column_info($table, $columns[$i], $column_info) || {}; + $column_info = { %$column_info, %$extra_info }; - $result{$columns[$i]} = { %column_info, %$extra_info }; + $result{$columns[$i]} = $column_info; } $sth->finish; @@ -324,10 +357,10 @@ sub _columns_info_for { my $colinfo = $result{$col}; my $type_num = $colinfo->{data_type}; my $type_name; - if(defined $type_num && $dbh->can('type_info')) { + if(defined $type_num && $type_num =~ /^\d+\z/ && $dbh->can('type_info')) { my $type_info = $dbh->type_info($type_num); $type_name = $type_info->{TYPE_NAME} if $type_info; - $colinfo->{data_type} = $type_name if $type_name; + $colinfo->{data_type} = lc $type_name if $type_name; } } @@ -354,3 +387,4 @@ the same terms as Perl itself. =cut 1; +# vim:et sts=4 sw=4 tw=0: