use base 'DBIx::Class::Schema::Loader::DBI::Component::QuotedDefault';
use mro 'c3';
-our $VERSION = '0.07036_04';
+our $VERSION = '0.07043';
=head1 NAME
pg_catalog.pg_index x
JOIN pg_catalog.pg_class c ON c.oid = x.indrelid
JOIN pg_catalog.pg_class i ON i.oid = x.indexrelid
- JOIN pg_catalog.pg_constraint con ON con.conname = i.relname
- LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
+ JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
WHERE
x.indisunique = 't' AND
+ x.indpred IS NULL AND
c.relkind = 'r' AND
i.relkind = 'i' AND
- con.contype = 'u' AND
n.nspname = ? AND
- c.relname = ?}
+ c.relname = ?
+ ORDER BY i.relname}
);
$uniq_sth->execute($table->schema, $table->name);
push(@col_names, $self->_lc($name_aref->[0])) if $name_aref;
}
- if(!@col_names) {
- warn "Failed to parse UNIQUE constraint $indexname on $table";
- }
- else {
+ # skip indexes with missing column names (e.g. expression indexes)
+ if(@col_names == @col_nums) {
push(@uniqs, [ $indexname => \@col_names ]);
}
}
return $column_comment if $column_comment;
- my ($table_oid) = $self->dbh->selectrow_array(<<'EOF', {}, $table->name, $table->schema);
-SELECT oid
+ return $self->dbh->selectrow_array(<<'EOF', {}, $column_number, $table->name, $table->schema);
+SELECT pg_catalog.col_description(oid, ?)
FROM pg_catalog.pg_class
WHERE relname=? AND relnamespace=(SELECT oid FROM pg_catalog.pg_namespace WHERE nspname=?)
EOF
-
- return $self->dbh->selectrow_array('SELECT pg_catalog.col_description(?,?)', {}, $table_oid, $column_number);
}
# Make sure data_type's that don't need it don't have a 'size' column_info, and
EOF
if ($data_type =~ /^time\b/i) {
- if ((not $precision) || $precision !~ /^\d/) {
+ if ((not defined $precision) || $precision !~ /^\d/) {
delete $info->{size};
}
else {
}
}
}
- elsif ((not $precision) || $precision !~ /^\d/ || $precision == 6) {
+ elsif ((not defined $precision) || $precision !~ /^\d/ || $precision == 6) {
delete $info->{size};
}
else {
WHERE typname = ?
EOF
if ($typetype && $typetype eq 'e') {
- # The following will extract a list of allowed values for the
- # enum.
+ # The following will extract a list of allowed values for the enum.
my $order_column = $self->dbh->{pg_server_version} >= 90100 ? 'enumsortorder' : 'oid';
- my $typevalues = $self->dbh
- ->selectall_arrayref(<<EOF, {}, $info->{data_type});
+ $info->{extra}{list} = $self->dbh
+ ->selectcol_arrayref(<<EOF, {}, $info->{data_type});
SELECT e.enumlabel
FROM pg_catalog.pg_enum e
JOIN pg_catalog.pg_type t ON t.oid = e.enumtypid
ORDER BY e.$order_column
EOF
- $info->{extra}{list} = [ map { $_->[0] } @$typevalues ];
-
# Store its original name in extra for SQLT to pick up.
$info->{extra}{custom_type_name} = $info->{data_type};
L<DBIx::Class::Schema::Loader>, L<DBIx::Class::Schema::Loader::Base>,
L<DBIx::Class::Schema::Loader::DBI>
-=head1 AUTHOR
+=head1 AUTHORS
-See L<DBIx::Class::Schema::Loader/AUTHOR> and L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
+See L<DBIx::Class::Schema::Loader/AUTHORS>.
=head1 LICENSE