allow options to be handled

[dbsrgits/SQL-Translator-2.0-ish.git] / lib / SQL / Translator / Parser / DDL / MySQL.pm

diff --git a/lib/SQL/Translator/Parser/DDL/MySQL.pm b/lib/SQL/Translator/Parser/DDL/MySQL.pm
index dd00aae..1ec752a 100644 (file)
--- a/lib/SQL/Translator/Parser/DDL/MySQL.pm
+++ b/lib/SQL/Translator/Parser/DDL/MySQL.pm
@@ -30,17 +30,17 @@ role SQL::Translator::Parser::DDL::MySQL {
                 "instance: Bad grammar");
         }
 
-#    my $parser_version = parse_mysql_version(
-#        $translator->parser_args->{mysql_parser_version}, 'mysql'
-#    ) || DEFAULT_PARSER_VERSION;
-        my $parser_version = 30000;
+        my $translator = $self->translator;
+
+        my $parser_version = $translator->has_parser_args
+                             ? $translator->engine_version($translator->parser_args->{mysql_parser_version}, 'mysql') || DEFAULT_PARSER_VERSION
+                             : DEFAULT_PARSER_VERSION;
     
         while ($data =~ s#/\*!(\d{5})?(.*?)\*/#($1 && $1 > $parser_version ? '' : $2)#es) { }
 
         my $result = $parser->startrule($data);
         die "Parse failed" unless defined $result;
     
-        my $translator = $self->translator;
         my $schema = $translator->schema;
         $schema->name($result->{'database_name'}) if $result->{'database_name'};
     
@@ -107,25 +107,25 @@ role SQL::Translator::Parser::DDL::MySQL {
             }
             
     
-#            if ( my @options = @{ $tdata->{'table_options'} || [] } ) {
-#                my @cleaned_options;
-#                my @ignore_opts = $self->parser_args->{'ignore_opts'}
-#                    ? split( /,/, $self->parser_args->{'ignore_opts'} )
-#                    : ();
-#                if (@ignore_opts) {
-#                    my $ignores = { map { $_ => 1 } @ignore_opts };
-#                    foreach my $option (@options) {
-#                        # make sure the option isn't in ignore list
-#                        my ($option_key) = keys %$option;
-#                        if ( !exists $ignores->{$option_key} ) {
-#                            push @cleaned_options, $option;
-#                        }
-#                    }
-#                } else {
-#                    @cleaned_options = @options;
-#                }
-#                $table->options( \@cleaned_options ) or die $table->error;
-#            }
+            if ( my @options = @{ $tdata->{'table_options'} || [] } ) {
+                my @cleaned_options;
+                my @ignore_opts = $translator->has_parser_args && $translator->parser_args->{'ignore_opts'}
+                    ? split( /,/, $translator->parser_args->{'ignore_opts'} )
+                    : ();
+                if (@ignore_opts) {
+                    my $ignores = { map { $_ => 1 } @ignore_opts };
+                    foreach my $option (@options) {
+                        # make sure the option isn't in ignore list
+                        my ($option_key) = keys %$option;
+                        if ( !exists $ignores->{$option_key} ) {
+                            push @cleaned_options, $option;
+                        }
+                    }
+                } else {
+                    @cleaned_options = @options;
+                }
+                $table->options( \@cleaned_options ); # or die $table->error;
+            }
     
             for my $cdata ( @{ $tdata->{constraints} || [] } ) {
                 my $constraint;