use List::Util 'first';
use List::MoreUtils 'any';
use Try::Tiny;
+use Scalar::Util 'blessed';
use namespace::clean;
use DBIx::Class::Schema::Loader::Table ();
-our $VERSION = '0.07018';
+our $VERSION = '0.07032';
=head1 NAME
return ($self->next::method(@_), 'mysql');
}
-sub _tables_list {
+sub _tables_list {
my ($self, $opts) = @_;
return $self->next::method($opts, undef, undef);
my $nqt = qr/[^"`]/;
my (@reldata) = ($table_def =~
- /CONSTRAINT ${qt}${nqt}+${qt} FOREIGN KEY \($qt(.*)$qt\) REFERENCES (?:$qt($nqt+)$qt\.)?$qt($nqt+)$qt \($qt(.+)$qt\)/ig
+ /CONSTRAINT ${qt}${nqt}+${qt} FOREIGN KEY \($qt(.*)$qt\) REFERENCES (?:$qt($nqt+)$qt\.)?$qt($nqt+)$qt \($qt(.+)$qt\)\s*(.*)/ig
);
my @rels;
while (scalar @reldata > 0) {
- my ($cols, $f_schema, $f_table, $f_cols) = splice @reldata, 0, 4;
+ my ($cols, $f_schema, $f_table, $f_cols, $rest) = splice @reldata, 0, 5;
my @cols = map { s/$qt//g; $self->_lc($_) }
split(/$qt?\s*$qt?,$qt?\s*$qt?/, $cols);
);
}
+ my %attrs;
+
+ if ($rest) {
+ my @on_clauses = $rest =~ /(ON DELETE|ON UPDATE) (RESTRICT|CASCADE|SET NULL|NO ACTION) ?/ig;
+
+ while (my ($clause, $value) = splice @on_clauses, 0, 2) {
+ $clause = lc $clause;
+ $clause =~ s/ /_/;
+
+ $value = uc $value;
+
+ $attrs{$clause} = $value;
+ }
+ }
+
+# The default behavior is RESTRICT. Specifying RESTRICT explicitly just removes
+# that ON clause from the SHOW CREATE TABLE output. For this reason, even
+# though the default for these clauses everywhere else in Schema::Loader is
+# CASCADE, we change the default here to RESTRICT in order to reproduce the
+# schema faithfully.
+ $attrs{on_delete} ||= 'RESTRICT';
+ $attrs{on_update} ||= 'RESTRICT';
+
+# MySQL does not have a DEFERRABLE attribute, but there is a way to defer FKs.
+ $attrs{is_deferrable} = 1;
+
push(@rels, {
local_columns => \@cols,
remote_columns => \@f_cols,
remote_table => $remote_table,
+ attrs => \%attrs,
});
}
delete $info->{size} if $data_type !~ /^(?: (?:var)?(?:char(?:acter)?|binary) | bit | year)\z/ix;
# information_schema is available in 5.0+
- my ($precision, $scale, $column_type, $default) = eval { $self->dbh->selectrow_array(<<'EOF', {}, $table, $col) };
+ 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 column_name = ?
+WHERE table_name = ? AND lower(column_name) = ?
EOF
my $has_information_schema = not $@;
if ($dbi_info->{mysql_values}) {
$extra_info{extra}{list} = $dbi_info->{mysql_values};
}
- if ( lc($dbi_info->{COLUMN_DEF}) eq 'current_timestamp'
+ if ((not blessed $dbi_info) # isa $sth
+ && lc($dbi_info->{COLUMN_DEF}) eq 'current_timestamp'
&& lc($dbi_info->{mysql_type_name}) eq 'timestamp') {
my $current_timestamp = 'current_timestamp';
FROM information_schema.tables
WHERE table_schema = schema()
AND table_name = ?
- }, undef, $table);
+ }, undef, $table->name);
};
# InnoDB likes to auto-append crap.
if (not $comment) {
FROM information_schema.columns
WHERE table_schema = schema()
AND table_name = ?
- AND column_name = ?
- }, undef, $table, $column_name);
+ AND lower(column_name) = ?
+ }, undef, $table->name, lc($column_name));
};
}
return $comment;