X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FProducer%2FPostgreSQL.pm;h=c45229ae0bb42af5cb3758eef7562163b514fe8a;hb=c9c8f3e19f6af2ce0fe5cacd55b87b1d88c6e5eb;hp=5d8a9aa7d46f394a8738f9077be78e496d670274;hpb=0c04c5a2210135419771878dc7e341a1cba52cca;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Producer/PostgreSQL.pm b/lib/SQL/Translator/Producer/PostgreSQL.pm index 5d8a9aa..c45229a 100644 --- a/lib/SQL/Translator/Producer/PostgreSQL.pm +++ b/lib/SQL/Translator/Producer/PostgreSQL.pm @@ -27,9 +27,24 @@ $DEBUG = 0 unless defined $DEBUG; use base qw(SQL::Translator::Producer); use SQL::Translator::Schema::Constants; -use SQL::Translator::Utils qw(debug header_comment parse_dbms_version); +use SQL::Translator::Utils qw(debug header_comment parse_dbms_version batch_alter_table_statements normalize_quote_options); +use SQL::Translator::Generator::DDL::PostgreSQL; use Data::Dumper; +{ + my ($quoting_generator, $nonquoting_generator); + sub _generator { + my $options = shift; + return $options->{generator} if exists $options->{generator}; + + return normalize_quote_options($options) + ? $quoting_generator ||= SQL::Translator::Generator::DDL::PostgreSQL->new + : $nonquoting_generator ||= SQL::Translator::Generator::DDL::PostgreSQL->new( + quote_chars => [], + ); + } +} + my ( %translate, %index_name ); my $max_id_length; @@ -40,9 +55,8 @@ BEGIN { # MySQL types # bigint => 'bigint', - double => 'numeric', + double => 'double precision', decimal => 'numeric', - float => 'numeric', int => 'integer', mediumint => 'integer', smallint => 'smallint', @@ -83,11 +97,9 @@ BEGIN { varchar => 'character varying', datetime => 'timestamp', text => 'text', - real => 'numeric', comment => 'text', bit => 'bit', tinyint => 'smallint', - float => 'numeric', ); $max_id_length = 62; @@ -168,8 +180,7 @@ sub produce { $pargs->{postgres_version}, 'perl' ); - my $qt = $translator->quote_table_names ? q{"} : q{}; - my $qf = $translator->quote_field_names ? q{"} : q{}; + my $generator = _generator({ quote_identifiers => $translator->quote_identifiers }); my @output; push @output, header_comment unless ($no_comments); @@ -179,8 +190,7 @@ sub produce { for my $table ( $schema->get_tables ) { my ($table_def, $fks) = create_table($table, { - quote_table_names => $qt, - quote_field_names => $qf, + generator => $generator, no_comments => $no_comments, postgres_version => $postgres_version, add_drop_table => $add_drop_table, @@ -192,13 +202,20 @@ 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, - no_comments => $no_comments, - }); + push @table_defs, create_view($view, { + postgres_version => $postgres_version, + add_drop_view => $add_drop_table, + generator => $generator, + no_comments => $no_comments, + }); + } + + for my $trigger ( $schema->get_triggers ) { + push @table_defs, create_trigger( $trigger, { + add_drop_trigger => $add_drop_table, + generator => $generator, + no_comments => $no_comments, + }); } push @output, map { "$_;\n\n" } values %type_defs; @@ -274,24 +291,19 @@ sub create_table { my ($table, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - my $qf = $options->{quote_field_names} || ''; + my $generator = _generator($options); my $no_comments = $options->{no_comments} || 0; my $add_drop_table = $options->{add_drop_table} || 0; my $postgres_version = $options->{postgres_version} || 0; my $type_defs = $options->{type_defs} || {}; 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, $fql_tbl_name) - : $table_name; - $table->name($table_name_ur); + my $table_name_qt = $generator->quote($table_name); # print STDERR "$table_name table_name\n"; my ( @comments, @field_defs, @sequence_defs, @constraint_defs, @fks ); - push @comments, "--\n-- Table: $table_name_ur\n--\n" unless $no_comments; + push @comments, "--\n-- Table: $table_name\n--\n" unless $no_comments; if ( $table->comments and !$no_comments ){ my $c = "-- Comments: \n-- "; @@ -305,12 +317,12 @@ sub create_table # my %field_name_scope; for my $field ( $table->get_fields ) { - push @field_defs, create_field($field, { quote_table_names => $qt, - quote_field_names => $qf, - table_name => $table_name_ur, - postgres_version => $postgres_version, - type_defs => $type_defs, - constraint_defs => \@constraint_defs,}); + push @field_defs, create_field($field, { + generator => $generator, + postgres_version => $postgres_version, + type_defs => $type_defs, + constraint_defs => \@constraint_defs, + }); } # @@ -319,12 +331,9 @@ sub create_table my @index_defs = (); # 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, - }); + my ($idef, $constraints) = create_index($index, { + generator => $generator, + }); $idef and push @index_defs, $idef; push @constraint_defs, @$constraints; } @@ -334,12 +343,9 @@ sub create_table # my $c_name_default; for my $c ( $table->get_constraints ) { - my ($cdefs, $fks) = create_constraint($c, - { - quote_field_names => $qf, - quote_table_names => $qt, - table_name => $table_name, - }); + my ($cdefs, $fks) = create_constraint($c, { + generator => $generator, + }); push @constraint_defs, @$cdefs; push @fks, @$fks; } @@ -347,20 +353,20 @@ sub create_table my $temporary = ""; - if(exists $table->{extra}{temporary}) { - $temporary = $table->{extra}{temporary} ? "TEMPORARY " : ""; + if(exists $table->extra->{temporary}) { + $temporary = $table->extra->{temporary} ? "TEMPORARY " : ""; } my $create_statement; $create_statement = join("\n", @comments); if ($add_drop_table) { if ($postgres_version >= 8.002) { - $create_statement .= qq[DROP TABLE IF EXISTS $qt$table_name_ur$qt CASCADE;\n]; + $create_statement .= "DROP TABLE IF EXISTS $table_name_qt CASCADE;\n"; } else { - $create_statement .= qq[DROP TABLE $qt$table_name_ur$qt CASCADE;\n]; + $create_statement .= "DROP TABLE $table_name_qt CASCADE;\n"; } } - $create_statement .= qq[CREATE ${temporary}TABLE $qt$table_name_ur$qt (\n]. + $create_statement .= "CREATE ${temporary}TABLE $table_name_qt (\n" . join( ",\n", map { " $_" } @field_defs, @constraint_defs ). "\n)" ; @@ -384,8 +390,7 @@ sub create_table sub create_view { my ($view, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - my $qf = $options->{quote_field_names} || ''; + my $generator = _generator($options); my $postgres_version = $options->{postgres_version} || 0; my $add_drop_view = $options->{add_drop_view}; @@ -393,23 +398,23 @@ sub create_view { debug("PKG: Looking at view '${view_name}'\n"); my $create = ''; - $create .= "--\n-- View: ${qt}${view_name}${qt}\n--\n" + $create .= "--\n-- View: " . $generator->quote($view_name) . "\n--\n" unless $options->{no_comments}; if ($add_drop_view) { if ($postgres_version >= 8.002) { - $create .= "DROP VIEW IF EXISTS ${qt}${view_name}${qt};\n"; + $create .= "DROP VIEW IF EXISTS " . $generator->quote($view_name) . ";\n"; } else { - $create .= "DROP VIEW ${qt}${view_name}${qt};\n"; + $create .= "DROP VIEW " . $generator->quote($view_name) . ";\n"; } } $create .= 'CREATE'; my $extra = $view->extra; $create .= " TEMPORARY" if exists($extra->{temporary}) && $extra->{temporary}; - $create .= " VIEW ${qt}${view_name}${qt}"; + $create .= " VIEW " . $generator->quote($view_name); if ( my @fields = $view->fields ) { - my $field_list = join ', ', map { "${qf}${_}${qf}" } @fields; + my $field_list = join ', ', map { $generator->quote($_) } @fields; $create .= " ( ${field_list} )"; } @@ -432,8 +437,7 @@ sub create_view { { my ($field, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - my $qf = $options->{quote_field_names} || ''; + my $generator = _generator($options); my $table_name = $field->table->name; my $constraint_defs = $options->{constraint_defs} || []; my $postgres_version = $options->{postgres_version} || 0; @@ -445,7 +449,7 @@ sub create_view { ? "-- " . $field->comments . "\n " : ''; - my $field_def = $field_comments.qq[$qf$field_name$qf]; + my $field_def = $field_comments . $generator->quote($field_name); # # Datatype @@ -454,8 +458,7 @@ sub create_view { my $data_type = lc $field->data_type; my %extra = $field->extra; my $list = $extra{'list'} || []; - # todo deal with embedded quotes - my $commalist = join( ', ', map { qq['$_'] } @$list ); + my $commalist = join( ', ', map { __PACKAGE__->_quote_string($_) } @$list ); if ($postgres_version >= 8.003 && $field->data_type eq 'enum') { my $type_name = $extra{'custom_type_name'} || $field->table->name . '_' . $field->name . '_type'; @@ -474,7 +477,7 @@ sub create_view { # # Default value # - SQL::Translator::Producer->_apply_default_value( + __PACKAGE__->_apply_default_value( $field, \$field_def, [ @@ -494,12 +497,9 @@ sub create_view { # 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, - }); + my ($cdefs, $fks) = create_constraint($_, { + generator => $generator, + }); push @$constraint_defs, @$cdefs; push @$fks, @$fks; } @@ -515,20 +515,20 @@ sub create_geometry_constraints{ my @constraints; push @constraints, SQL::Translator::Schema::Constraint->new( name => "enforce_dims_".$field->name, - expression => "(ST_NDims($field) = ".$field->{extra}{dimensions}.")", + 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}.")", + 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)", + expression => "(GeometryType($field) = '".$field->extra->{geometry_type}."'::text OR $field IS NULL)", table => $field->table, type => CHECK_C, ); @@ -540,8 +540,7 @@ sub create_index { my ($index, $options) = @_; - my $qt = $options->{quote_table_names} ||''; - my $qf = $options->{quote_field_names} ||''; + my $generator = _generator($options); my $table_name = $index->table->name; my ($index_def, @constraint_defs); @@ -552,10 +551,10 @@ sub create_index my $type = $index->type || NORMAL; my @fields = $index->fields; - next unless @fields; + return unless @fields; - my $def_start = qq[CONSTRAINT ${qf}$name${qf} ]; - my $field_names = '(' . join(", ", (map { $_ =~ /\(.*\)/ ? $_ : ($qf . $_ . $qf ) } @fields)) . ')'; + 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; } @@ -564,7 +563,7 @@ sub create_index } elsif ( $type eq NORMAL ) { $index_def = - "CREATE INDEX ${qf}${name}${qf} on ${qt}${table_name}${qt} ".$field_names + 'CREATE INDEX ' . $generator->quote($name) . ' on ' . $generator->quote($table_name) . ' ' . $field_names ; } else { @@ -579,8 +578,7 @@ sub create_constraint { my ($c, $options) = @_; - my $qf = $options->{quote_field_names} ||''; - my $qt = $options->{quote_table_names} ||''; + my $generator = _generator($options); my $table_name = $c->table->name; my (@constraint_defs, @fks); @@ -591,8 +589,8 @@ sub create_constraint my @rfields = grep { defined } $c->reference_fields; next if !@fields && $c->type ne CHECK_C; - my $def_start = $name ? qq[CONSTRAINT ${qf}$name${qf} ] : ''; - my $field_names = '(' . join(", ", (map { $_ =~ /\(.*\)/ ? $_ : ($qf . $_ . $qf ) } @fields)) . ')'; + my $def_start = $name ? 'CONSTRAINT ' . $generator->quote($name) . ' ' : ''; + my $field_names = '(' . join(", ", (map { $_ =~ /\(.*\)/ ? $_ : ( $generator->quote($_) ) } @fields)) . ')'; if ( $c->type eq PRIMARY_KEY ) { push @constraint_defs, "${def_start}PRIMARY KEY ".$field_names; } @@ -604,11 +602,11 @@ sub create_constraint push @constraint_defs, "${def_start}CHECK ($expression)"; } elsif ( $c->type eq FOREIGN_KEY ) { - my $def .= "ALTER TABLE $qt$table_name$qt ADD ${def_start}FOREIGN KEY $field_names" - . "\n REFERENCES " . $qt . $c->reference_table . $qt; + my $def .= "ALTER TABLE " . $generator->quote($table_name) . " ADD ${def_start}FOREIGN KEY $field_names" + . "\n REFERENCES " . $generator->quote($c->reference_table); if ( @rfields ) { - $def .= ' ('.$qf . join( $qf.', '.$qf, @rfields ) . $qf.')'; + $def .= ' (' . join( ', ', map { $generator->quote($_) } @rfields ) . ')'; } if ( $c->match_type ) { @@ -634,6 +632,31 @@ sub create_constraint return \@constraint_defs, \@fks; } +sub create_trigger { + my ($trigger,$options) = @_; + my $generator = _generator($options); + + my @statements; + + push @statements, sprintf( 'DROP TRIGGER IF EXISTS %s', $generator->quote($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', + $generator->quote($trigger->name), + $trigger->perform_action_when, + join( ' OR ', @{ $trigger->database_events } ), + $generator->quote($trigger->on_table), + $scope, + $trigger->action, + ); + + return @statements; +} + sub convert_datatype { my ($field) = @_; @@ -647,7 +670,7 @@ sub convert_datatype # $len = ($len < length($_)) ? length($_) : $len for (@$list); # my $chk_name = mk_name( $table_name.'_'.$field_name, 'chk' ); # push @$constraint_defs, -# qq[CONSTRAINT "$chk_name" CHECK ($qf$field_name$qf ]. +# 'CONSTRAINT "$chk_name" CHECK (' . $generator->quote(field_name) . # qq[IN ($commalist))]; $data_type = 'character varying'; } @@ -694,7 +717,7 @@ sub convert_datatype my $type_with_size = join('|', 'bit', 'varbit', 'character', 'bit varying', 'character varying', - 'time', 'timestamp', 'interval', 'numeric' + 'time', 'timestamp', 'interval', 'numeric', 'float' ); if ( $data_type !~ /$type_with_size/ ) { @@ -716,7 +739,7 @@ sub convert_datatype # Geography # if($data_type eq 'geography'){ - $data_type .= '('.$field->{extra}{geography_type}.','. $field->{extra}{srid} .')' + $data_type .= '('.$field->extra->{geography_type}.','. $field->extra->{srid} .')' } return $data_type; @@ -773,8 +796,7 @@ sub alter_field if(ref $default_value eq "SCALAR" ) { $default_value = $$default_value; } elsif( defined $default_value && $to_dt =~ /^(character|text)/xsmi ) { - $default_value =~ s/'/''/xsmg; - $default_value = q(') . $default_value . q('); + $default_value = __PACKAGE__->_quote_string($default_value); } push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s', @@ -792,7 +814,7 @@ sub alter_field $to_field->name) if ( !defined $new_default && defined $old_default ); - # add geometry column and contraints + # 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); @@ -818,12 +840,11 @@ sub drop_field { my ($old_field, $options) = @_; - my $qt = $options->{quote_table_names} ||''; - my $qf = $options->{quote_field_names} ||''; + my $generator = _generator($options); my $out = sprintf('ALTER TABLE %s DROP COLUMN %s', - $qt . $old_field->table->name . $qt, - $qf . $old_field->name . $qf); + $generator->quote($old_field->table->name), + $generator->quote($old_field->name)); $out .= "\n".drop_geometry_column($old_field) if is_geometry($old_field); return $out; } @@ -836,9 +857,9 @@ sub add_geometry_column{ $field->table->schema->name, $options->{table} ? $options->{table} : $field->table->name, $field->name, - $field->{extra}{dimensions}, - $field->{extra}{srid}, - $field->{extra}{geometry_type}); + $field->extra->{dimensions}, + $field->extra->{srid}, + $field->extra->{geometry_type}); return $out; } @@ -875,9 +896,9 @@ sub drop_geometry_constraints{ sub alter_table { my ($to_table, $options) = @_; - my $qt = $options->{quote_table_names} || ''; + my $generator = _generator($options); my $out = sprintf('ALTER TABLE %s %s', - $qt . $to_table->name . $qt, + $generator->quote($to_table->name), $options->{alter_table_action}); $out .= "\n".$options->{geometry_changes} if $options->{geometry_changes}; return $out; @@ -885,8 +906,8 @@ sub alter_table { sub rename_table { my ($old_table, $new_table, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - $options->{alter_table_action} = "RENAME TO $qt$new_table$qt"; + 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; @@ -899,16 +920,13 @@ sub rename_table { sub alter_create_index { my ($index, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - my $qf = $options->{quote_field_names} || ''; + my $generator = _generator($options); my ($idef, $constraints) = create_index($index, { - quote_field_names => $qf, - quote_table_names => $qt, - table_name => $index->table->name, + generator => $generator, }); return $index->type eq NORMAL ? $idef : sprintf('ALTER TABLE %s ADD %s', - $qt . $index->table->name . $qt, + $generator->quote($index->table->name), join(q{}, @$constraints) ); } @@ -921,26 +939,33 @@ sub alter_drop_index { sub alter_drop_constraint { my ($c, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - my $qc = $options->{quote_field_names} || ''; + my $generator = _generator($options); + + # attention: Postgres has a very special naming structure for naming + # foreign keys and primary keys. It names them using the name of the + # 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); + } 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'); + } 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'); + } 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 + $generator->quote($c->table->name), $c_name ); } sub alter_create_constraint { my ($index, $options) = @_; - my $qt = $options->{quote_table_names} || ''; + my $generator = _generator($options); my ($defs, $fks) = create_constraint(@_); # return if there are no constraint definitions so we don't run @@ -949,15 +974,15 @@ sub alter_create_constraint { return unless(@{$defs} || @{$fks}); return $index->type eq FOREIGN_KEY ? join(q{}, @{$fks}) - : join( ' ', 'ALTER TABLE', $qt.$index->table->name.$qt, + : join( ' ', 'ALTER TABLE', $generator->quote($index->table->name), 'ADD', join(q{}, @{$defs}, @{$fks}) ); } sub drop_table { my ($table, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - my $out = "DROP TABLE $qt$table$qt CASCADE"; + my $generator = _generator($options); + my $out = "DROP TABLE " . $generator->quote($table) . " CASCADE"; my @geometry_drops = map { drop_geometry_column($_); } grep { is_geometry($_) } $table->get_fields; @@ -965,6 +990,45 @@ sub drop_table { return $out; } +sub batch_alter_table { + my ( $table, $diff_hash, $options ) = @_; + + # as long as we're not renaming the table we don't need to be here + if ( @{$diff_hash->{rename_table}} == 0 ) { + return batch_alter_table_statements($diff_hash, $options); + } + + # first we need to perform drops which are on old table + my @sql = batch_alter_table_statements($diff_hash, $options, qw( + alter_drop_constraint + alter_drop_index + drop_field + )); + + # next comes the rename_table + my $old_table = $diff_hash->{rename_table}[0][0]; + push @sql, rename_table( $old_table, $table, $options ); + + # for alter_field (and so also rename_field) we need to make sure old + # field has table name set to new table otherwise calling alter_field dies + $diff_hash->{alter_field} = + [map { $_->[0]->table($table) && $_ } @{$diff_hash->{alter_field}}]; + $diff_hash->{rename_field} = + [map { $_->[0]->table($table) && $_ } @{$diff_hash->{rename_field}}]; + + # now add everything else + push @sql, batch_alter_table_statements($diff_hash, $options, qw( + add_field + alter_field + rename_field + alter_create_index + alter_create_constraint + alter_table + )); + + return @sql; +} + 1; # -------------------------------------------------------------------