X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FProducer%2FPostgreSQL.pm;h=2a71463257c19c5defcfca297a26d66541b639f0;hb=b14cf6f45b6b76766529f0d6d9ced1cfd84aea41;hp=5f898acecab97b0f8b63555f068086a5fc5ad24c;hpb=10d7ce8ba7b4a692ef01bdd762b0a787a618b9fa;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Producer/PostgreSQL.pm b/lib/SQL/Translator/Producer/PostgreSQL.pm index 5f898ac..2a71463 100644 --- a/lib/SQL/Translator/Producer/PostgreSQL.pm +++ b/lib/SQL/Translator/Producer/PostgreSQL.pm @@ -27,14 +27,27 @@ $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 $generator = SQL::Translator::Generator::DDL::PostgreSQL->new; +use constant MAX_ID_LENGTH => 62; -my ( %translate, %index_name ); -my $max_id_length; +{ + 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 ); BEGIN { @@ -42,19 +55,15 @@ BEGIN { # # MySQL types # - bigint => 'bigint', - double => 'numeric', + double => 'double precision', decimal => 'numeric', - float => 'numeric', int => 'integer', mediumint => 'integer', - smallint => 'smallint', tinyint => 'smallint', char => 'character', varchar => 'character varying', longtext => 'text', mediumtext => 'text', - text => 'text', tinytext => 'text', tinyblob => 'bytea', blob => 'bytea', @@ -62,60 +71,28 @@ BEGIN { longblob => 'bytea', enum => 'character varying', set => 'character varying', - date => 'date', datetime => 'timestamp', - time => 'time', - timestamp => 'timestamp', year => 'date', # # Oracle types # number => 'integer', - char => 'character', varchar2 => 'character varying', long => 'text', - CLOB => 'bytea', - date => 'date', + clob => 'text', # # Sybase types # - int => 'integer', - money => 'money', - varchar => 'character varying', - datetime => 'timestamp', - text => 'text', - real => 'numeric', comment => 'text', - bit => 'bit', - tinyint => 'smallint', - float => 'numeric', -); - $max_id_length = 62; + # + # MS Access types + # + memo => 'text', +); } -my %reserved = map { $_, 1 } qw[ - 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 - 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 - 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 - UNION UNIQUE USER USING VERBOSE WHEN WHERE -]; - -# my $max_id_length = 62; -my %used_identifiers = (); -my %global_names; my %truncated; =pod @@ -171,9 +148,7 @@ sub produce { $pargs->{postgres_version}, 'perl' ); - my $qt = $translator->quote_table_names ? q{"} : q{}; - my $qf = $translator->quote_field_names ? q{"} : q{}; - $generator->quote_chars([$qt]); + my $generator = _generator({ quote_identifiers => $translator->quote_identifiers }); my @output; push @output, header_comment unless ($no_comments); @@ -183,8 +158,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, @@ -196,18 +170,18 @@ 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, }); } @@ -231,42 +205,45 @@ 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_id_length = 62; - 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 @@ -285,57 +262,44 @@ sub create_table { my ($table, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - my $qf = $options->{quote_field_names} || ''; - $generator->quote_chars([$qt]); + 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 ? join('.', $table_name, $fql_tbl_name) - : $fql_tbl_name ? join('.', $table_name, $fql_tbl_name) - : $table_name; + my $table_name_qt = $generator->quote($table_name); # print STDERR "$table_name table_name\n"; - my ( @comments, @field_defs, @sequence_defs, @constraint_defs, @fks ); + my ( @comments, @field_defs, @index_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-- "; - $c .= join "\n-- ", $table->comments; - $c .= "\n--\n"; - push @comments, $c; + if ( !$no_comments and my $comments = $table->comments ) { + $comments =~ s/^/-- /mg; + push @comments, "-- Comments:\n$comments\n--\n"; } # # Fields # - 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, + }); } # # Index Declarations # - 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; } @@ -343,35 +307,25 @@ sub create_table # # Table constraints # - 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; } - my $temporary = ""; - - if(exists $table->extra->{temporary}) { - $temporary = $table->extra->{temporary} ? "TEMPORARY " : ""; - } - - my $create_statement; - $create_statement = join("\n", @comments); + my $create_statement = join("\n", @comments); if ($add_drop_table) { if ($postgres_version >= 8.002) { - $create_statement .= 'DROP TABLE IF EXISTS ' . $generator->quote($table_name_ur) . " CASCADE;\n"; + $create_statement .= "DROP TABLE IF EXISTS $table_name_qt CASCADE;\n"; } else { - $create_statement .= 'DROP TABLE ' . $generator->quote($table_name_ur) . " CASCADE;\n"; + $create_statement .= "DROP TABLE $table_name_qt CASCADE;\n"; } } - $create_statement .= "CREATE ${temporary}TABLE " . $generator->quote($table_name_ur) . " (\n" . + my $temporary = $table->extra->{temporary} ? "TEMPORARY " : ""; + $create_statement .= "CREATE ${temporary}TABLE $table_name_qt (\n" . join( ",\n", map { " $_" } @field_defs, @constraint_defs ). "\n)" ; @@ -395,9 +349,7 @@ sub create_table sub create_view { my ($view, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - my $qf = $options->{quote_field_names} || ''; - $generator->quote_chars([$qt]); + my $generator = _generator($options); my $postgres_version = $options->{postgres_version} || 0; my $add_drop_view = $options->{add_drop_view}; @@ -444,9 +396,7 @@ sub create_view { { my ($field, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - my $qf = $options->{quote_field_names} || ''; - $generator->quote_chars([$qt]); + my $generator = _generator($options); my $table_name = $field->table->name; my $constraint_defs = $options->{constraint_defs} || []; my $postgres_version = $options->{postgres_version} || 0; @@ -454,9 +404,11 @@ sub create_view { $field_name_scope{$table_name} ||= {}; my $field_name = $field->name; - my $field_comments = $field->comments - ? "-- " . $field->comments . "\n " - : ''; + my $field_comments = ''; + if (my $comments = $field->comments) { + $comments =~ s/(?quote($field_name); @@ -467,8 +419,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'; @@ -487,7 +438,7 @@ sub create_view { # # Default value # - SQL::Translator::Producer->_apply_default_value( + __PACKAGE__->_apply_default_value( $field, \$field_def, [ @@ -507,12 +458,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; } @@ -549,53 +497,69 @@ sub create_geometry_constraints{ return @constraints; } -sub create_index { - my ($index, $options) = @_; - - my $qt = $options->{quote_table_names} ||''; - my $qf = $options->{quote_field_names} ||''; - $generator->quote_chars([$qt]); - my $table_name = $index->table->name; - - my ($index_def, @constraint_defs); - - my $name - = $index->name - || join('_', $table_name, 'idx', ++$index_name{ $table_name }); + 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 $type = $index->type || NORMAL; - my @fields = $index->fields; - return unless @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; + } + 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; + return $index_def, \@constraint_defs; } - elsif ( $type eq NORMAL ) { - $index_def = - 'CREATE INDEX ' . $generator->quote($name) . ' on ' . $generator->quote($table_name) . ' ' . $field_names - ; - } - else { - warn "Unknown index type ($type) on table $table_name.\n" - if $WARN; - } - - return $index_def, \@constraint_defs; } sub create_constraint { my ($c, $options) = @_; - my $qf = $options->{quote_field_names} ||''; - my $qt = $options->{quote_table_names} ||''; - $generator->quote_chars([$qt]); + my $generator = _generator($options); my $table_name = $c->table->name; my (@constraint_defs, @fks); @@ -651,10 +615,11 @@ sub create_constraint sub create_trigger { my ($trigger,$options) = @_; + my $generator = _generator($options); my @statements; - push @statements, sprintf( 'DROP TRIGGER IF EXISTS %s', $trigger->name ) + push @statements, sprintf( 'DROP TRIGGER IF EXISTS %s', $generator->quote($trigger->name) ) if $options->{add_drop_trigger}; my $scope = $trigger->scope || ''; @@ -662,10 +627,10 @@ sub create_trigger { push @statements, sprintf( 'CREATE TRIGGER %s %s %s ON %s%s %s', - $trigger->name, + $generator->quote($trigger->name), $trigger->perform_action_when, join( ' OR ', @{ $trigger->database_events } ), - $trigger->on_table, + $generator->quote($trigger->on_table), $scope, $trigger->action, ); @@ -703,8 +668,8 @@ sub convert_datatype undef @size; } else { - $data_type = defined $translate{ $data_type } ? - $translate{ $data_type } : + $data_type = defined $translate{ lc $data_type } ? + $translate{ lc $data_type } : $data_type; } @@ -733,7 +698,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/ ) { @@ -812,8 +777,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', @@ -857,9 +821,7 @@ sub drop_field { my ($old_field, $options) = @_; - my $qt = $options->{quote_table_names} ||''; - my $qf = $options->{quote_field_names} ||''; - $generator->quote_chars([$qt]); + my $generator = _generator($options); my $out = sprintf('ALTER TABLE %s DROP COLUMN %s', $generator->quote($old_field->table->name), @@ -915,8 +877,7 @@ sub drop_geometry_constraints{ sub alter_table { my ($to_table, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - $generator->quote_chars([$qt]); + my $generator = _generator($options); my $out = sprintf('ALTER TABLE %s %s', $generator->quote($to_table->name), $options->{alter_table_action}); @@ -926,8 +887,7 @@ sub alter_table { sub rename_table { my ($old_table, $new_table, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - $generator->quote_chars([$qt]); + my $generator = _generator($options); $options->{alter_table_action} = "RENAME TO " . $generator->quote($new_table); my @geometry_changes; @@ -941,13 +901,9 @@ sub rename_table { sub alter_create_index { my ($index, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - my $qf = $options->{quote_field_names} || ''; - $generator->quote_chars([$qt]); + 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', @@ -964,9 +920,7 @@ sub alter_drop_index { sub alter_drop_constraint { my ($c, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - my $qc = $options->{quote_field_names} || ''; - $generator->quote_chars([$qt]); + 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 @@ -974,26 +928,25 @@ sub alter_drop_constraint { my $c_name; if( $c->name ) { # Already has a name, just quote it - $c_name = $qc . $c->name . $qc; + $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 = $qc . $c->table->name . '_' . - ($c->fields)[0] . '_fkey' . $qc; + $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 = $qc . $c->table->name . '_pkey' . $qc; + $c_name = $generator->quote($c->table->name . '_pkey'); } return sprintf( 'ALTER TABLE %s DROP CONSTRAINT %s', - $qt . $c->table->name . $qt, $c_name + $generator->quote($c->table->name), $c_name ); } sub alter_create_constraint { my ($index, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - $generator->quote_chars([$qt]); + my $generator = _generator($options); my ($defs, $fks) = create_constraint(@_); # return if there are no constraint definitions so we don't run @@ -1009,8 +962,7 @@ sub alter_create_constraint { sub drop_table { my ($table, $options) = @_; - my $qt = $options->{quote_table_names} || ''; - $generator->quote_chars([$qt]); + 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; @@ -1019,6 +971,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; # -------------------------------------------------------------------