X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FProducer%2FMySQL.pm;h=6ebaf9de460ef5640b4647bf9352a79b9a347f74;hb=4f1186cfb3f8c93a2e00a2c42e119e109ed16fa7;hp=a9b8301e8bf96c4ac621f1aacc32399aa80186c7;hpb=5d666b31769e40325f3513299a58cdac631ced41;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Producer/MySQL.pm b/lib/SQL/Translator/Producer/MySQL.pm index a9b8301..6ebaf9d 100644 --- a/lib/SQL/Translator/Producer/MySQL.pm +++ b/lib/SQL/Translator/Producer/MySQL.pm @@ -1,25 +1,5 @@ package SQL::Translator::Producer::MySQL; -# ------------------------------------------------------------------- -# $Id: MySQL.pm,v 1.54 2007-11-10 03:36:43 mwz444 Exp $ -# ------------------------------------------------------------------- -# Copyright (C) 2002-4 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::MySQL - MySQL-specific producer for SQL::Translator @@ -36,18 +16,18 @@ Use via SQL::Translator: =head1 DESCRIPTION This module will produce text output of the schema suitable for MySQL. -There are still some issues to be worked out with syntax differences +There are still some issues to be worked out with syntax differences between MySQL versions 3 and 4 ("SET foreign_key_checks," character sets for fields, etc.). -=head1 ARGUMENTS +=head1 ARGUMENTS -This producer takes a single optional producer_arg C, which +This producer takes a single optional producer_arg C, which provides the desired version for the target database. By default MySQL v3 is assumed, and statements pertaining to any features introduced in later versions (e.g. CREATE VIEW) are not produced. -Valid version specifiers for C are listed L +Valid version specifiers for C are listed L =head2 Table Types @@ -83,17 +63,17 @@ Set the type of the table e.g. 'InnoDB', 'MyISAM'. This will be automatically set for tables involved in foreign key constraints if it is not already set explicitly. See L<"Table Types">. -Please note that the C option is the prefered method of specifying +Please note that the C option is the preferred method of specifying the MySQL storage engine to use, but this method still works for backwards -compatability. +compatibility. =item B, B -Set the tables default charater set and collation order. +Set the tables default character set and collation order. =item B, B -Set the fields charater set and collation order. +Set the fields character set and collation order. =back @@ -101,8 +81,8 @@ Set the fields charater set and collation order. use strict; use warnings; -use vars qw[ $VERSION $DEBUG %used_names ]; -$VERSION = sprintf "%d.%02d", q$Revision: 1.54 $ =~ /(\d+)\.(\d+)/; +our ( $DEBUG, %used_names ); +our $VERSION = '1.59'; $DEBUG = 0 unless defined $DEBUG; # Maximum length for most identifiers is 64, according to: @@ -112,7 +92,8 @@ my $DEFAULT_MAX_ID_LENGTH = 64; use Data::Dumper; use SQL::Translator::Schema::Constants; -use SQL::Translator::Utils qw(debug header_comment truncate_id_uniquely parse_mysql_version); +use SQL::Translator::Utils qw(debug header_comment + truncate_id_uniquely parse_mysql_version); # # Use only lowercase for the keys (e.g. "long" and not "LONG") @@ -140,8 +121,20 @@ my %translate = ( 'long integer' => 'integer', 'text' => 'text', 'datetime' => 'datetime', + + # + # PostgreSQL types + # + bytea => 'BLOB', ); +# +# Column types that do not support length attribute +# +my @no_length_attr = qw/ + date time timestamp datetime year + /; + sub preprocess_schema { my ($schema) = @_; @@ -159,20 +152,18 @@ sub preprocess_schema { # Now just to find if there is already an Engine or Type option... # and lets normalize it to ENGINE since: # - # The ENGINE table option specifies the storage engine for the table. + # The ENGINE table option specifies the storage engine for the table. # TYPE is a synonym, but ENGINE is the preferred option name. # - # We have to use the hash directly here since otherwise there is no way - # to remove options. - my $options = ( $table->{options} ||= []); + my $options = $table->options; # If multiple option names, normalize to the first one if (ref $opt_name) { OPT_NAME: for ( @$opt_name[1..$#$opt_name] ) { for my $idx ( 0..$#{$options} ) { my ($key, $value) = %{ $options->[$idx] }; - + if (uc $key eq $_) { $options->[$idx] = { $opt_name->[0] => $value }; last OPT_NAME; @@ -190,13 +181,13 @@ sub preprocess_schema { my ($key, $value) = %{ $options->[$idx] }; next unless uc $key eq $opt_name; - + # make sure case is right on option name delete $options->[$idx]{$key}; return $options->[$idx]{$opt_name} = $value || $extra_type; } - + if ($extra_type) { push @$options, { $opt_name => $extra_type }; return $extra_type; @@ -212,7 +203,7 @@ sub preprocess_schema { # constraints. We do this first as we need InnoDB at both ends. # foreach my $table ( $schema->get_tables ) { - + $extra_to_options->($table, 'mysql_table_type', ['ENGINE', 'TYPE'] ); $extra_to_options->($table, 'mysql_charset', 'CHARACTER SET' ); $extra_to_options->($table, 'mysql_collate', 'COLLATE' ); @@ -222,10 +213,10 @@ sub preprocess_schema { # Normalize constraint names here. my $c_name = $c->name; - # Give the constraint a name if it doesn't have one, so it doens't feel + # Give the constraint a name if it doesn't have one, so it doesn't feel # left out $c_name = $table->name . '_fk' unless length $c_name; - + $c->name( next_unused_name($c_name) ); for my $meth (qw/table reference_table/) { @@ -270,10 +261,10 @@ sub produce { debug("PKG: Beginning production\n"); %used_names = (); - my $create; + my $create = ''; $create .= header_comment unless ($no_comments); # \todo Don't set if MySQL 3.x is set on command line - $create .= "SET foreign_key_checks=0;\n\n"; + my @create = "SET foreign_key_checks=0"; preprocess_schema($schema); @@ -281,10 +272,10 @@ sub produce { # Generate sql # my @table_defs =(); - + for my $table ( $schema->get_tables ) { # print $table->name, "\n"; - push @table_defs, create_table($table, + push @table_defs, create_table($table, { add_drop_table => $add_drop_table, show_warnings => $show_warnings, no_comments => $no_comments, @@ -295,7 +286,7 @@ sub produce { }); } - if ($mysql_version > 5.0) { + if ($mysql_version >= 5.000001) { for my $view ( $schema->get_views ) { push @table_defs, create_view($view, { add_replace_view => $add_drop_table, @@ -309,11 +300,61 @@ sub produce { } } + if ($mysql_version >= 5.000002) { + for my $trigger ( $schema->get_triggers ) { + push @table_defs, create_trigger($trigger, + { add_drop_trigger => $add_drop_table, + show_warnings => $show_warnings, + no_comments => $no_comments, + quote_table_names => $qt, + quote_field_names => $qf, + max_id_length => $max_id_length, + mysql_version => $mysql_version + }); + } + } + # print "@table_defs\n"; - push @table_defs, "SET foreign_key_checks=1;\n\n"; + push @table_defs, "SET foreign_key_checks=1"; + + return wantarray ? ($create ? $create : (), @create, @table_defs) : ($create . join('', map { $_ ? "$_;\n\n" : () } (@create, @table_defs))); +} + +sub create_trigger { + my ($trigger, $options) = @_; + my $qt = $options->{quote_table_names} || ''; + my $qf = $options->{quote_field_names} || ''; - return wantarray ? ($create, @table_defs) : $create . join ('', @table_defs); + my $trigger_name = $trigger->name; + debug("PKG: Looking at trigger '${trigger_name}'\n"); + + my @statements; + + my $events = $trigger->database_events; + for my $event ( @$events ) { + my $name = $trigger_name; + if (@$events > 1) { + $name .= "_$event"; + + warn "Multiple database events supplied for trigger '${trigger_name}', ", + "creating trigger '${name}' for the '${event}' event\n" + if $options->{show_warnings}; + } + + my $action = $trigger->action; + $action .= ";" unless $action =~ /;\s*\z/; + + push @statements, "DROP TRIGGER IF EXISTS ${qt}${name}${qt}" if $options->{add_drop_trigger}; + push @statements, sprintf( + "CREATE TRIGGER ${qt}%s${qt} %s %s ON ${qt}%s${qt}\n FOR EACH ROW BEGIN %s END", + $name, $trigger->perform_action_when, $event, $trigger->on_table, $action, + ); + + } + # Tack the comment onto the first statement + $statements[0] = "--\n-- Trigger ${qt}${trigger_name}${qt}\n--\n" . $statements[0] unless $options->{no_comments}; + return @statements; } sub create_view { @@ -353,9 +394,11 @@ sub create_view { $create .= " ( ${list} )"; } if( my $sql = $view->sql ){ - $create .= " AS (\n ${sql}\n )"; + # do not wrap parenthesis around the selector, mysql doesn't like this + # http://bugs.mysql.com/bug.php?id=9198 + $create .= " AS\n ${sql}\n"; } - $create .= ";\n\n"; +# $create .= ""; return $create; } @@ -366,7 +409,7 @@ sub create_table my $qt = $options->{quote_table_names} || ''; my $qf = $options->{quote_field_names} || ''; - my $table_name = $table->name; + my $table_name = quote_table_name($table->name, $qt); debug("PKG: Looking at table '$table_name'\n"); # @@ -374,9 +417,9 @@ sub create_table # my $create = ''; my $drop; - $create .= "--\n-- Table: $qt$table_name$qt\n--\n" unless $options->{no_comments}; - $drop = qq[DROP TABLE IF EXISTS $qt$table_name$qt;\n] if $options->{add_drop_table}; - $create .= "CREATE TABLE $qt$table_name$qt (\n"; + $create .= "--\n-- Table: $table_name\n--\n" unless $options->{no_comments}; + $drop = qq[DROP TABLE IF EXISTS $table_name] if $options->{add_drop_table}; + $create .= "CREATE TABLE $table_name (\n"; # # Fields @@ -404,14 +447,14 @@ sub create_table for my $c ( @constraints ) { my $constr = create_constraint($c, $options); push @constraint_defs, $constr if($constr); - + unless ( $indexed_fields{ ($c->fields())[0] } || $c->type ne FOREIGN_KEY ) { push @index_defs, "INDEX ($qf" . ($c->fields())[0] . "$qf)"; $indexed_fields{ ($c->fields())[0] } = 1; } } - $create .= join(",\n", map { " $_" } + $create .= join(",\n", map { " $_" } @field_defs, @index_defs, @constraint_defs ); @@ -419,20 +462,30 @@ sub create_table # Footer # $create .= "\n)"; - $create .= generate_table_options($table) || ''; - $create .= ";\n\n"; + $create .= generate_table_options($table, $options) || ''; +# $create .= ";\n\n"; return $drop ? ($drop,$create) : $create; } -sub generate_table_options +sub quote_table_name { + my ($table_name, $qt) = @_; + + $table_name =~ s/\./$qt.$qt/g; + + return "$qt$table_name$qt"; +} + +sub generate_table_options { - my ($table) = @_; + my ($table, $options) = @_; my $create; my $table_type_defined = 0; + my $qf = $options->{quote_field_names} ||= ''; my $charset = $table->extra('mysql_charset'); my $collate = $table->extra('mysql_collate'); + my $union = undef; for my $t1_option_ref ( $table->options ) { my($key, $value) = %{$t1_option_ref}; $table_type_defined = 1 @@ -443,6 +496,9 @@ sub generate_table_options } elsif (uc $key eq 'COLLATE') { $collate = $value; next; + } elsif (uc $key eq 'UNION') { + $union = "($qf". join("$qf, $qf", @$value) ."$qf)"; + next; } $create .= " $key=$value"; } @@ -454,6 +510,7 @@ sub generate_table_options $create .= " DEFAULT CHARACTER SET $charset" if $charset; $create .= " COLLATE $collate" if $collate; + $create .= " UNION=$union" if $union; $create .= qq[ comment='$comments'] if $comments; return $create; } @@ -530,7 +587,11 @@ sub create_field if ( lc($data_type) eq 'enum' || lc($data_type) eq 'set') { $field_def .= '(' . $commalist . ')'; } - elsif ( defined $size[0] && $size[0] > 0 ) { + elsif ( + defined $size[0] && $size[0] > 0 + && + ! grep lc($data_type) eq $_, @no_length_attr + ) { $field_def .= '(' . join( ', ', @size ) . ')'; } @@ -545,21 +606,30 @@ sub create_field } for my $qual ( 'character set', 'collate', 'on update' ) { my $val = $extra{ $qual } || $extra{ uc $qual } or next; - $field_def .= " $qual $val"; + if ( ref $val ) { + $field_def .= " $qual ${$val}"; + } + else { + $field_def .= " $qual $val"; + } } # Null? - $field_def .= ' NOT NULL' unless $field->is_nullable; - - # Default? XXX Need better quoting! - my $default = $field->default_value; - if ( defined $default ) { - if ( uc $default eq 'NULL') { - $field_def .= ' DEFAULT NULL'; - } else { - $field_def .= " DEFAULT '$default'"; - } + if ( $field->is_nullable ) { + $field_def .= ' NULL'; } + else { + $field_def .= ' NOT NULL'; + } + + # Default? + SQL::Translator::Producer->_apply_default_value( + $field, + \$field_def, + [ + 'NULL' => \'NULL', + ], + ); if ( my $comments = $field->comments ) { $field_def .= qq[ comment '$comments']; @@ -577,10 +647,10 @@ sub alter_create_index my $qt = $options->{quote_table_names} || ''; my $qf = $options->{quote_field_names} || ''; - + my $table_name = quote_table_name($index->table->name, $qt); return join( ' ', 'ALTER TABLE', - $qt.$index->table->name.$qt, + $table_name, 'ADD', create_index(@_) ); @@ -588,16 +658,22 @@ sub alter_create_index sub create_index { - my ($index, $options) = @_; + my ( $index, $options ) = @_; my $qf = $options->{quote_field_names} || ''; - return join( ' ', - lc $index->type eq 'normal' ? 'INDEX' : $index->type . ' INDEX', - truncate_id_uniquely( $index->name, $options->{max_id_length} || $DEFAULT_MAX_ID_LENGTH ), - '(' . $qf . join( "$qf, $qf", $index->fields ) . $qf . ')' - ); - + return join( + ' ', + map { $_ || () } + lc $index->type eq 'normal' ? 'INDEX' : $index->type . ' INDEX', + $index->name + ? $qf . truncate_id_uniquely( + $index->name, + $options->{max_id_length} || $DEFAULT_MAX_ID_LENGTH + ) . $qf + : '', + '(' . $qf . join( "$qf, $qf", $index->fields ) . $qf . ')' + ); } sub alter_drop_index @@ -606,10 +682,11 @@ sub alter_drop_index my $qt = $options->{quote_table_names} || ''; my $qf = $options->{quote_field_names} || ''; + my $table_name = quote_table_name($index->table->name, $qt); - return join( ' ', + return join( ' ', 'ALTER TABLE', - $qt.$index->table->name.$qt, + $table_name, 'DROP', 'INDEX', $index->name || $index->fields @@ -623,13 +700,17 @@ sub alter_drop_constraint my $qt = $options->{quote_table_names} || ''; my $qc = $options->{quote_field_names} || ''; + my $table_name = quote_table_name($c->table->name, $qt); - my $out = sprintf('ALTER TABLE %s DROP %s %s', - $qt . $c->table->name . $qt, - $c->type eq FOREIGN_KEY ? $c->type : "INDEX", - $qc . $c->name . $qc ); - - return $out; + my @out = ('ALTER','TABLE',$table_name,'DROP'); + if($c->type eq PRIMARY_KEY) { + push @out, $c->type; + } + else { + push @out, ($c->type eq FOREIGN_KEY ? $c->type : "INDEX"), + $qc . $c->name . $qc; + } + return join(' ',@out); } sub alter_create_constraint @@ -637,9 +718,10 @@ sub alter_create_constraint my ($index, $options) = @_; my $qt = $options->{quote_table_names} || ''; + my $table_name = quote_table_name($index->table->name, $qt); return join( ' ', 'ALTER TABLE', - $qt.$index->table->name.$qt, + $table_name, 'ADD', create_constraint(@_) ); } @@ -652,16 +734,26 @@ sub create_constraint my $qt = $options->{quote_table_names} || ''; my $leave_name = $options->{leave_name} || undef; - my @fields = $c->fields or next; + my $reference_table_name = quote_table_name($c->reference_table, $qt); + + my @fields = $c->fields or return; if ( $c->type eq PRIMARY_KEY ) { return 'PRIMARY KEY (' . $qf . join("$qf, $qf", @fields). $qf . ')'; } elsif ( $c->type eq UNIQUE ) { - return - 'UNIQUE '. - (defined $c->name ? $qf.truncate_id_uniquely( $c->name, $options->{max_id_length} || $DEFAULT_MAX_ID_LENGTH ).$qf.' ' : ''). - '(' . $qf . join("$qf, $qf", @fields). $qf . ')'; + return sprintf 'UNIQUE %s(%s)', + ((defined $c->name && $c->name) + ? join ('', + $qf, + truncate_id_uniquely( $c->name, $options->{max_id_length} || $DEFAULT_MAX_ID_LENGTH ), + $qf, + ' ' + ) + : '' + ), + ( join ', ', map { "${qf}${_}${qf}" } @fields ), + ; } elsif ( $c->type eq FOREIGN_KEY ) { # @@ -671,17 +763,17 @@ sub create_constraint my $table = $c->table; my $c_name = truncate_id_uniquely( $c->name, $options->{max_id_length} || $DEFAULT_MAX_ID_LENGTH ); - my $def = join(' ', - map { $_ || () } - 'CONSTRAINT', - $qf . $c_name . $qf, + my $def = join(' ', + map { $_ || () } + 'CONSTRAINT', + $qf . $c_name . $qf, 'FOREIGN KEY' ); $def .= ' ('.$qf . join( "$qf, $qf", @fields ) . $qf . ')'; - $def .= ' REFERENCES ' . $qt . $c->reference_table . $qt; + $def .= ' REFERENCES ' . $reference_table_name; my @rfields = map { $_ || () } $c->reference_fields; unless ( @rfields ) { @@ -700,21 +792,21 @@ sub create_constraint } else { warn "FK constraint on " . $table->name . '.' . - join('', @fields) . " has no reference fields\n" + join('', @fields) . " has no reference fields\n" if $options->{show_warnings}; } 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; } return $def; } @@ -728,9 +820,10 @@ sub alter_table my $qt = $options->{quote_table_names} || ''; - my $table_options = generate_table_options($to_table) || ''; + my $table_options = generate_table_options($to_table, $options) || ''; + my $table_name = quote_table_name($to_table->name, $qt); my $out = sprintf('ALTER TABLE %s%s', - $qt . $to_table->name . $qt, + $table_name, $table_options); return $out; @@ -743,9 +836,10 @@ sub alter_field my $qf = $options->{quote_field_names} || ''; my $qt = $options->{quote_table_names} || ''; + my $table_name = quote_table_name($to_field->table->name, $qt); my $out = sprintf('ALTER TABLE %s CHANGE COLUMN %s %s', - $qt . $to_field->table->name . $qt, + $table_name, $qf . $from_field->name . $qf, create_field($to_field, $options)); @@ -757,9 +851,10 @@ sub add_field my ($new_field, $options) = @_; my $qt = $options->{quote_table_names} || ''; + my $table_name = quote_table_name($new_field->table->name, $qt); my $out = sprintf('ALTER TABLE %s ADD COLUMN %s', - $qt . $new_field->table->name . $qt, + $table_name, create_field($new_field, $options)); return $out; @@ -767,32 +862,33 @@ sub add_field } sub drop_field -{ +{ my ($old_field, $options) = @_; my $qf = $options->{quote_field_names} || ''; my $qt = $options->{quote_table_names} || ''; - + my $table_name = quote_table_name($old_field->table->name, $qt); + my $out = sprintf('ALTER TABLE %s DROP COLUMN %s', - $qt . $old_field->table->name . $qt, + $table_name, $qf . $old_field->name . $qf); return $out; - + } sub batch_alter_table { my ($table, $diff_hash, $options) = @_; - # InnoDB has an issue with dropping and re-adding a FK constraint under the - # name in a single alter statment, see: http://bugs.mysql.com/bug.php?id=13741 + # InnoDB has an issue with dropping and re-adding a FK constraint under the + # name in a single alter statement, see: http://bugs.mysql.com/bug.php?id=13741 # # We have to work round this. my %fks_to_alter; my %fks_to_drop = map { - $_->type eq FOREIGN_KEY - ? ( $_->name => $_ ) + $_->type eq FOREIGN_KEY + ? ( $_->name => $_ ) : ( ) } @{$diff_hash->{alter_drop_constraint} }; @@ -803,14 +899,13 @@ sub batch_alter_table { } else { ( ) } } @{$diff_hash->{alter_create_constraint} }; - my $drop_stmt = ''; + my @drop_stmt; if (scalar keys %fks_to_alter) { $diff_hash->{alter_drop_constraint} = [ grep { !$fks_to_alter{$_->name} } @{ $diff_hash->{alter_drop_constraint} } ]; - $drop_stmt = batch_alter_table($table, { alter_drop_constraint => [ values %fks_to_alter ] }, $options) - . "\n"; + @drop_stmt = batch_alter_table($table, { alter_drop_constraint => [ values %fks_to_alter ] }, $options); } @@ -830,23 +925,24 @@ sub batch_alter_table { alter_create_constraint alter_table/; + #quote + my $qt = $options->{quote_table_names} || ''; + # rename_table makes things a bit more complex my $renamed_from = ""; - $renamed_from = $diff_hash->{rename_table}[0][0]->name + $renamed_from = quote_table_name($diff_hash->{rename_table}[0][0]->name, $qt) if $diff_hash->{rename_table} && @{$diff_hash->{rename_table}}; return unless @stmts; # Just zero or one stmts. return now - return "$drop_stmt@stmts;" unless @stmts > 1; + return (@drop_stmt,@stmts) unless @stmts > 1; # Now strip off the 'ALTER TABLE xyz' of all but the first one - my $qt = $options->{quote_table_names} || ''; - my $table_name = $qt . $table->name . $qt; - + my $table_name = quote_table_name($table->name, $qt); - my $re = $renamed_from - ? qr/^ALTER TABLE (?:\Q$table_name\E|\Q$qt$renamed_from$qt\E) / + my $re = $renamed_from + ? qr/^ALTER TABLE (?:\Q$table_name\E|\Q$renamed_from\E) / : qr/^ALTER TABLE \Q$table_name\E /; my $first = shift @stmts; @@ -854,7 +950,7 @@ sub batch_alter_table { my $padd = " " x length($alter_table); - return $drop_stmt . join( ",\n", $first, map { s/$re//; $padd . $_ } @stmts) . ';'; + return @drop_stmt, join( ",\n", $first, map { s/$re//; $padd . $_ } @stmts); } @@ -866,7 +962,8 @@ sub drop_table { # Drop (foreign key) constraints so table drops cleanly my @sql = batch_alter_table($table, { alter_drop_constraint => [ grep { $_->type eq 'FOREIGN KEY' } $table->get_constraints ] }, $options); - return join("\n", @sql, "DROP TABLE $qt$table$qt;"); + my $table_name = quote_table_name($table, $qt); + return (@sql, "DROP TABLE $table"); } @@ -874,8 +971,10 @@ sub rename_table { my ($old_table, $new_table, $options) = @_; my $qt = $options->{quote_table_names} || ''; + my $old_table_name = quote_table_name($old_table, $qt); + my $new_table_name = quote_table_name($new_table, $qt); - return "ALTER TABLE $qt$old_table$qt RENAME TO $qt$new_table$qt"; + return "ALTER TABLE $old_table_name RENAME TO $new_table_name"; } sub next_unused_name { @@ -896,8 +995,6 @@ sub next_unused_name { 1; -# ------------------------------------------------------------------- - =pod =head1 SEE ALSO @@ -907,6 +1004,6 @@ SQL::Translator, http://www.mysql.com/. =head1 AUTHORS darren chamberlain Edarren@cpan.orgE, -Ken Y. Clark Ekclark@cpan.orgE. +Ken Youens-Clark Ekclark@cpan.orgE. =cut