use Class::C3;
use Carp::Clan qw/^DBIx::Class/;
-our $VERSION = '0.05003';
+our $VERSION = '0.07000';
=head1 NAME
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
# Returns an array of table names
sub _tables_list {
- my $self = shift;
+ my ($self, $opts) = (shift, shift);
my ($table, $type) = @_ ? @_ : ('%', '%');
}
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');
}
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);
}
}
my $sth = $self->_sth_for($table, undef, \'1 = 0');
$sth->execute;
- my $retval = $self->_is_case_sensitive ? \@{$sth->{NAME}} : \@{$sth->{NAME_lc}};
+ my $retval = $self->preserve_case ? \@{$sth->{NAME}} : \@{$sth->{NAME_lc}};
$sth->finish;
$retval;
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;
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;
if ($dbh->can('column_info')) {
my %result;
eval {
- my $sth = $dbh->column_info( undef, $self->db_schema, $table, '%' );
+ my $sth = eval { 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->{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};
+ $column_info->{default_value} = $info->{COLUMN_DEF} if defined $info->{COLUMN_DEF};
my $col_name = $info->{COLUMN_NAME};
$col_name =~ s/^\"(.*)\"$/$1/;
my %result;
my $sth = $self->_sth_for($table, undef, \'1 = 0');
$sth->execute;
- my @columns = @{ $self->_is_case_sensitive ? $sth->{NAME} : $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->{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/^(.*?)\((.*?)\)$/) {
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;
}
}
=cut
1;
+# vim:et sts=4 sw=4 tw=0:
projects / dbsrgits/DBIx-Class-Schema-Loader.git / blobdiff