percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 05:00:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #102 from dankinon/2.2

Browse Source 
add enum column type to is_char check so that values are properly quoted
This commit is contained in:
Carlos Salguero
2016-07-12 17:49:28 -03:00
committed by GitHub
parent 051ee74f24 0053d01aed
commit c9e506da47
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/pt-table-sync
View File

@@ -3537,7 +3537,7 @@ sub make_UPDATE {
my $types = $self->{tbl_struct}->{type_for}; my $types = $self->{tbl_struct}->{type_for};
return "UPDATE $self->{dst_db_tbl} SET " return "UPDATE $self->{dst_db_tbl} SET "
. join(', ', map { . join(', ', map {
my $is_char = ($types->{$_} || '') =~ m/char|text/i; my $is_char = ($types->{$_} || '') =~ m/char|text|enum/i;
my $is_float = ($types->{$_} || '') =~ m/float|double/i; my $is_float = ($types->{$_} || '') =~ m/float|double/i;
$self->{Quoter}->quote($_) $self->{Quoter}->quote($_)
. '=' . '='
@@ -3586,7 +3586,7 @@ sub make_row {
. ') VALUES (' . ') VALUES ('
. join(', ', . join(', ',
map { map {
my $is_char = ($type_for->{$_} || '') =~ m/char|text/i; my $is_char = ($type_for->{$_} || '') =~ m/char|text|enum/i;
my $is_float = ($type_for->{$_} || '') =~ m/float|double/i; my $is_float = ($type_for->{$_} || '') =~ m/float|double/i;
$q->quote_val( $q->quote_val(
$row->{$_}, $row->{$_},
@@ -3602,7 +3602,7 @@ sub make_where_clause {
my @clauses = map { my @clauses = map {
my $val = $row->{$_}; my $val = $row->{$_};
my $sep = defined $val ? '=' : ' IS '; my $sep = defined $val ? '=' : ' IS ';
my $is_char = ($self->{tbl_struct}->{type_for}->{$_} || '') =~ m/char|text/i; my $is_char = ($self->{tbl_struct}->{type_for}->{$_} || '') =~ m/char|text|enum/i;
my $is_float = ($self->{tbl_struct}->{type_for}->{$_} || '') =~ m/float|double/i; my $is_float = ($self->{tbl_struct}->{type_for}->{$_} || '') =~ m/float|double/i;
$self->{Quoter}->quote($_) . $sep . $self->{Quoter}->quote_val($val, $self->{Quoter}->quote($_) . $sep . $self->{Quoter}->quote_val($val,
is_char => $is_char, is_char => $is_char,

2
lib/ChangeHandler.pm
View File

@@ -326,7 +326,7 @@ sub make_UPDATE {
my $types = $self->{tbl_struct}->{type_for}; my $types = $self->{tbl_struct}->{type_for};
return "UPDATE $self->{dst_db_tbl} SET " return "UPDATE $self->{dst_db_tbl} SET "
. join(', ', map { . join(', ', map {
my $is_char = ($types->{$_} || '') =~ m/char|text/i; my $is_char = ($types->{$_} || '') =~ m/char|text|enum/i;
my $is_float = ($types->{$_} || '') =~ m/float|double/i; my $is_float = ($types->{$_} || '') =~ m/float|double/i;
$self->{Quoter}->quote($_) $self->{Quoter}->quote($_)
. '=' . '='