X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FPg.pm;h=8d3a745b04a85f30e429171aa68f4c958180a4fb;hb=53c4835c7c3e764f0881b196fb29f348916e8411;hp=1f0189863bd20757dd8549d9dc4365f3c95b5c31;hpb=b95e25c90262dc58ddd27980556164c7df498bba;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm index 1f01898..8d3a745 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm @@ -5,7 +5,7 @@ use warnings; use base 'DBIx::Class::Schema::Loader::DBI::Component::QuotedDefault'; use mro 'c3'; -our $VERSION = '0.07026'; +our $VERSION = '0.07040'; =head1 NAME @@ -40,6 +40,67 @@ sub _system_schemas { return ($self->next::method(@_), 'pg_catalog'); } +my %pg_rules = ( + a => 'NO ACTION', + r => 'RESTRICT', + c => 'CASCADE', + n => 'SET NULL', + d => 'SET DEFAULT', +); + +sub _table_fk_info { + my ($self, $table) = @_; + + my $sth = $self->dbh->prepare_cached(<<"EOF"); + select constr.conname, to_ns.nspname, to_class.relname, from_col.attname, to_col.attname, + constr.confdeltype, constr.confupdtype, constr.condeferrable + from pg_catalog.pg_constraint constr + join pg_catalog.pg_namespace from_ns on constr.connamespace = from_ns.oid + join pg_catalog.pg_class from_class on constr.conrelid = from_class.oid and from_class.relnamespace = from_ns.oid + join pg_catalog.pg_class to_class on constr.confrelid = to_class.oid + join pg_catalog.pg_namespace to_ns on to_class.relnamespace = to_ns.oid + -- can't do unnest() until 8.4, so join against a series table instead + join pg_catalog.generate_series(1, pg_catalog.current_setting('max_index_keys')::integer) colnum(i) + on colnum.i <= pg_catalog.array_upper(constr.conkey,1) + join pg_catalog.pg_attribute to_col + on to_col.attrelid = constr.confrelid + and to_col.attnum = constr.confkey[colnum.i] + join pg_catalog.pg_attribute from_col + on from_col.attrelid = constr.conrelid + and from_col.attnum = constr.conkey[colnum.i] + where from_ns.nspname = ? + and from_class.relname = ? + and from_class.relkind = 'r' + and constr.contype = 'f' + order by constr.conname, colnum.i +EOF + + $sth->execute($table->schema, $table->name); + + my %rels; + + while (my ($fk, $remote_schema, $remote_table, $col, $remote_col, + $delete_rule, $update_rule, $is_deferrable) = $sth->fetchrow_array) { + push @{ $rels{$fk}{local_columns} }, $self->_lc($col); + push @{ $rels{$fk}{remote_columns} }, $self->_lc($remote_col); + + $rels{$fk}{remote_table} = DBIx::Class::Schema::Loader::Table->new( + loader => $self, + name => $remote_table, + schema => $remote_schema, + ) unless exists $rels{$fk}{remote_table}; + + $rels{$fk}{attrs} ||= { + on_delete => $pg_rules{$delete_rule}, + on_update => $pg_rules{$update_rule}, + is_deferrable => $is_deferrable, + }; + } + + return [ map { $rels{$_} } sort keys %rels ]; +} + + sub _table_uniq_info { my ($self, $table) = @_; @@ -64,15 +125,15 @@ sub _table_uniq_info { 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); @@ -88,10 +149,8 @@ sub _table_uniq_info { 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 ]); } } @@ -108,9 +167,9 @@ sub _table_comment { return $table_comment if $table_comment; ($table_comment) = $self->dbh->selectrow_array(<<'EOF', {}, $table->name, $table->schema); -SELECT obj_description(oid) -FROM pg_class -WHERE relname=? AND relnamespace=(SELECT oid FROM pg_namespace WHERE nspname=?) +SELECT pg_catalog.obj_description(oid) +FROM pg_catalog.pg_class +WHERE relname=? AND relnamespace=(SELECT oid FROM pg_catalog.pg_namespace WHERE nspname=?) EOF return $table_comment @@ -127,11 +186,11 @@ sub _column_comment { my ($table_oid) = $self->dbh->selectrow_array(<<'EOF', {}, $table->name, $table->schema); SELECT oid -FROM pg_class -WHERE relname=? AND relnamespace=(SELECT oid FROM pg_namespace WHERE nspname=?) +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 col_description(?,?)', {}, $table_oid, $column_number); + 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 @@ -234,12 +293,14 @@ EOF if ($typetype && $typetype eq 'e') { # 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(<{data_type}); SELECT e.enumlabel FROM pg_catalog.pg_enum e JOIN pg_catalog.pg_type t ON t.oid = e.enumtypid WHERE t.typname = ? +ORDER BY e.$order_column EOF $info->{extra}{list} = [ map { $_->[0] } @$typevalues ]; @@ -248,7 +309,7 @@ EOF $info->{extra}{custom_type_name} = $info->{data_type}; $info->{data_type} = 'enum'; - + delete $info->{size}; } }