Index: t/38-mysql-producer.t =================================================================== --- t/38-mysql-producer.t (revision 1327) +++ t/38-mysql-producer.t (working copy) @@ -19,7 +19,7 @@ #============================================================================= BEGIN { - maybe_plan(11, + maybe_plan(46, 'YAML', 'SQL::Translator::Producer::MySQL', 'Test::Differences', @@ -67,6 +67,10 @@ mysql_charset: utf8 mysql_collate: utf8_general_ci order: 3 + some_flag: + name: some_flag + data_type: boolean + order: 4 constraints: - type: UNIQUE fields: @@ -109,7 +113,7 @@ EOSCHEMA -my @stmts = ( +my @stmts_pristine = ( "SET foreign_key_checks=0;\n\n", "DROP TABLE IF EXISTS `thing`;\n", @@ -118,6 +122,7 @@ `name` varchar(32), `swedish_name` varchar(32) CHARACTER SET swe7, `description` text CHARACTER SET utf8 COLLATE utf8_general_ci, + `some_flag` boolean, PRIMARY KEY (`id`), UNIQUE `idx_unique_name` (`name`) ) Type=InnoDB DEFAULT CHARACTER SET latin1 COLLATE latin1_danish_ci;\n\n", @@ -136,55 +141,82 @@ "SET foreign_key_checks=1;\n\n" + ); + +my @stmts_no_drop_pristine = grep {$_ !~ /^DROP TABLE/} @stmts_pristine; +my $mysql_out_pristine = join("", @stmts_no_drop_pristine); + +# check translation with several mysql server versions +my %server_versions = ( + 0 => [ sub { $_[0] =~ s/ boolean/ enum('0','1')/g } ], + 3.23 => [ sub { $_[0] =~ s/ boolean/ tinyint/g } ], + 4.0 => [ sub { $_[0] =~ s/ boolean/ tinyint/g } ], + 4.1 => [], + 5.0 => [], + 5.1 => [], ); -my @stmts_no_drop = grep {$_ !~ /^DROP TABLE/} @stmts; - -my $mysql_out = join("", @stmts_no_drop); - - +foreach my $server_version (sort keys %server_versions) { + my @stmts = @stmts_pristine; + my @stmts_no_drop = @stmts_no_drop_pristine; + my $mysql_out = $mysql_out_pristine; + + my $version_tweaks = $server_versions{$server_version}; + foreach my $tweak (@$version_tweaks) { + $tweak->($mysql_out); + foreach my $stmt (@stmts, @stmts_no_drop) { + $tweak->($stmt); + } + } + my $sqlt; $sqlt = SQL::Translator->new( show_warnings => 1, no_comments => 1, -# debug => 1, + # debug => 1, from => "YAML", to => "MySQL", quote_table_names => 1, - quote_field_names => 1 + quote_field_names => 1, + producer_args => { + mysql_server_version => $server_version, + }, ); - + my $out = $sqlt->translate(\$yaml_in) or die "Translate error:".$sqlt->error; ok $out ne "", "Produced something!"; - eq_or_diff $out, $mysql_out, "Scalar output looks right with quoting"; - + eq_or_diff $out, $mysql_out, "Scalar output looks right with quoting ($server_version)"; + my @out = $sqlt->translate(\$yaml_in) or die "Translat eerror:".$sqlt->error; - is_deeply \@out, \@stmts_no_drop, "Array output looks right with quoting"; - - + is_deeply \@out, \@stmts_no_drop, "Array output looks right with quoting ($server_version)"; + + @{$sqlt}{qw/quote_table_names quote_field_names/} = (0,0); $out = $sqlt->translate(\$yaml_in) or die "Translat eerror:".$sqlt->error; - + @out = $sqlt->translate(\$yaml_in) or die "Translat eerror:".$sqlt->error; $mysql_out =~ s/`//g; my @unquoted_stmts = map { s/`//g; $_} @stmts_no_drop; - eq_or_diff $out, $mysql_out, "Output looks right without quoting"; - is_deeply \@out, \@unquoted_stmts, "Array output looks right without quoting"; - + eq_or_diff $out, $mysql_out, "Output looks right without quoting ($server_version)"; + is_deeply \@out, \@unquoted_stmts, "Array output looks right without quoting ($server_version)"; + @{$sqlt}{qw/add_drop_table quote_field_names quote_table_names/} = (1,1,1); @out = $sqlt->translate(\$yaml_in) or die "Translat eerror:".$sqlt->error; $out = $sqlt->translate(\$yaml_in) or die "Translat eerror:".$sqlt->error; - - eq_or_diff $out, join("", @stmts), "Output looks right with DROP TABLEs"; - is_deeply \@out, \@stmts, "Array output looks right with DROP TABLEs"; + + eq_or_diff $out, join("", @stmts), "Output looks right with DROP TABLEs ($server_version)"; + is_deeply \@out, \@stmts, "Array output looks right with DROP TABLEs ($server_version)"; } + +} # ends main test + ############################################################################### # New alter/add subs Index: lib/SQL/Translator/Producer/MySQL.pm =================================================================== --- lib/SQL/Translator/Producer/MySQL.pm (revision 1327) +++ lib/SQL/Translator/Producer/MySQL.pm (working copy) @@ -86,6 +86,12 @@ Set the fields charater set and collation order. +=item args.mysql_server_version + +Specifies which version of MySQL server we are targetting. + +Use a value like 4.0, 4.1, 5.0 or 5.1. + =back =cut @@ -136,6 +142,8 @@ my $add_drop_table = $translator->add_drop_table; my $schema = $translator->schema; my $show_warnings = $translator->show_warnings || 0; + my $producer_args = $translator->producer_args; + my $server_version = $producer_args->{mysql_server_version}; my ($qt, $qf) = ('',''); $qt = '`' if $translator->quote_table_names; @@ -172,7 +180,8 @@ show_warnings => $show_warnings, no_comments => $no_comments, quote_table_names => $qt, - quote_field_names => $qf + quote_field_names => $qf, + server_version => $server_version, }); } @@ -283,6 +292,7 @@ my ($field, $options) = @_; my $qf = $options->{quote_field_names} ||= ''; + my $server_version = $options->{server_version}; my $field_name = $field->name; debug("PKG: Looking at field '$field_name'\n"); @@ -326,10 +336,16 @@ elsif ( $data_type =~ /char/i && ! $size[0] ) { @size = (255); } - elsif ( $data_type =~ /boolean/i ) { + elsif ( $data_type =~ /boolean/i && !$server_version) { + # Compatible output to versions of Producer::MySQL <= 1.54 $data_type = 'enum'; $commalist = "'0','1'"; } + elsif ( $data_type =~ /boolean/i && $server_version && $server_version < 4.1) { + # Boolean was introduced in mysql 4.1.0 so use tinyint if + # target is older + $data_type = 'tinyint'; + } elsif ( exists $translate{ lc $data_type } ) { $data_type = $translate{ lc $data_type }; } Index: bin/sqlt =================================================================== --- bin/sqlt (revision 1327) +++ bin/sqlt (working copy) @@ -116,6 +116,10 @@ --package Base package name for Class::DBI modules. + MySQL Parser Options: + + --mysql-server-version=value Version of MySQL server (eg. 4.1 or 5.0) + =head1 DESCRIPTION This script is part of the SQL Fairy project. It will try to convert @@ -184,6 +188,7 @@ my $producer_dsn; # db_user " my $add_truncate; my $mysql_parser_version; # MySQL parser arg for /*! comments +my $mysql_server_version; GetOptions( 'add-drop-table' => \$add_drop_table, @@ -226,6 +231,7 @@ 'use-same-auth' => \$use_same_auth, 'version' => \$show_version, 'mysql-parser-version=i' => \$mysql_parser_version, + 'mysql-server-version=f' => \$mysql_server_version, ) or pod2usage(2); if ($use_same_auth) { @@ -272,24 +278,25 @@ mysql_parser_version => $mysql_parser_version, }, producer_args => { - imap_file => $imap_file, - imap_url => $imap_url, - pretty => $pretty, - ttfile => $template, - tt_vars => \%tt_vars, - tt_conf => \%tt_conf, - title => $title, - dsn => $producer_dsn, - db_user => $producer_db_user, - db_password => $producer_db_password, - skip => $skip, - skiplike => $skiplike, - add_truncate => $add_truncate, - add_prefix => $add_prefix, - prefix => $prefix, - indent => $indent, - newlines => $newlines, - package_name => $package_name, + imap_file => $imap_file, + imap_url => $imap_url, + pretty => $pretty, + ttfile => $template, + tt_vars => \%tt_vars, + tt_conf => \%tt_conf, + title => $title, + dsn => $producer_dsn, + db_user => $producer_db_user, + db_password => $producer_db_password, + skip => $skip, + skiplike => $skiplike, + add_truncate => $add_truncate, + add_prefix => $add_prefix, + prefix => $prefix, + indent => $indent, + newlines => $newlines, + package_name => $package_name, + mysql_server_version => $mysql_server_version, }, );