X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FPg.pm;h=78e8a9f6ef1501cc0111074142469c829a2af0b8;hb=46564a42215c5309753f3e0609ae1adddf68d083;hp=0478982fddc4f52ef1b9c291ca4cbda9a8e58f9e;hpb=533d98c061845dd1d49e6ff94f7acee618b23764;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 0478982..78e8a9f 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.07029'; +our $VERSION = '0.07048_01'; =head1 NAME @@ -40,35 +40,42 @@ 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 rc.constraint_name, rc.unique_constraint_schema, uk_tc.table_name, - fk_kcu.column_name, uk_kcu.column_name, rc.delete_rule, rc.update_rule, - fk_tc.is_deferrable -FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS fk_tc -JOIN INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS rc - ON rc.constraint_name = fk_tc.constraint_name - AND rc.constraint_schema = fk_tc.table_schema -JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE fk_kcu - ON fk_kcu.constraint_name = fk_tc.constraint_name - AND fk_kcu.table_name = fk_tc.table_name - AND fk_kcu.table_schema = fk_tc.table_schema -JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS uk_tc - ON uk_tc.constraint_name = rc.unique_constraint_name - AND uk_tc.table_schema = rc.unique_constraint_schema -JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE uk_kcu - ON uk_kcu.constraint_name = rc.unique_constraint_name - AND uk_kcu.ordinal_position = fk_kcu.ordinal_position - AND uk_kcu.table_name = uk_tc.table_name - AND uk_kcu.table_schema = rc.unique_constraint_schema -WHERE fk_tc.table_name = ? - AND fk_tc.table_schema = ? -ORDER BY fk_kcu.ordinal_position + 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->name, $table->schema); + $sth->execute($table->schema, $table->name); my %rels; @@ -84,13 +91,13 @@ EOF ) unless exists $rels{$fk}{remote_table}; $rels{$fk}{attrs} ||= { - on_delete => uc $delete_rule, - on_update => uc $update_rule, - is_deferrable => uc $is_deferrable eq 'YES' ? 1 : 0, + on_delete => $pg_rules{$delete_rule}, + on_update => $pg_rules{$update_rule}, + is_deferrable => $is_deferrable, }; } - return [ values %rels ]; + return [ map { $rels{$_} } sort keys %rels ]; } @@ -118,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); @@ -142,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 ]); } } @@ -162,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 @@ -179,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 @@ -222,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 { @@ -240,7 +243,7 @@ EOF } } } - elsif ((not $precision) || $precision !~ /^\d/ || $precision == 6) { + elsif ((not defined $precision) || $precision !~ /^\d/ || $precision == 6) { delete $info->{size}; } else { @@ -283,23 +286,21 @@ EOF ->selectrow_array(<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(<{extra}{list} = [ map { $_->[0] } @$typevalues ]; - # Store its original name in extra for SQLT to pick up. - $info->{extra}{custom_type_name} = $info->{data_type}; + $info->{extra}{custom_type_name} = $data_type; $info->{data_type} = 'enum'; @@ -307,24 +308,28 @@ EOF } } -# process SERIAL columns - if (ref($info->{default_value}) eq 'SCALAR' - && ${ $info->{default_value} } =~ /\bnextval\('([^:]+)'/i) { - $info->{is_auto_increment} = 1; - $info->{sequence} = $1; - delete $info->{default_value}; - } - -# alias now() to current_timestamp for deploying to other DBs - if ((eval { lc ${ $info->{default_value} } }||'') eq 'now()') { - # do not use a ref to a constant, that breaks Data::Dump output - ${$info->{default_value}} = 'current_timestamp'; + if (ref($info->{default_value}) eq 'SCALAR') { + # process SERIAL columns + if (${ $info->{default_value} } =~ /\bnextval\('([^:]+)'/i) { + $info->{is_auto_increment} = 1; + $info->{sequence} = $1; + delete $info->{default_value}; + } + # alias now() to current_timestamp for deploying to other DBs + elsif (lc ${ $info->{default_value} } eq 'now()') { + # do not use a ref to a constant, that breaks Data::Dump output + ${$info->{default_value}} = 'current_timestamp'; - my $now = 'now()'; - $info->{original}{default_value} = \$now; + my $now = 'now()'; + $info->{original}{default_value} = \$now; + } + elsif (${ $info->{default_value} } =~ /\bCURRENT_TIMESTAMP\b/) { + # PostgreSQL v10 upcases current_timestamp in default values + ${ $info->{default_value} } =~ s/\b(CURRENT_TIMESTAMP)\b/lc $1/ge; + } } -# detect 0/1 for booleans and rewrite + # detect 0/1 for booleans and rewrite if ($data_type =~ /^bool/i && exists $info->{default_value}) { if ($info->{default_value} eq '0') { my $false = 'false'; @@ -340,14 +345,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