use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.06000';
+our $VERSION = '0.07001';
=head1 NAME
=cut
+sub _setup {
+ my $self = shift;
+
+ $self->next::method(@_);
+
+ if (not defined $self->preserve_case) {
+ $self->preserve_case(0);
+ }
+}
+
sub _tables_list {
my ($self, $opts) = @_;
my ($self, $table) = @_;
my $dbh = $self->schema->storage->dbh;
- 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 $table_def_ref = eval { $dbh->selectrow_arrayref("SHOW CREATE TABLE `$table`") };
+ my $table_def = $table_def_ref->[1];
+
+ return [] if not $table_def;
my $qt = qr/["`]/;
my $f_table = shift @reldata;
my $f_cols = shift @reldata;
- my @cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; lc $_ }
- split(/\s*,\s*/, $cols);
+ my @cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; $self->_lc($_) }
+ split(/$qt?\s*$qt?,$qt?\s*$qt?/, $cols);
- my @f_cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; lc $_ }
- split(/\s*,\s*/, $f_cols);
+ my @f_cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; $self->_lc($_) }
+ split(/$qt?\s*$qt?,$qt?\s*$qt?/, $f_cols);
push(@rels, {
local_columns => \@cols,
while(my $row = $sth->fetchrow_hashref) {
next if $row->{Non_unique};
push(@{$keydata{$row->{Key_name}}},
- [ $row->{Seq_in_index}, lc $row->{Column_name} ]
+ [ $row->{Seq_in_index}, $self->_lc($row->{Column_name}) ]
);
}
foreach my $keyname (keys %keydata) {
my $dbh = $self->schema->storage->dbh;
while (my ($col, $info) = each %$result) {
- delete $info->{size}
- unless $info->{data_type} =~ /^(?: (?:var)?(?:char(?:acter)?|binary) | bit | year)\z/ix;
+ delete $info->{size} if $info->{data_type} !~ /^(?: (?:var)?(?:char(?:acter)?|binary) | bit | year)\z/ix;
if ($info->{data_type} eq 'int') {
$info->{data_type} = 'integer';
$info->{data_type} = 'double precision';
}
- my ($precision, $scale, $column_type) = eval { $dbh->selectrow_array(<<'EOF', {}, lc $table, lc $col) };
-SELECT numeric_precision, numeric_scale, column_type
+ # information_schema is available in 5.0+
+ my ($precision, $scale, $column_type, $default) = eval { $dbh->selectrow_array(<<'EOF', {}, $table, $col) };
+SELECT numeric_precision, numeric_scale, column_type, column_default
FROM information_schema.columns
-WHERE lower(table_name) = ? AND lower(column_name) = ?
+WHERE table_name = ? AND column_name = ?
EOF
+ my $has_information_schema = not defined $@;
+
$column_type = '' if not defined $column_type;
if ($info->{data_type} eq 'bit' && (not exists $info->{size})) {
$info->{size} = $precision if defined $precision;
}
- elsif ($info->{data_type} =~ /^(?:float|double precision|decimal)\z/) {
+ elsif ($info->{data_type} =~ /^(?:float|double precision|decimal)\z/i) {
if (defined $precision && defined $scale) {
if ($precision == 10 && $scale == 0) {
delete $info->{size};
delete $info->{size};
}
}
+
+ # Sometimes apparently there's a bug where default_value gets set to ''
+ # for things that don't actually have or support that default (like ints.)
+ if (exists $info->{default_value} && $info->{default_value} eq '') {
+ if ($has_information_schema) {
+ if (not defined $default) {
+ delete $info->{default_value};
+ }
+ }
+ else { # just check if it's a char/text type, otherwise remove
+ delete $info->{default_value} unless $info->{data_type} =~ /char|text/i;
+ }
+ }
}
return $result;
if ($dbi_info->{mysql_values}) {
$extra_info{extra}{list} = $dbi_info->{mysql_values};
}
- if ( $dbi_info->{COLUMN_DEF} =~ /^CURRENT_TIMESTAMP\z/i
- && $dbi_info->{mysql_type_name} =~ /^TIMESTAMP\z/i) {
+ if ( lc($dbi_info->{COLUMN_DEF}) eq 'current_timestamp'
+ && lc($dbi_info->{mysql_type_name}) eq 'timestamp') {
- $extra_info{default_value} = \'CURRENT_TIMESTAMP';
+ my $current_timestamp = 'current_timestamp';
+ $extra_info{default_value} = \$current_timestamp;
}
return \%extra_info;