}
# Set up the default quoting character and name seperators
- $self->{_quoter} = $self->_build_quoter;
+ $self->{_quoter} = $self->_build_quoter;
$self->{_namesep} = $self->_build_namesep;
+
# For our usage as regex matches, concatenating multiple quoter
# values works fine (e.g. s/\Q<>\E// if quoter was [ '<', '>' ])
if( ref $self->{_quoter} eq 'ARRAY') {
my $sth = $self->_sth_for($table, undef, \'1 = 0');
$sth->execute;
- my $retval = \@{$sth->{NAME_lc}};
+ my $retval = $self->_is_case_sensitive ? \@{$sth->{NAME}} : \@{$sth->{NAME_lc}};
$sth->finish;
$retval;
my $sth = $dbh->column_info( undef, $self->db_schema, $table, '%' );
while ( my $info = $sth->fetchrow_hashref() ){
my $column_info = {};
- $column_info->{data_type} = $info->{TYPE_NAME};
- $column_info->{size} = $info->{COLUMN_SIZE};
+ $column_info->{data_type} = $info->{TYPE_NAME};
+ $column_info->{size} = $info->{COLUMN_SIZE} if defined $info->{COLUMN_SIZE};
$column_info->{is_nullable} = $info->{NULLABLE} ? 1 : 0;
- $column_info->{default_value} = $info->{COLUMN_DEF};
+ $column_info->{default_value} = $info->{COLUMN_DEF} if defined $info->{COLUMN_DEF};
my $col_name = $info->{COLUMN_NAME};
$col_name =~ s/^\"(.*)\"$/$1/;
my %result;
my $sth = $self->_sth_for($table, undef, \'1 = 0');
$sth->execute;
- my @columns = @{$sth->{NAME_lc}};
+ my @columns = @{ $self->_is_case_sensitive ? $sth->{NAME} : $sth->{NAME_lc} };
for my $i ( 0 .. $#columns ){
my $column_info = {};
$column_info->{data_type} = $sth->{TYPE}->[$i];
- $column_info->{size} = $sth->{PRECISION}->[$i];
+ $column_info->{size} = $sth->{PRECISION}->[$i] if $sth->{PRECISION}->[$i];
$column_info->{is_nullable} = $sth->{NULLABLE}->[$i] ? 1 : 0;
if ($column_info->{data_type} =~ m/^(.*?)\((.*?)\)$/) {
my $colinfo = $result{$col};
my $type_num = $colinfo->{data_type};
my $type_name;
- if(defined $type_num && $dbh->can('type_info')) {
+ if(defined $type_num && $type_num =~ /^\d+\z/ && $dbh->can('type_info')) {
my $type_info = $dbh->type_info($type_num);
$type_name = $type_info->{TYPE_NAME} if $type_info;
$colinfo->{data_type} = $type_name if $type_name;