use mro 'c3';
use Try::Tiny;
use List::MoreUtils 'any';
+use Carp::Clan qw/^DBIx::Class/;
use namespace::clean;
use DBIx::Class::Schema::Loader::Table ();
-our $VERSION = '0.07010';
+our $VERSION = '0.07034_02';
__PACKAGE__->mk_group_accessors('simple', qw/
_disable_pk_detection
my $driver = $self->dbh->{Driver}->{Name};
my $subclass = 'DBIx::Class::Schema::Loader::DBI::' . $driver;
- if ($self->load_optional_class($subclass)) {
- bless $self, $subclass unless $self->isa($subclass);
+ if ((not $self->isa($subclass)) && $self->load_optional_class($subclass)) {
+ bless $self, $subclass;
$self->_rebless;
+ Class::C3::reinitialize() if $] < 5.009005;
}
}
$self->_setup;
- $self;
+ return $self;
}
sub _build_quote_char {
sub _supports_db_schema { 1 }
# Returns an array of table objects
-sub _tables_list {
+sub _tables_list {
my ($self, $opts) = (shift, shift);
my @tables;
my $sth = $self->_sth_for($table, undef, \'1 = 0');
$sth->execute;
- my $retval = $self->preserve_case ? \@{$sth->{NAME}} : \@{$sth->{NAME_lc}};
+
+ my $retval = [ map $self->_lc($_), @{$sth->{NAME}} ];
+
$sth->finish;
- $retval;
+ return $retval;
}
# Returns arrayref of pk col names
-sub _table_pk_info {
+sub _table_pk_info {
my ($self, $table) = @_;
return [] if $self->_disable_pk_detection;
sub _table_comment {
my ($self, $table) = @_;
+ my $dbh = $self->dbh;
- my $comments_table = $self->table_comments_table;
+ my $comments_table = $table->clone;
+ $comments_table->name($self->table_comments_table);
- my ($comment) = try { $self->dbh->selectrow_array(<<"EOF") };
+ my ($comment) =
+ (exists $self->_tables->{$comments_table->sql_name} || undef)
+ && try { $dbh->selectrow_array(<<"EOF") };
SELECT comment_text
-FROM $comments_table
-WHERE table_name = @{[ $self->dbh->quote($table->name) ]}
+FROM @{[ $comments_table->sql_name ]}
+WHERE table_name = @{[ $dbh->quote($table->name) ]}
EOF
+ # Failback: try the REMARKS column on table_info
+ if (!$comment && $dbh->can('table_info')) {
+ my $sth = $self->_dbh_table_info( $dbh, undef, $table->schema, $table->name );
+ my $info = $sth->fetchrow_hashref();
+ $comment = $info->{REMARKS};
+ }
+
return $comment;
}
sub _column_comment {
- my ($self, $table, $column_counter, $column_name) = @_;
+ my ($self, $table, $column_number, $column_name) = @_;
+ my $dbh = $self->dbh;
- my $comments_table = $self->column_comments_table;
+ my $comments_table = $table->clone;
+ $comments_table->name($self->column_comments_table);
- my ($comment) = try { $self->dbh->selectrow_array(<<"EOF") };
+ my ($comment) =
+ (exists $self->_tables->{$comments_table->sql_name} || undef)
+ && try { $dbh->selectrow_array(<<"EOF") };
SELECT comment_text
-FROM $comments_table
-WHERE table_name = @{[ $self->dbh->quote($table->name) ]}
-AND column_name = @{[ $self->dbh->quote($column_name) ]}
+FROM @{[ $comments_table->sql_name ]}
+WHERE table_name = @{[ $dbh->quote($table->name) ]}
+AND column_name = @{[ $dbh->quote($column_name) ]}
EOF
-
+
+ # Failback: try the REMARKS column on column_info
+ if (!$comment && $dbh->can('column_info')) {
+ if (my $sth = try { $self->_dbh_column_info( $dbh, undef, $table->schema, $table->name, $column_name ) }) {
+ my $info = $sth->fetchrow_hashref();
+ $comment = $info->{REMARKS};
+ }
+ }
+
return $comment;
}
my %rels;
+ my @rules = (
+ 'CASCADE',
+ 'RESTRICT',
+ 'SET NULL',
+ 'NO ACTION',
+ 'SET DEFAULT',
+ );
+
my $i = 1; # for unnamed rels, which hopefully have only 1 column ...
REL: while(my $raw_rel = $sth->fetchrow_arrayref) {
my $uk_scm = $raw_rel->[1];
my $uk_col = $self->_lc($raw_rel->[3]);
my $fk_scm = $raw_rel->[5];
my $fk_col = $self->_lc($raw_rel->[7]);
+ my $key_seq = $raw_rel->[8] - 1;
my $relid = ($raw_rel->[11] || ( "__dcsld__" . $i++ ));
+ my $update_rule = $raw_rel->[9];
+ my $delete_rule = $raw_rel->[10];
+
+ $update_rule = $rules[$update_rule] if defined $update_rule;
+ $delete_rule = $rules[$delete_rule] if defined $delete_rule;
+
+ my $is_deferrable = $raw_rel->[13];
+
+ ($is_deferrable = $is_deferrable == 7 ? 0 : 1)
+ if defined $is_deferrable;
+
foreach my $var ($uk_scm, $uk_tbl, $uk_col, $fk_scm, $fk_col, $relid) {
- $var =~ s/[\Q$self->{quote_char}\E]//g;
+ $var =~ s/[\Q$self->{quote_char}\E]//g if defined $var;
}
if ($self->db_schema && $self->db_schema->[0] ne '%'
next REL;
}
- $rels{$relid}{tbl} = DBIx::Class::Schema::Loader::Table->new(
+ $rels{$relid}{tbl} ||= DBIx::Class::Schema::Loader::Table->new(
loader => $self,
name => $uk_tbl,
schema => $uk_scm,
ignore_schema => 1
)),
);
- $rels{$relid}{cols}{$uk_col} = $fk_col;
+
+ $rels{$relid}{attrs}{on_delete} = $delete_rule if $delete_rule;
+ $rels{$relid}{attrs}{on_update} = $update_rule if $update_rule;
+ $rels{$relid}{attrs}{is_deferrable} = $is_deferrable if defined $is_deferrable;
+
+ # Add this data IN ORDER
+ $rels{$relid}{rcols}[$key_seq] = $uk_col;
+ $rels{$relid}{lcols}[$key_seq] = $fk_col;
}
$sth->finish;
my @rels;
foreach my $relid (keys %rels) {
push(@rels, {
- remote_columns => [ keys %{$rels{$relid}->{cols}} ],
- local_columns => [ values %{$rels{$relid}->{cols}} ],
+ remote_columns => [ grep defined, @{ $rels{$relid}{rcols} } ],
+ local_columns => [ grep defined, @{ $rels{$relid}{lcols} } ],
remote_table => $rels{$relid}->{tbl},
+ (exists $rels{$relid}{attrs} ?
+ (attrs => $rels{$relid}{attrs})
+ :
+ ()
+ ),
+ _constraint_name => $relid,
});
}
my %result;
- if ($dbh->can('column_info')) {
- my $sth = $self->_dbh_column_info($dbh, undef, $table->schema, $table->name, '%' );
- while ( my $info = $sth->fetchrow_hashref() ){
+ if (my $sth = try { $self->_dbh_column_info($dbh, undef, $table->schema, $table->name, '%' ) }) {
+ COL_INFO: while (my $info = try { $sth->fetchrow_hashref } catch { +{} }) {
+ next COL_INFO unless %$info;
+
my $column_info = {};
$column_info->{data_type} = lc $info->{TYPE_NAME};
my $col_name = $info->{COLUMN_NAME};
$col_name =~ s/^\"(.*)\"$/$1/;
- $col_name = $self->_lc($col_name);
-
my $extra_info = $self->_extra_column_info(
$table, $col_name, $column_info, $info
) || {};
$result{$col_name} = $column_info;
}
$sth->finish;
-
- return \%result if %result;
}
my $sth = $self->_sth_for($table, undef, \'1 = 0');
my @columns = @{ $sth->{NAME} };
- for my $i (0 .. $#columns) {
+ COL: for my $i (0 .. $#columns) {
+ next COL if %{ $result{ $columns[$i] }||{} };
+
my $column_info = {};
$column_info->{data_type} = lc $sth->{TYPE}[$i];
my $extra_info = $self->_extra_column_info($table, $columns[$i], $column_info, $sth) || {};
$column_info = { %$column_info, %$extra_info };
- $result{ $self->_lc($columns[$i]) } = $column_info;
+ $result{ $columns[$i] } = $column_info;
}
$sth->finish;
}
}
+ # check for instances of the same column name with different case in preserve_case=0 mode
+ if (not $self->preserve_case) {
+ my %lc_colnames;
+
+ foreach my $col (keys %result) {
+ push @{ $lc_colnames{lc $col} }, $col;
+ }
+
+ if (keys %lc_colnames != keys %result) {
+ my @offending_colnames = map @$_, grep @$_ > 1, values %lc_colnames;
+
+ my $offending_colnames = join ", ", map "'$_'", @offending_colnames;
+
+ croak "columns $offending_colnames in table @{[ $table->sql_name ]} collide in preserve_case=0 mode. preserve_case=1 mode required";
+ }
+
+ # apply lowercasing
+ my %lc_result;
+
+ while (my ($col, $info) = each %result) {
+ $lc_result{ $self->_lc($col) } = $info;
+ }
+
+ %result = %lc_result;
+ }
+
return \%result;
}
# We wrap it in a try block for MSSQL+DBD::Sybase, which can have issues.
# TODO investigate further
my $type_info = try { $self->dbh->type_info($type_num) };
-
+
return $type_info ? $type_info->{TYPE_NAME} : undef;
}
# do not use this, override _columns_info_for instead
sub _extra_column_info {}
+# override to mask warnings if needed
+sub _dbh_table_info {
+ my ($self, $dbh) = (shift, shift);
+
+ return $dbh->table_info(@_);
+}
+
# override to mask warnings if needed (see mysql)
sub _dbh_column_info {
my ($self, $dbh) = (shift, shift);
projects / dbsrgits/DBIx-Class-Schema-Loader.git / blobdiff