X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FPg.pm;h=2a95245f8b627a4dd67caef3b5fad4358cd8e349;hb=306bf770bf08b06f92863808b1938f2fc704acb0;hp=38e71233c9171258599127b8b8e5bae38491e43d;hpb=f839d33b5268c9396dc7cbc6432143d2f4eb5ea1;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 38e7123..2a95245 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.07033'; +our $VERSION = '0.07047'; =head1 NAME @@ -43,7 +43,7 @@ sub _system_schemas { my %pg_rules = ( a => 'NO ACTION', r => 'RESTRICT', - c => 'CASCADE,', + c => 'CASCADE', n => 'SET NULL', d => 'SET DEFAULT', ); @@ -52,25 +52,27 @@ sub _table_fk_info { my ($self, $table) = @_; my $sth = $self->dbh->prepare_cached(<<"EOF"); -select q.constr_name, q.to_schema, q.to_table, from_cols.attname from_col, to_cols.attname to_col, - q.on_delete, q.on_update, q.is_deferrable -from (select constr.conname constr_name, to_ns.nspname to_schema, to_class.relname to_table, - unnest(constr.conkey) from_colnum, unnest(constr.confkey) to_colnum, - constr.confdeltype on_delete, constr.confupdtype on_update, - constr.condeferrable is_deferrable, - constr.conrelid conrelid, constr.confrelid confrelid - from pg_constraint constr - join pg_namespace from_ns on constr.connamespace = from_ns.oid - join pg_class from_class on constr.conrelid = from_class.oid and from_class.relnamespace = from_ns.oid - join pg_class to_class on constr.confrelid = to_class.oid - join pg_namespace to_ns on to_class.relnamespace = to_ns.oid + 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' -) q -join pg_attribute from_cols on from_cols.attrelid = q.conrelid and from_cols.attnum = q.from_colnum -join pg_attribute to_cols on to_cols.attrelid = q.confrelid and to_cols.attnum = q.to_colnum; + order by constr.conname, colnum.i EOF $sth->execute($table->schema, $table->name); @@ -95,7 +97,7 @@ EOF }; } - return [ values %rels ]; + return [ map { $rels{$_} } sort keys %rels ]; } @@ -123,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); @@ -147,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 ]); } } @@ -167,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 @@ -184,13 +184,11 @@ sub _column_comment { return $column_comment if $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=?) + 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 col_description(?,?)', {}, $table_oid, $column_number); } # Make sure data_type's that don't need it don't have a 'size' column_info, and @@ -227,7 +225,7 @@ WHERE table_name = ? and column_name = ? EOF if ($data_type =~ /^time\b/i) { - if ((not $precision) || $precision !~ /^\d/) { + if ((not defined $precision) || $precision !~ /^\d/) { delete $info->{size}; } else { @@ -245,7 +243,7 @@ EOF } } } - elsif ((not $precision) || $precision !~ /^\d/ || $precision == 6) { + elsif ((not defined $precision) || $precision !~ /^\d/ || $precision == 6) { delete $info->{size}; } else { @@ -291,18 +289,17 @@ FROM pg_catalog.pg_type WHERE typname = ? EOF if ($typetype && $typetype eq 'e') { - # The following will extract a list of allowed values for the - # enum. - my $typevalues = $self->dbh - ->selectall_arrayref(<{data_type}); + # The following will extract a list of allowed values for the enum. + my $order_column = $self->dbh->{pg_server_version} >= 90100 ? 'enumsortorder' : 'oid'; + $info->{extra}{list} = $self->dbh + ->selectcol_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 ]; - # Store its original name in extra for SQLT to pick up. $info->{extra}{custom_type_name} = $info->{data_type}; @@ -345,14 +342,30 @@ EOF return $result; } +sub _view_definition { + my ($self, $view) = @_; + + my $def = $self->schema->storage->dbh->selectrow_array(<<'EOF', {}, $view->schema, $view->name); +SELECT pg_catalog.pg_get_viewdef(oid) +FROM pg_catalog.pg_class +WHERE relnamespace = (SELECT OID FROM pg_catalog.pg_namespace WHERE nspname = ?) +AND relname = ? +EOF + # The definition is returned as a complete statement including the + # trailing semicolon, but that's not allowed in CREATE VIEW, so + # strip it out + $def =~ s/\s*;\s*\z//; + return $def; +} + =head1 SEE ALSO L, L, L -=head1 AUTHOR +=head1 AUTHORS -See L and L. +See L. =head1 LICENSE