use List::MoreUtils 'any';
use Try::Tiny;
use Scalar::Util 'blessed';
+use DBIx::Class::Schema::Loader::Utils qw/sigwarn_silencer/;
use namespace::clean;
use DBIx::Class::Schema::Loader::Table ();
-our $VERSION = '0.07032';
+our $VERSION = '0.07041';
=head1 NAME
return ($self->next::method(@_), 'mysql');
}
-sub _tables_list {
- my ($self, $opts) = @_;
-
- return $self->next::method($opts, undef, undef);
-}
-
sub _table_fk_info {
my ($self, $table) = @_;
my @uniqs;
my $keydata = $self->_mysql_table_get_keys($table);
- foreach my $keyname (keys %$keydata) {
+ foreach my $keyname (sort keys %$keydata) {
next if $keyname eq 'PRIMARY';
push(@uniqs, [ $keyname => $keydata->{$keyname} ]);
}
my ($precision, $scale, $column_type, $default) = eval { $self->dbh->selectrow_array(<<'EOF', {}, $table->name, lc($col)) };
SELECT numeric_precision, numeric_scale, column_type, column_default
FROM information_schema.columns
-WHERE table_name = ? AND lower(column_name) = ?
+WHERE table_schema = schema() AND table_name = ? AND lower(column_name) = ?
EOF
my $has_information_schema = not $@;
delete $info->{extra}{list};
- while ($column_type =~ /'((?:[^']* (?:''|\\')* [^']*)* [^\\'])',?/xg) {
+ while ($column_type =~ /'((?:[^']* (?:''|\\')* [^']*)* [^\\']?)',?/xg) {
my $el = $1;
$el =~ s/''/'/g;
push @{ $info->{extra}{list} }, $el;
sub _dbh_column_info {
my $self = shift;
- local $SIG{__WARN__} = sub { warn @_
- unless $_[0] =~ /^column_info: unrecognized column type/ };
+ local $SIG{__WARN__} = sigwarn_silencer(
+ qr/^column_info: unrecognized column type/
+ );
$self->next::method(@_);
}