X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FProducer%2FPostgreSQL.pm;h=768558731814ebfdf33707281dd1b77a990b9f11;hb=b4414534f4fb5bfa82073f0768d36914340175e9;hp=d5965d74b58f987bf09232308e9874abbb5f9e6d;hpb=4dbac63e1f48b6be8101e40a001a05d0c3462690;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Producer/PostgreSQL.pm b/lib/SQL/Translator/Producer/PostgreSQL.pm index d5965d7..7685587 100644 --- a/lib/SQL/Translator/Producer/PostgreSQL.pm +++ b/lib/SQL/Translator/Producer/PostgreSQL.pm @@ -47,7 +47,7 @@ use constant MAX_ID_LENGTH => 62; } } -my ( %translate, %index_name ); +my ( %translate ); BEGIN { @@ -93,7 +93,6 @@ BEGIN { memo => 'text', ); } -my %global_names; my %truncated; =pod @@ -206,52 +205,53 @@ sub produce { : join ('', @output); } -sub mk_name { - my $basename = shift || ''; - my $type = shift || ''; - my $scope = shift || ''; - my $critical = shift || ''; - my $basename_orig = $basename; - - my $max_name = $type - ? MAX_ID_LENGTH - (length($type) + 1) - : MAX_ID_LENGTH; - $basename = substr( $basename, 0, $max_name ) - if length( $basename ) > $max_name; - my $name = $type ? "${type}_$basename" : $basename; - - if ( $basename ne $basename_orig and $critical ) { - my $show_type = $type ? "+'$type'" : ""; - warn "Truncating '$basename_orig'$show_type to ", MAX_ID_LENGTH, - " character limit to make '$name'\n" if $WARN; - $truncated{ $basename_orig } = $name; - } +{ + my %global_names; + sub mk_name { + my $basename = shift || ''; + my $type = shift || ''; + my $scope = shift || ''; + my $critical = shift || ''; + my $basename_orig = $basename; + + my $max_name = $type + ? MAX_ID_LENGTH - (length($type) + 1) + : MAX_ID_LENGTH; + $basename = substr( $basename, 0, $max_name ) + if length( $basename ) > $max_name; + my $name = $type ? "${type}_$basename" : $basename; + + if ( $basename ne $basename_orig and $critical ) { + my $show_type = $type ? "+'$type'" : ""; + warn "Truncating '$basename_orig'$show_type to ", MAX_ID_LENGTH, + " character limit to make '$name'\n" if $WARN; + $truncated{ $basename_orig } = $name; + } - $scope ||= \%global_names; - if ( my $prev = $scope->{ $name } ) { - my $name_orig = $name; - $name .= sprintf( "%02d", ++$prev ); - substr($name, MAX_ID_LENGTH - 3) = "00" - if length( $name ) > MAX_ID_LENGTH; + $scope ||= \%global_names; + if ( my $prev = $scope->{ $name } ) { + my $name_orig = $name; + $name .= sprintf( "%02d", ++$prev ); + substr($name, MAX_ID_LENGTH - 3) = "00" + if length( $name ) > MAX_ID_LENGTH; - warn "The name '$name_orig' has been changed to ", - "'$name' to make it unique.\n" if $WARN; + warn "The name '$name_orig' has been changed to ", + "'$name' to make it unique.\n" if $WARN; - $scope->{ $name_orig }++; - } + $scope->{ $name_orig }++; + } - $scope->{ $name }++; - return $name; + $scope->{ $name }++; + return $name; + } } -sub is_geometry -{ - my $field = shift; - return 1 if $field->data_type eq 'geometry'; +sub is_geometry { + my $field = shift; + return 1 if $field->data_type eq 'geometry'; } -sub is_geography -{ +sub is_geography { my $field = shift; return 1 if $field->data_type eq 'geography'; } @@ -269,8 +269,7 @@ sub create_table my $table_name = $table->name or next; my $table_name_qt = $generator->quote($table_name); -# print STDERR "$table_name table_name\n"; - my ( @comments, @field_defs, @index_defs, @sequence_defs, @constraint_defs, @fks ); + my ( @comments, @field_defs, @index_defs, @constraint_defs, @fks ); push @comments, "--\n-- Table: $table_name\n--\n" unless $no_comments; @@ -331,16 +330,13 @@ sub create_table $create_statement .= ( $create_statement =~ /;$/ ? "\n" : q{} ) . join(";\n", @index_defs); - # - # Geometry - # - if(grep { is_geometry($_) } $table->get_fields){ - $create_statement .= ";"; - 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); - } + # + # Geometry + # + if (my @geometry_columns = grep { is_geometry($_) } $table->get_fields) { + $create_statement .= join(";\n", '', map{ drop_geometry_column($_, $options) } @geometry_columns) if $options->{add_drop_table}; + $create_statement .= join(";\n", '', map{ add_geometry_column($_, $options) } @geometry_columns); + } return $create_statement, \@fks; } @@ -413,13 +409,12 @@ sub create_view { # # Datatype # - my @size = $field->size; my $data_type = lc $field->data_type; my %extra = $field->extra; my $list = $extra{'list'} || []; my $commalist = join( ', ', map { __PACKAGE__->_quote_string($_) } @$list ); - if ($postgres_version >= 8.003 && $field->data_type eq 'enum') { + if ($postgres_version >= 8.003 && $data_type eq 'enum') { my $type_name = $extra{'custom_type_name'} || $field->table->name . '_' . $field->name . '_type'; $field_def .= ' '. $type_name; my $new_type_def = "DROP TYPE IF EXISTS $type_name CASCADE;\n" . @@ -451,103 +446,105 @@ 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($_, { - generator => $generator, - }); - push @$constraint_defs, @$cdefs; - push @$fks, @$fks; - } + # + # Geometry constraints + # + if (is_geometry($field)) { + foreach ( create_geometry_constraints($field, $options) ) { + my ($cdefs, $fks) = create_constraint($_, $options); + 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; +sub create_geometry_constraints { + my ($field, $options) = @_; + + my $fname = _generator($options)->quote($field); + my @constraints; + push @constraints, SQL::Translator::Schema::Constraint->new( + name => "enforce_dims_".$field->name, + expression => "(ST_NDims($fname) = ".$field->extra->{dimensions}.")", + table => $field->table, + type => CHECK_C, + ); + + push @constraints, SQL::Translator::Schema::Constraint->new( + name => "enforce_srid_".$field->name, + expression => "(ST_SRID($fname) = ".$field->extra->{srid}.")", + table => $field->table, + type => CHECK_C, + ); + push @constraints, SQL::Translator::Schema::Constraint->new( + name => "enforce_geotype_".$field->name, + expression => "(GeometryType($fname) = ". __PACKAGE__->_quote_string($field->extra->{geometry_type}) ."::text OR $fname IS NULL)", + table => $field->table, + type => CHECK_C, + ); + + return @constraints; } -sub create_index { - my ($index, $options) = @_; + my %index_name; + sub create_index + { + my ($index, $options) = @_; - my $generator = _generator($options); - my $table_name = $index->table->name; - - my ($index_def, @constraint_defs); - - my $name - = $index->name - || join('_', $table_name, 'idx', ++$index_name{ $table_name }); - - my $type = $index->type || NORMAL; - my @fields = $index->fields; - return unless @fields; - - my $index_using; - my $index_where; - for my $opt ( $index->options ) { - if ( ref $opt eq 'HASH' ) { - foreach my $key (keys %$opt) { - my $value = $opt->{$key}; - next unless defined $value; - if ( uc($key) eq 'USING' ) { - $index_using = "USING $value"; - } - elsif ( uc($key) eq 'WHERE' ) { - $index_where = "WHERE $value"; - } + my $generator = _generator($options); + my $table_name = $index->table->name; + + my ($index_def, @constraint_defs); + + my $name + = $index->name + || join('_', $table_name, 'idx', ++$index_name{ $table_name }); + + my $type = $index->type || NORMAL; + my @fields = $index->fields; + return unless @fields; + + my $index_using; + my $index_where; + for my $opt ( $index->options ) { + if ( ref $opt eq 'HASH' ) { + foreach my $key (keys %$opt) { + my $value = $opt->{$key}; + next unless defined $value; + if ( uc($key) eq 'USING' ) { + $index_using = "USING $value"; + } + elsif ( uc($key) eq 'WHERE' ) { + $index_where = "WHERE $value"; + } + } + } } - } - } - my $def_start = 'CONSTRAINT ' . $generator->quote($name) . ' '; - my $field_names = '(' . join(", ", (map { $_ =~ /\(.*\)/ ? $_ : ( $generator->quote($_) ) } @fields)) . ')'; - if ( $type eq PRIMARY_KEY ) { - push @constraint_defs, "${def_start}PRIMARY KEY ".$field_names; - } - elsif ( $type eq UNIQUE ) { - push @constraint_defs, "${def_start}UNIQUE " .$field_names; - } - elsif ( $type eq NORMAL ) { - $index_def = - 'CREATE INDEX ' . $generator->quote($name) . ' on ' . $generator->quote($table_name) . ' ' . - join ' ', grep { defined } $index_using, $field_names, $index_where; - } - else { - warn "Unknown index type ($type) on table $table_name.\n" - if $WARN; - } + my $def_start = 'CONSTRAINT ' . $generator->quote($name) . ' '; + my $field_names = '(' . join(", ", (map { $_ =~ /\(.*\)/ ? $_ : ( $generator->quote($_) ) } @fields)) . ')'; + if ( $type eq PRIMARY_KEY ) { + push @constraint_defs, "${def_start}PRIMARY KEY ".$field_names; + } + elsif ( $type eq UNIQUE ) { + push @constraint_defs, "${def_start}UNIQUE " .$field_names; + } + elsif ( $type eq NORMAL ) { + $index_def = + 'CREATE INDEX ' . $generator->quote($name) . ' on ' . $generator->quote($table_name) . ' ' . + join ' ', grep { defined } $index_using, $field_names, $index_where; + } + else { + warn "Unknown index type ($type) on table $table_name.\n" + if $WARN; + } - return $index_def, \@constraint_defs; + return $index_def, \@constraint_defs; + } } sub create_constraint @@ -724,16 +721,19 @@ sub convert_datatype sub alter_field { - my ($from_field, $to_field) = @_; + my ($from_field, $to_field, $options) = @_; die "Can't alter field in another table" if($from_field->table->name ne $to_field->table->name); + my $generator = _generator($options); 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, $options), + drop_geometry_constraints($from_field, $options), + 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 @@ -741,27 +741,41 @@ sub alter_field # 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); + map($generator->quote($_), + $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 - $from_field->is_nullable); + map($generator->quote($_), + $to_field->table->name, + $to_field->name + ), + ) + if(!$to_field->is_nullable and $from_field->is_nullable); push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s DROP NOT NULL', - $to_field->table->name, - $to_field->name) - if ( !$from_field->is_nullable and $to_field->is_nullable ); + map($generator->quote($_), + $to_field->table->name, + $to_field->name + ), + ) + if (!$from_field->is_nullable and $to_field->is_nullable); my $from_dt = convert_datatype($from_field); my $to_dt = convert_datatype($to_field); push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s TYPE %s', - $to_field->table->name, - $to_field->name, - $to_dt) if($to_dt ne $from_dt); + map($generator->quote($_), + $to_field->table->name, + $to_field->name + ), + $to_dt, + ) + if($to_dt ne $from_dt); my $old_default = $from_field->default_value; my $new_default = $to_field->default_value; @@ -776,9 +790,12 @@ sub alter_field } push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s', - $to_field->table->name, - $to_field->name, - $default_value) + map($generator->quote($_), + $to_field->table->name, + $to_field->name, + ), + $default_value, + ) if ( defined $new_default && (!defined $old_default || $old_default ne $new_default) ); @@ -786,13 +803,18 @@ sub alter_field # would result in no change push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s DROP DEFAULT', - $to_field->table->name, - $to_field->name) + map($generator->quote($_), + $to_field->table->name, + $to_field->name, + ), + ) if ( !defined $new_default && defined $old_default ); # add geometry column and constraints - push @out, add_geometry_column($to_field) if is_geometry($to_field); - push @out, add_geometry_constraints($to_field) if is_geometry($to_field); + push @out, + add_geometry_column($to_field, $options), + add_geometry_constraints($to_field, $options), + if is_geometry($to_field); return wantarray ? @out : join(";\n", @out); } @@ -801,13 +823,14 @@ sub rename_field { alter_field(@_) } sub add_field { - my ($new_field) = @_; + my ($new_field,$options) = @_; my $out = sprintf('ALTER TABLE %s ADD COLUMN %s', - $new_field->table->name, - create_field($new_field)); - $out .= "\n".add_geometry_column($new_field) if is_geometry($new_field); - $out .= "\n".add_geometry_constraints($new_field) if is_geometry($new_field); + _generator($options)->quote($new_field->table->name), + create_field($new_field, $options)); + $out .= ";\n".add_geometry_column($new_field, $options) + . ";\n".add_geometry_constraints($new_field, $options) + if is_geometry($new_field); return $out; } @@ -821,53 +844,54 @@ sub drop_field my $out = sprintf('ALTER TABLE %s DROP COLUMN %s', $generator->quote($old_field->table->name), $generator->quote($old_field->name)); - $out .= "\n".drop_geometry_column($old_field) if is_geometry($old_field); + $out .= ";\n".drop_geometry_column($old_field, $options) + 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}); - return $out; -} +sub add_geometry_column { + my ($field, $options) = @_; -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); - return $out; + return sprintf( + "INSERT INTO geometry_columns VALUES (%s,%s,%s,%s,%s,%s,%s)", + map(__PACKAGE__->_quote_string($_), + '', + $field->table->schema->name, + $options->{table} ? $options->{table} : $field->table->name, + $field->name, + $field->extra->{dimensions}, + $field->extra->{srid}, + $field->extra->{geometry_type}, + ), + ); } -sub add_geometry_constraints{ - my $field = shift; +sub drop_geometry_column { + my ($field) = @_; - my @constraints = create_geometry_constraints($field); + return sprintf( + "DELETE FROM geometry_columns WHERE f_table_schema = %s AND f_table_name = %s AND f_geometry_column = %s", + map(__PACKAGE__->_quote_string($_), + $field->table->schema->name, + $field->table->name, + $field->name, + ), + ); +} - my $out = join("\n", map { alter_create_constraint($_); } @constraints); +sub add_geometry_constraints { + my ($field, $options) = @_; - return $out; + return join(";\n", map { alter_create_constraint($_, $options) } + create_geometry_constraints($field, $options)); } -sub drop_geometry_constraints{ - my $field = shift; - - my @constraints = create_geometry_constraints($field); +sub drop_geometry_constraints { + my ($field, $options) = @_; - my $out = join("\n", map { alter_drop_constraint($_); } @constraints); + return join(";\n", map { alter_drop_constraint($_, $options) } + create_geometry_constraints($field, $options)); - return $out; } sub alter_table { @@ -876,7 +900,7 @@ sub alter_table { my $out = sprintf('ALTER TABLE %s %s', $generator->quote($to_table->name), $options->{alter_table_action}); - $out .= "\n".$options->{geometry_changes} if $options->{geometry_changes}; + $out .= ";\n".$options->{geometry_changes} if $options->{geometry_changes}; return $out; } @@ -885,11 +909,12 @@ sub rename_table { my $generator = _generator($options); $options->{alter_table_action} = "RENAME TO " . $generator->quote($new_table); - 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 = map { + drop_geometry_column($_, $options), + add_geometry_column($_, { %{$options}, table => $new_table }), + } grep { is_geometry($_) } $old_table->get_fields; - $options->{geometry_changes} = join ("\n",@geometry_changes) if scalar(@geometry_changes); + $options->{geometry_changes} = join (";\n",@geometry_changes) if @geometry_changes; return alter_table($old_table, $options); } @@ -897,9 +922,7 @@ sub rename_table { sub alter_create_index { my ($index, $options) = @_; my $generator = _generator($options); - my ($idef, $constraints) = create_index($index, { - generator => $generator, - }); + my ($idef, $constraints) = create_index($index, $options); return $index->type eq NORMAL ? $idef : sprintf('ALTER TABLE %s ADD %s', $generator->quote($index->table->name), @@ -909,8 +932,7 @@ sub alter_create_index { sub alter_drop_index { my ($index, $options) = @_; - my $index_name = $index->name; - return "DROP INDEX $index_name"; + return 'DROP INDEX '. _generator($options)->quote($index->name); } sub alter_drop_constraint { @@ -922,20 +944,19 @@ sub alter_drop_constraint { # table as prefix and fkey or pkey as suffix, concatenated by an underscore my $c_name; if( $c->name ) { - # Already has a name, just quote it - $c_name = $generator->quote($c->name); + # Already has a name, just use it + $c_name = $c->name; } elsif ( $c->type eq FOREIGN_KEY ) { # Doesn't have a name, and is foreign key, append '_fkey' - $c_name = $generator->quote($c->table->name . '_' . - ($c->fields)[0] . '_fkey'); + $c_name = $c->table->name . '_' . ($c->fields)[0] . '_fkey'; } elsif ( $c->type eq PRIMARY_KEY ) { # Doesn't have a name, and is primary key, append '_pkey' - $c_name = $generator->quote($c->table->name . '_pkey'); + $c_name = $c->table->name . '_pkey'; } return sprintf( 'ALTER TABLE %s DROP CONSTRAINT %s', - $generator->quote($c->table->name), $c_name + map { $generator->quote($_) } $c->table->name, $c_name, ); } @@ -962,7 +983,7 @@ sub drop_table { my @geometry_drops = map { drop_geometry_column($_); } grep { is_geometry($_) } $table->get_fields; - $out .= "\n".join("\n",@geometry_drops) if scalar(@geometry_drops); + $out .= join(";\n", '', @geometry_drops) if @geometry_drops; return $out; }