use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_10';
+our $VERSION = '0.04999_13';
=head1 NAME
=cut
-# had to override here because MySQL apparently
-# doesn't support '%' syntax. Perhaps the other
-# drivers support this syntax also, but I didn't
-# want to risk breaking some esoteric DBD::foo version
-# in a maint release...
sub _tables_list {
my $self = shift;
- my $dbh = $self->schema->storage->dbh;
- my @tables = $dbh->tables(undef, $self->db_schema, undef, undef);
- s/\Q$self->{_quoter}\E//g for @tables;
- s/^.*\Q$self->{_namesep}\E// for @tables;
-
- return @tables;
+ return $self->next::method(undef, undef);
}
sub _table_fk_info {
my $table_def_ref = $dbh->selectrow_arrayref("SHOW CREATE TABLE `$table`")
or croak ("Cannot get table definition for $table");
my $table_def = $table_def_ref->[1] || '';
-
- my (@reldata) = ($table_def =~ /CONSTRAINT `.*` FOREIGN KEY \(`(.*)`\) REFERENCES `(.*)` \(`(.*)`\)/ig);
+
+ my $qt = qr/["`]/;
+
+ my (@reldata) = ($table_def =~
+ /CONSTRAINT $qt.*$qt FOREIGN KEY \($qt(.*)$qt\) REFERENCES $qt(.*)$qt \($qt(.*)$qt\)/ig
+ );
my @rels;
while (scalar @reldata > 0) {
my $f_table = shift @reldata;
my $f_cols = shift @reldata;
- my @cols = map { s/\Q$self->{_quoter}\E//; lc $_ }
+ my @cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; lc $_ }
split(/\s*,\s*/, $cols);
- my @f_cols = map { s/\Q$self->{_quoter}\E//; lc $_ }
+ my @f_cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; lc $_ }
split(/\s*,\s*/, $f_cols);
push(@rels, {
=head1 AUTHOR
-See L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
+See L<DBIx::Class::Schema::Loader/AUTHOR> and L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
=head1 LICENSE