use Class::C3;
use Carp::Clan qw/^DBIx::Class/;
-our $VERSION = '0.04999_07';
+our $VERSION = '0.05003';
=head1 NAME
}
# 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') {
my $dbh = $self->schema->storage->dbh;
my @tables = $dbh->tables(undef, $self->db_schema, $table, $type);
- my $qt = qr/\Q$self->{_quoter}\E/;
+ my $qt = qr/[\Q$self->{_quoter}\E"'`\[\]]/;
+
+ my $all_tables_quoted = (grep /$qt/, @tables) == @tables;
- if ($self->{_quoter} && $tables[0] =~ /$qt/) {
+ if ($self->{_quoter} && $all_tables_quoted) {
s/.* $qt (?= .* $qt)//xg for @tables;
} else {
s/^.*\Q$self->{_namesep}\E// for @tables;
}
s/$qt//g for @tables;
- return @tables;
+ return $self->_filter_tables(@tables);
+}
+
+# ignore bad tables and views
+sub _filter_tables {
+ my ($self, @tables) = @_;
+
+ my @filtered_tables;
+
+ for my $table (@tables) {
+ eval {
+ my $sth = $self->_sth_for($table, undef, \'1 = 0');
+ $sth->execute;
+ };
+ if (not $@) {
+ push @filtered_tables, $table;
+ }
+ 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));
+ };
+ }
+ }
+
+ return @filtered_tables;
}
=head2 load
$self->next::method(@_);
}
-sub _quote_table_name {
+sub _table_as_sql {
my ($self, $table) = @_;
- my $qt = $self->schema->storage->sql_maker->quote_char;
-
- if (ref $qt) {
- return $qt->[0] . $table . $qt->[1];
+ if($self->{db_schema}) {
+ $table = $self->{db_schema} . $self->{_namesep} .
+ $self->_quote_table_name($table);
+ } else {
+ $table = $self->_quote_table_name($table);
}
- return $qt . $table . $qt;
+ return $table;
}
-# Returns an arrayref of column names
-sub _table_columns {
- my ($self, $table) = @_;
+sub _sth_for {
+ my ($self, $table, $fields, $where) = @_;
my $dbh = $self->schema->storage->dbh;
- if($self->{db_schema}) {
- $table = $self->{db_schema} . $self->{_namesep} .
- $self->_quote_table_name($table);
- } else {
- $table = $self->_quote_table_name($table);
- }
+ my $sth = $dbh->prepare($self->schema->storage->sql_maker
+ ->select(\$self->_table_as_sql($table), $fields, $where));
+
+ return $sth;
+}
- my $sth = $dbh->prepare($self->schema->storage->sql_maker->select(\$table, undef, \'1 = 0'));
+# Returns an arrayref of column names
+sub _table_columns {
+ my ($self, $table) = @_;
+
+ my $sth = $self->_sth_for($table, undef, \'1 = 0');
$sth->execute;
- my $retval = \@{$sth->{NAME_lc}};
+ my $retval = $self->_is_case_sensitive ? \@{$sth->{NAME}} : \@{$sth->{NAME_lc}};
$sth->finish;
$retval;
eval {
my $sth = $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} = $info->{TYPE_NAME};
+ $column_info->{size} = $info->{COLUMN_SIZE} if defined $info->{COLUMN_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;
}
- if($self->db_schema) {
- $table = $self->db_schema . $self->{_namesep} . $table;
- }
my %result;
- my $sth = $dbh->prepare($self->schema->storage->sql_maker->select($table, undef, \'1 = 0'));
+ my $sth = $self->_sth_for($table, undef, \'1 = 0');
$sth->execute;
- my @columns = @{$sth->{NAME_lc}};
+ my @columns = @{ $self->_is_case_sensitive ? $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} = $sth->{TYPE}->[$i];
+ $column_info->{size} = $sth->{PRECISION}->[$i] if $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 $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;
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;
L<DBIx::Class::Schema::Loader>
+=head1 AUTHOR
+
+See L<DBIx::Class::Schema::Loader/AUTHOR> and L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
+
+=head1 LICENSE
+
+This library is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
=cut
1;
projects / dbsrgits/DBIx-Class-Schema-Loader.git / blobdiff