use base 'DBIx::Class::Schema::Loader::DBI::Component::QuotedDefault';
use mro 'c3';
use Try::Tiny;
+use DBIx::Class::Schema::Loader::Utils qw/sigwarn_silencer/;
use namespace::clean;
-our $VERSION = '0.07036_01';
+our $VERSION = '0.07041';
=head1 NAME
my $self = shift;
# silence a warning from older DBD::Oracles in tests
- my $warn_handler = $SIG{__WARN__} || sub { warn @_ };
- local $SIG{__WARN__} = sub {
- $warn_handler->(@_)
- unless $_[0] =~ /^Field \d+ has an Oracle type \(\d+\) which is not explicitly supported/;
- };
+ local $SIG{__WARN__} = sigwarn_silencer(
+ qr/^Field \d+ has an Oracle type \(\d+\) which is not explicitly supported/
+ );
return $self->next::method(@_);
}
push @{$constr_names{$constr_name}}, $constr_col;
}
- my @uniqs = map { [ $_ => $constr_names{$_} ] } keys %constr_names;
- return \@uniqs;
+ return [ map { [ $_ => $constr_names{$_} ] } sort keys %constr_names ];
}
sub _table_comment {
$sth->execute($table->name, $table->schema);
while (my ($trigger_body) = $sth->fetchrow_array) {
- if (my ($seq_schema, $seq_name) = $trigger_body =~ /(?:\."?(\w+)"?)?"?(\w+)"?\.nextval/i) {
+ if (my ($seq_schema, $seq_name) = $trigger_body =~ /(?:"?(\w+)"?\.)?"?(\w+)"?\.nextval/i) {
if (my ($col_name) = $trigger_body =~ /:new\.(\w+)/i) {
$col_name = $self->_lc($col_name);
}
}
+ # Old DBD::Oracle report the size in (UTF-16) bytes, not characters
+ my $nchar_size_factor = $DBD::Oracle::VERSION >= 1.52 ? 1 : 2;
+
while (my ($col, $info) = each %$result) {
no warnings 'uninitialized';
$info->{size} = $info->{size}[0] / 8;
}
else {
- $info->{size} = $info->{size} / 2;
+ $info->{size} = $info->{size} / $nchar_size_factor;
}
}
elsif ($info->{data_type} =~ /^(?:var)?char2?\z/i) {