Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mysql-parser: Set missing field's collate to table's collate #172

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

mysql-parser: Set missing field's collate to table's collate #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 35 additions & 21 deletions lib/SQL/Translator/Parser/MySQL.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,9 +952,38 @@ sub parse {
my $tdata = $result->{tables}{$table_name};
my $table = $schema->add_table(name => $tdata->{'table_name'},)
or die $schema->error;
my $table_collate = undef;

$table->comments($tdata->{'comments'});

if (my @options = @{ $tdata->{'table_options'} || [] }) {
my @cleaned_options;
my @ignore_opts
= $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;
}
foreach my $option (@cleaned_options) {
my ($option_key) = keys %$option;
if ($option_key eq 'COLLATE') {
$table_collate = $option->{$option_key}
}
}
$table->options(\@cleaned_options) or die $table->error;
}

my @fields = sort { $tdata->{'fields'}->{$a}->{'order'} <=> $tdata->{'fields'}->{$b}->{'order'} }
keys %{ $tdata->{'fields'} };

Expand All @@ -979,6 +1008,12 @@ sub parse {
}
}

# Set missing column's collate to the table's collate
if (!defined($field->extra('collate')) &&
defined($table_collate)) {
$field->extra('collate', $table_collate);
}

if ($fdata->{'has_index'}) {
$table->add_index(
name => '',
Expand Down Expand Up @@ -1011,27 +1046,6 @@ sub parse {
) or die $table->error;
}

if (my @options = @{ $tdata->{'table_options'} || [] }) {
my @cleaned_options;
my @ignore_opts
= $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 = $table->add_constraint(
Expand Down