X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FProducer%2FPostgreSQL.pm;h=c99481768075c29bc102ff96234baace7156c8cd;hb=c96cd4a82bc9447c278ecf2416a7f8fb052853a7;hp=1526d79b55e2a33a4b698d8ab0d2cf583cfbf566;hpb=d25db7329ca9549bae56af466715150ffa884425;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Producer/PostgreSQL.pm b/lib/SQL/Translator/Producer/PostgreSQL.pm index 1526d79..c994817 100644 --- a/lib/SQL/Translator/Producer/PostgreSQL.pm +++ b/lib/SQL/Translator/Producer/PostgreSQL.pm @@ -1,23 +1,5 @@ package SQL::Translator::Producer::PostgreSQL; -# ------------------------------------------------------------------- -# Copyright (C) 2002-2009 SQLFairy Authors -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; version 2. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA -# ------------------------------------------------------------------- - =head1 NAME SQL::Translator::Producer::PostgreSQL - PostgreSQL producer for SQL::Translator @@ -34,13 +16,13 @@ producer. Now handles PostGIS Geometry and Geography data types on table definitions. Does not yet support PostGIS Views. - + =cut use strict; use warnings; -use vars qw[ $DEBUG $WARN $VERSION %used_names ]; -$VERSION = '1.59'; +our ( $DEBUG, $WARN ); +our $VERSION = '1.59'; $DEBUG = 0 unless defined $DEBUG; use base qw(SQL::Translator::Producer); @@ -111,27 +93,26 @@ BEGIN { $max_id_length = 62; } my %reserved = map { $_, 1 } qw[ - ALL ANALYSE ANALYZE AND ANY AS ASC + ALL ANALYSE ANALYZE AND ANY AS ASC BETWEEN BINARY BOTH CASE CAST CHECK COLLATE COLUMN CONSTRAINT CROSS - CURRENT_DATE CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER + CURRENT_DATE CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER DEFAULT DEFERRABLE DESC DISTINCT DO ELSE END EXCEPT - FALSE FOR FOREIGN FREEZE FROM FULL - GROUP HAVING - ILIKE IN INITIALLY INNER INTERSECT INTO IS ISNULL - JOIN LEADING LEFT LIKE LIMIT + FALSE FOR FOREIGN FREEZE FROM FULL + GROUP HAVING + ILIKE IN INITIALLY INNER INTERSECT INTO IS ISNULL + JOIN LEADING LEFT LIKE LIMIT NATURAL NEW NOT NOTNULL NULL OFF OFFSET OLD ON ONLY OR ORDER OUTER OVERLAPS - PRIMARY PUBLIC REFERENCES RIGHT - SELECT SESSION_USER SOME TABLE THEN TO TRAILING TRUE + PRIMARY PUBLIC REFERENCES RIGHT + SELECT SESSION_USER SOME TABLE THEN TO TRAILING TRUE UNION UNIQUE USER USING VERBOSE WHEN WHERE ]; # my $max_id_length = 62; my %used_identifiers = (); my %global_names; -my %unreserve; my %truncated; =pod @@ -175,7 +156,6 @@ and table_constraint is: =cut -# ------------------------------------------------------------------- sub produce { my $translator = shift; local $DEBUG = $translator->debug; @@ -190,7 +170,7 @@ sub produce { my $qt = $translator->quote_table_names ? q{"} : q{}; my $qf = $translator->quote_field_names ? q{"} : q{}; - + my @output; push @output, header_comment unless ($no_comments); @@ -198,7 +178,7 @@ sub produce { my %type_defs; for my $table ( $schema->get_tables ) { - my ($table_def, $fks) = create_table($table, { + my ($table_def, $fks) = create_table($table, { quote_table_names => $qt, quote_field_names => $qf, no_comments => $no_comments, @@ -213,6 +193,7 @@ sub produce { for my $view ( $schema->get_views ) { push @table_defs, create_view($view, { + postgres_version => $postgres_version, add_drop_view => $add_drop_table, quote_table_names => $qt, quote_field_names => $qf, @@ -220,6 +201,13 @@ sub produce { }); } + for my $trigger ( $schema->get_triggers ) { + push @table_defs, create_trigger( $trigger, { + add_drop_trigger => $add_drop_table, + no_comments => $no_comments, + }); + } + push @output, map { "$_;\n\n" } values %type_defs; push @output, map { "$_;\n\n" } @table_defs; if ( @fks ) { @@ -232,12 +220,6 @@ sub produce { warn "Truncated " . keys( %truncated ) . " names:\n"; warn "\t" . join( "\n\t", sort keys %truncated ) . "\n"; } - - if ( %unreserve ) { - warn "Encounted " . keys( %unreserve ) . - " unsafe names in schema (reserved or invalid):\n"; - warn "\t" . join( "\n\t", sort keys %unreserve ) . "\n"; - } } return wantarray @@ -245,18 +227,17 @@ sub produce { : join ('', @output); } -# ------------------------------------------------------------------- sub mk_name { - my $basename = shift || ''; - my $type = shift || ''; - my $scope = shift || ''; + my $basename = shift || ''; + my $type = shift || ''; + my $scope = shift || ''; my $critical = shift || ''; my $basename_orig = $basename; # my $max_id_length = 62; - my $max_name = $type - ? $max_id_length - (length($type) + 1) + my $max_name = $type + ? $max_id_length - (length($type) + 1) : $max_id_length; - $basename = substr( $basename, 0, $max_name ) + $basename = substr( $basename, 0, $max_name ) if length( $basename ) > $max_name; my $name = $type ? "${type}_$basename" : $basename; @@ -271,7 +252,7 @@ sub mk_name { if ( my $prev = $scope->{ $name } ) { my $name_orig = $name; $name .= sprintf( "%02d", ++$prev ); - substr($name, $max_id_length - 3) = "00" + substr($name, $max_id_length - 3) = "00" if length( $name ) > $max_id_length; warn "The name '$name_orig' has been changed to ", @@ -284,52 +265,19 @@ sub mk_name { return $name; } -# ------------------------------------------------------------------- -sub unreserve { - my $name = shift || ''; - my $schema_obj_name = shift || ''; - - my ( $suffix ) = ( $name =~ s/(\W.*)$// ) ? $1 : ''; - - # also trap fields that don't begin with a letter - return $name if (!$reserved{ uc $name }) && $name =~ /^[a-z]/i; - - if ( $schema_obj_name ) { - ++$unreserve{"$schema_obj_name.$name"}; - } - else { - ++$unreserve{"$name (table name)"}; - } - - my $unreserve = sprintf '%s_', $name; - return $unreserve.$suffix; -} - -# ------------------------------------------------------------------- -sub next_unused_name { - my $orig_name = shift or return; - my $name = $orig_name; - - my $suffix_gen = sub { - my $suffix = 0; - return ++$suffix ? '' : $suffix; - }; - - for (;;) { - $name = $orig_name . $suffix_gen->(); - last if $used_names{ $name }++; - } - - return $name; +sub is_geometry +{ + my $field = shift; + return 1 if $field->data_type eq 'geometry'; } -sub is_geometry +sub is_geography { - my $field = shift; - return 1 if $field->data_type eq 'geometry' || $field->data_type eq 'geography'; + my $field = shift; + return 1 if $field->data_type eq 'geography'; } -sub create_table +sub create_table { my ($table, $options) = @_; @@ -343,8 +291,8 @@ sub create_table my $table_name = $table->name or next; my ( $fql_tbl_name ) = ( $table_name =~ s/\W(.*)$// ) ? $1 : q{}; my $table_name_ur = $qt ? $table_name - : $fql_tbl_name ? join('.', $table_name, unreserve($fql_tbl_name)) - : unreserve($table_name); + : $fql_tbl_name ? join('.', $table_name, $fql_tbl_name) + : $table_name; $table->name($table_name_ur); # print STDERR "$table_name table_name\n"; @@ -379,7 +327,7 @@ sub create_table # my $idx_name_default; for my $index ( $table->get_indices ) { my ($idef, $constraints) = create_index($index, - { + { quote_field_names => $qf, quote_table_names => $qt, table_name => $table_name, @@ -393,8 +341,8 @@ sub create_table # my $c_name_default; for my $c ( $table->get_constraints ) { - my ($cdefs, $fks) = create_constraint($c, - { + my ($cdefs, $fks) = create_constraint($c, + { quote_field_names => $qf, quote_table_names => $qt, table_name => $table_name, @@ -408,7 +356,7 @@ sub create_table if(exists $table->{extra}{temporary}) { $temporary = $table->{extra}{temporary} ? "TEMPORARY " : ""; - } + } my $create_statement; $create_statement = join("\n", @comments); @@ -427,14 +375,16 @@ sub create_table $create_statement .= ( $create_statement =~ /;$/ ? "\n" : q{} ) . join(";\n", @index_defs); - # - # Geometry - # - if(grep { is_geometry($_) } $table->get_fields){ + # + # Geometry + # + if(grep { is_geometry($_) } $table->get_fields){ $create_statement .= ";"; - $create_statement .= "\n".join("\n", map { drop_geometry_column($_) if is_geometry($_); } $table->get_fields) if $options->{add_drop_table}; - $create_statement .= "\n".join("\n", map { add_geometry_column($_) if is_geometry($_);} $table->get_fields); - } + my @geometry_columns; + foreach my $col ($table->get_fields) { push(@geometry_columns,$col) if is_geometry($col); } + $create_statement .= "\n".join("\n", map{ drop_geometry_column($_) } @geometry_columns) if $options->{add_drop_table}; + $create_statement .= "\n".join("\n", map{ add_geometry_column($_) } @geometry_columns); + } return $create_statement, \@fks; } @@ -443,6 +393,7 @@ sub create_view { my ($view, $options) = @_; my $qt = $options->{quote_table_names} || ''; my $qf = $options->{quote_field_names} || ''; + my $postgres_version = $options->{postgres_version} || 0; my $add_drop_view = $options->{add_drop_view}; my $view_name = $view->name; @@ -451,7 +402,13 @@ sub create_view { my $create = ''; $create .= "--\n-- View: ${qt}${view_name}${qt}\n--\n" unless $options->{no_comments}; - $create .= "DROP VIEW ${qt}${view_name}${qt};\n" if $add_drop_view; + if ($add_drop_view) { + if ($postgres_version >= 8.002) { + $create .= "DROP VIEW IF EXISTS ${qt}${view_name}${qt};\n"; + } else { + $create .= "DROP VIEW ${qt}${view_name}${qt};\n"; + } + } $create .= 'CREATE'; my $extra = $view->extra; @@ -474,7 +431,7 @@ sub create_view { return $create; } -{ +{ my %field_name_scope; @@ -491,13 +448,11 @@ sub create_view { $field_name_scope{$table_name} ||= {}; my $field_name = $field->name; - my $field_name_ur = $qf ? $field_name : unreserve($field_name, $table_name ); - $field->name($field_name_ur); - my $field_comments = $field->comments - ? "-- " . $field->comments . "\n " + my $field_comments = $field->comments + ? "-- " . $field->comments . "\n " : ''; - my $field_def = $field_comments.qq[$qf$field_name_ur$qf]; + my $field_def = $field_comments.qq[$qf$field_name$qf]; # # Datatype @@ -524,7 +479,7 @@ sub create_view { } # - # Default value + # Default value # SQL::Translator::Producer->_apply_default_value( $field, @@ -541,51 +496,51 @@ sub create_view { # $field_def .= ' NOT NULL' unless $field->is_nullable; - # - # Geometry constraints - # - if(is_geometry($field)){ - foreach ( create_geometry_constraints($field) ) { - my ($cdefs, $fks) = create_constraint($_, - { - quote_field_names => $qf, - quote_table_names => $qt, - table_name => $table_name, - }); - push @$constraint_defs, @$cdefs; - push @$fks, @$fks; - } + # + # Geometry constraints + # + if(is_geometry($field)){ + foreach ( create_geometry_constraints($field) ) { + my ($cdefs, $fks) = create_constraint($_, + { + quote_field_names => $qf, + quote_table_names => $qt, + table_name => $table_name, + }); + push @$constraint_defs, @$cdefs; + push @$fks, @$fks; + } } - + return $field_def; } } sub create_geometry_constraints{ - my $field = shift; - - my @constraints; - push @constraints, SQL::Translator::Schema::Constraint->new( - name => "enforce_dims_".$field->name, - expression => "(st_ndims($field) = ".$field->{extra}{dimensions}.")", - table => $field->table, - type => CHECK_C, - ); - - push @constraints, SQL::Translator::Schema::Constraint->new( - name => "enforce_srid_".$field->name, - expression => "(st_srid($field) = ".$field->{extra}{srid}.")", - table => $field->table, - type => CHECK_C, - ); - push @constraints, SQL::Translator::Schema::Constraint->new( - name => "enforce_geotype_".$field->name, - expression => "(geometrytype($field) = '".$field->{extra}{geometry_type}."'::text OR $field IS NULL)", - table => $field->table, - type => CHECK_C, - ); - - return @constraints; + my $field = shift; + + my @constraints; + push @constraints, SQL::Translator::Schema::Constraint->new( + name => "enforce_dims_".$field->name, + expression => "(ST_NDims($field) = ".$field->{extra}{dimensions}.")", + table => $field->table, + type => CHECK_C, + ); + + push @constraints, SQL::Translator::Schema::Constraint->new( + name => "enforce_srid_".$field->name, + expression => "(ST_SRID($field) = ".$field->{extra}{srid}.")", + table => $field->table, + type => CHECK_C, + ); + push @constraints, SQL::Translator::Schema::Constraint->new( + name => "enforce_geotype_".$field->name, + expression => "(GeometryType($field) = '".$field->{extra}{geometry_type}."'::text OR $field IS NULL)", + table => $field->table, + type => CHECK_C, + ); + + return @constraints; } sub create_index @@ -595,37 +550,29 @@ sub create_index my $qt = $options->{quote_table_names} ||''; my $qf = $options->{quote_field_names} ||''; my $table_name = $index->table->name; -# my $table_name_ur = $qt ? unreserve($table_name) : $table_name; my ($index_def, @constraint_defs); - my $name = next_unused_name( - $index->name - || join('_', $table_name, 'idx', ++$index_name{ $table_name }) - ); + my $name + = $index->name + || join('_', $table_name, 'idx', ++$index_name{ $table_name }); my $type = $index->type || NORMAL; - my @fields = - map { $_ =~ s/\(.+\)//; $_ } - map { $qt ? $_ : unreserve($_, $table_name ) } - $index->fields; - next unless @fields; + my @fields = $index->fields; + return unless @fields; - my $def_start = qq[CONSTRAINT "$name" ]; + my $def_start = qq[CONSTRAINT ${qf}$name${qf} ]; + my $field_names = '(' . join(", ", (map { $_ =~ /\(.*\)/ ? $_ : ($qf . $_ . $qf ) } @fields)) . ')'; if ( $type eq PRIMARY_KEY ) { - push @constraint_defs, "${def_start}PRIMARY KEY ". - '(' .$qf . join( $qf. ', '.$qf, @fields ) . $qf . ')'; + push @constraint_defs, "${def_start}PRIMARY KEY ".$field_names; } elsif ( $type eq UNIQUE ) { - push @constraint_defs, "${def_start}UNIQUE " . - '(' . $qf . join( $qf. ', '.$qf, @fields ) . $qf.')'; + push @constraint_defs, "${def_start}UNIQUE " .$field_names; } elsif ( $type eq NORMAL ) { - $index_def = - "CREATE INDEX ${qf}${name}${qf} on ${qt}${table_name}${qt} (". - join( ', ', map { qq[$qf$_$qf] } @fields ). - ')' - ; + $index_def = + "CREATE INDEX ${qf}${name}${qf} on ${qt}${table_name}${qt} ".$field_names + ; } else { warn "Unknown index type ($type) on table $table_name.\n" @@ -645,55 +592,43 @@ sub create_constraint my (@constraint_defs, @fks); my $name = $c->name || ''; - if ( $name ) { - $name = next_unused_name($name); - } - my @fields = - map { $_ =~ s/\(.+\)//; $_ } - map { $qt ? $_ : unreserve( $_, $table_name )} - $c->fields; + my @fields = grep { defined } $c->fields; - my @rfields = - map { $_ =~ s/\(.+\)//; $_ } - map { $qt ? $_ : unreserve( $_, $table_name )} - $c->reference_fields; + my @rfields = grep { defined } $c->reference_fields; next if !@fields && $c->type ne CHECK_C; - my $def_start = $name ? qq[CONSTRAINT "$name" ] : ''; + my $def_start = $name ? qq[CONSTRAINT ${qf}$name${qf} ] : ''; + my $field_names = '(' . join(", ", (map { $_ =~ /\(.*\)/ ? $_ : ($qf . $_ . $qf ) } @fields)) . ')'; if ( $c->type eq PRIMARY_KEY ) { - push @constraint_defs, "${def_start}PRIMARY KEY ". - '('.$qf . join( $qf.', '.$qf, @fields ) . $qf.')'; + push @constraint_defs, "${def_start}PRIMARY KEY ".$field_names; } elsif ( $c->type eq UNIQUE ) { - $name = next_unused_name($name); - push @constraint_defs, "${def_start}UNIQUE " . - '('.$qf . join( $qf.', '.$qf, @fields ) . $qf.')'; + push @constraint_defs, "${def_start}UNIQUE " .$field_names; } elsif ( $c->type eq CHECK_C ) { my $expression = $c->expression; push @constraint_defs, "${def_start}CHECK ($expression)"; } elsif ( $c->type eq FOREIGN_KEY ) { - my $def .= "ALTER TABLE ${qt}${table_name}${qt} ADD FOREIGN KEY (" . - join( ', ', map { qq[$qf$_$qf] } @fields ) . ')' . - "\n REFERENCES " . $qt . $c->reference_table . $qt; + my $def .= "ALTER TABLE $qt$table_name$qt ADD ${def_start}FOREIGN KEY $field_names" + . "\n REFERENCES " . $qt . $c->reference_table . $qt; if ( @rfields ) { $def .= ' ('.$qf . join( $qf.', '.$qf, @rfields ) . $qf.')'; } if ( $c->match_type ) { - $def .= ' MATCH ' . + $def .= ' MATCH ' . ( $c->match_type =~ /full/i ) ? 'FULL' : 'PARTIAL'; } if ( $c->on_delete ) { - $def .= ' ON DELETE '.join( ' ', $c->on_delete ); + $def .= ' ON DELETE '. $c->on_delete; } if ( $c->on_update ) { - $def .= ' ON UPDATE '.join( ' ', $c->on_update ); + $def .= ' ON UPDATE '. $c->on_update; } if ( $c->deferrable ) { @@ -706,18 +641,43 @@ sub create_constraint return \@constraint_defs, \@fks; } +sub create_trigger { + my ($trigger,$options) = @_; + + my @statements; + + push @statements, sprintf( 'DROP TRIGGER IF EXISTS %s', $trigger->name ) + if $options->{add_drop_trigger}; + + my $scope = $trigger->scope || ''; + $scope = " FOR EACH $scope" if $scope; + + push @statements, sprintf( + 'CREATE TRIGGER %s %s %s ON %s%s %s', + $trigger->name, + $trigger->perform_action_when, + join( ' OR ', @{ $trigger->database_events } ), + $trigger->on_table, + $scope, + $trigger->action, + ); + + return @statements; +} + sub convert_datatype { my ($field) = @_; my @size = $field->size; my $data_type = lc $field->data_type; + my $array = $data_type =~ s/\[\]$//; if ( $data_type eq 'enum' ) { # my $len = 0; # $len = ($len < length($_)) ? length($_) : $len for (@$list); # my $chk_name = mk_name( $table_name.'_'.$field_name, 'chk' ); -# push @$constraint_defs, +# push @$constraint_defs, # qq[CONSTRAINT "$chk_name" CHECK ($qf$field_name$qf ]. # qq[IN ($commalist))]; $data_type = 'character varying'; @@ -769,7 +729,7 @@ sub convert_datatype ); if ( $data_type !~ /$type_with_size/ ) { - @size = (); + @size = (); } if (defined $size[0] && $size[0] > 0 && $data_type =~ /^time/i ) { @@ -778,6 +738,17 @@ sub convert_datatype } elsif ( defined $size[0] && $size[0] > 0 ) { $data_type .= '(' . join( ',', @size ) . ')'; } + if($array) + { + $data_type .= '[]'; + } + + # + # Geography + # + if($data_type eq 'geography'){ + $data_type .= '('.$field->{extra}{geography_type}.','. $field->{extra}{srid} .')' + } return $data_type; } @@ -787,15 +758,25 @@ sub alter_field { my ($from_field, $to_field) = @_; - die "Can't alter field in another table" + die "Can't alter field in another table" if($from_field->table->name ne $to_field->table->name); my @out; - + # drop geometry column and constraints - push @out, drop_geometry_column($from_field) if is_geometry($from_field); - push @out, drop_geometry_constraints($from_field) if is_geometry($from_field); - + push @out, drop_geometry_column($from_field) if is_geometry($from_field); + push @out, drop_geometry_constraints($from_field) if is_geometry($from_field); + + # it's necessary to start with rename column cause this would affect + # all of the following statements which would be broken if do the + # rename later + # BUT: drop geometry is done before the rename, cause it work's on the + # $from_field directly + push @out, sprintf('ALTER TABLE %s RENAME COLUMN %s TO %s', + $to_field->table->name, + $from_field->name, + $to_field->name) if($from_field->name ne $to_field->name); + push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s SET NOT NULL', $to_field->table->name, $to_field->name) if(!$to_field->is_nullable and @@ -814,15 +795,10 @@ sub alter_field $to_field->name, $to_dt) if($to_dt ne $from_dt); - push @out, sprintf('ALTER TABLE %s RENAME COLUMN %s TO %s', - $to_field->table->name, - $from_field->name, - $to_field->name) if($from_field->name ne $to_field->name); - my $old_default = $from_field->default_value; my $new_default = $to_field->default_value; my $default_value = $to_field->default_value; - + # fixes bug where output like this was created: # ALTER TABLE users ALTER COLUMN column SET DEFAULT ThisIsUnescaped; if(ref $default_value eq "SCALAR" ) { @@ -831,7 +807,7 @@ sub alter_field $default_value =~ s/'/''/xsmg; $default_value = q(') . $default_value . q('); } - + push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s', $to_field->table->name, $to_field->name, @@ -839,19 +815,19 @@ sub alter_field if ( defined $new_default && (!defined $old_default || $old_default ne $new_default) ); - # fixes bug where removing the DEFAULT statement of a column - # would result in no change - - push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s DROP DEFAULT', + # fixes bug where removing the DEFAULT statement of a column + # would result in no change + + push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s DROP DEFAULT', $to_field->table->name, $to_field->name) if ( !defined $new_default && defined $old_default ); - - # add geometry column and contraints - push @out, add_geometry_column($to_field) if is_geometry($to_field); - push @out, add_geometry_constraints($to_field) if is_geometry($to_field); - - return wantarray ? @out : join("\n", @out); + + # add geometry column and contraints + push @out, add_geometry_column($to_field) if is_geometry($to_field); + push @out, add_geometry_constraints($to_field) if is_geometry($to_field); + + return wantarray ? @out : join(";\n", @out); } sub rename_field { alter_field(@_) } @@ -871,58 +847,61 @@ sub add_field sub drop_field { - my ($old_field) = @_; + my ($old_field, $options) = @_; + + my $qt = $options->{quote_table_names} ||''; + my $qf = $options->{quote_field_names} ||''; my $out = sprintf('ALTER TABLE %s DROP COLUMN %s', - $old_field->table->name, - $old_field->name); - $out .= "\n".drop_geometry_column($old_field) if is_geometry($old_field); - return $out; + $qt . $old_field->table->name . $qt, + $qf . $old_field->name . $qf); + $out .= "\n".drop_geometry_column($old_field) if is_geometry($old_field); + return $out; } sub add_geometry_column{ - my ($field,$options) = @_; - - my $out = sprintf("INSERT INTO geometry_columns VALUES ('%s','%s','%s','%s','%s','%s','%s')", - '', - $field->table->schema->name, - $options->{table} ? $options->{table} : $field->table->name, - $field->name, - $field->{extra}{dimensions}, - $field->{extra}{srid}, - $field->{extra}{geometry_type}); + my ($field,$options) = @_; + + my $out = sprintf("INSERT INTO geometry_columns VALUES ('%s','%s','%s','%s','%s','%s','%s')", + '', + $field->table->schema->name, + $options->{table} ? $options->{table} : $field->table->name, + $field->name, + $field->{extra}{dimensions}, + $field->{extra}{srid}, + $field->{extra}{geometry_type}); return $out; } sub drop_geometry_column { - my $field = shift; - - my $out = sprintf("DELETE FROM geometry_columns WHERE f_table_schema = '%s' AND f_table_name = '%s' AND f_geometry_column = '%s'", - $field->table->schema->name, - $field->table->name, - $field->name); + my $field = shift; + + my $out = sprintf("DELETE FROM geometry_columns WHERE f_table_schema = '%s' AND f_table_name = '%s' AND f_geometry_column = '%s'", + $field->table->schema->name, + $field->table->name, + $field->name); return $out; } sub add_geometry_constraints{ - my $field = shift; - - my @constraints = create_geometry_constraints($field); + my $field = shift; + + my @constraints = create_geometry_constraints($field); - my $out = join("\n", map { alter_create_constraint($_); } @constraints); - - return $out; + my $out = join("\n", map { alter_create_constraint($_); } @constraints); + + return $out; } sub drop_geometry_constraints{ - my $field = shift; - - my @constraints = create_geometry_constraints($field); - - my $out = join("\n", map { alter_drop_constraint($_); } @constraints); - - return $out; + my $field = shift; + + my @constraints = create_geometry_constraints($field); + + my $out = join("\n", map { alter_drop_constraint($_); } @constraints); + + return $out; } sub alter_table { @@ -940,12 +919,12 @@ sub rename_table { my $qt = $options->{quote_table_names} || ''; $options->{alter_table_action} = "RENAME TO $qt$new_table$qt"; - my @geometry_changes; - push @geometry_changes, map { drop_geometry_column($_); } grep { is_geometry($_) } $old_table->get_fields; - push @geometry_changes, map { add_geometry_column($_, { table => $new_table }); } grep { is_geometry($_) } $old_table->get_fields; - + my @geometry_changes; + push @geometry_changes, map { drop_geometry_column($_); } grep { is_geometry($_) } $old_table->get_fields; + push @geometry_changes, map { add_geometry_column($_, { table => $new_table }); } grep { is_geometry($_) } $old_table->get_fields; + $options->{geometry_changes} = join ("\n",@geometry_changes) if scalar(@geometry_changes); - + return alter_table($old_table, $options); } @@ -975,21 +954,30 @@ sub alter_drop_constraint { my ($c, $options) = @_; my $qt = $options->{quote_table_names} || ''; my $qc = $options->{quote_field_names} || ''; - my $out = sprintf('ALTER TABLE %s DROP CONSTRAINT %s', - $qt . $c->table->name . $qt, - $qc . $c->name . $qc ); - return $out; + + return sprintf( + 'ALTER TABLE %s DROP CONSTRAINT %s', + $qt . $c->table->name . $qt, + # attention: Postgres has a very special naming structure + # for naming foreign keys, it names them uses the name of + # the table as prefix and fkey as suffix, concatenated by a underscore + $c->type eq FOREIGN_KEY + ? $c->name + ? $qc . $c->name . $qc + : $qc . $c->table->name . '_' . ($c->fields)[0] . '_fkey' . $qc + : $qc . $c->name . $qc + ); } sub alter_create_constraint { my ($index, $options) = @_; my $qt = $options->{quote_table_names} || ''; my ($defs, $fks) = create_constraint(@_); - + # return if there are no constraint definitions so we don't run # into output like this: # ALTER TABLE users ADD ; - + return unless(@{$defs} || @{$fks}); return $index->type eq FOREIGN_KEY ? join(q{}, @{$fks}) : join( ' ', 'ALTER TABLE', $qt.$index->table->name.$qt, @@ -1001,7 +989,7 @@ sub drop_table { my ($table, $options) = @_; my $qt = $options->{quote_table_names} || ''; my $out = "DROP TABLE $qt$table$qt CASCADE"; - + my @geometry_drops = map { drop_geometry_column($_); } grep { is_geometry($_) } $table->get_fields; $out .= "\n".join("\n",@geometry_drops) if scalar(@geometry_drops);