percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-04-16 01:00:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set sql_mode='' before SHOW CREATE TABLE--don't bother with replacing certain values. Move and rewrite tests to ansi_quotes.t.

Browse Source
This commit is contained in:
Daniel Nichter
2012-11-01 11:31:31 -06:00
parent 2bcc380c68
commit 949cf31037
6 changed files with 149 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/pt-online-schema-change
View File

@@ -2712,20 +2712,15 @@ sub get_create_table {
die "I need a tbl parameter" unless $tbl; die "I need a tbl parameter" unless $tbl;
my $q = $self->{Quoter}; my $q = $self->{Quoter};
my $replace = q{@@SQL_MODE};
for my $mode ( qw(ANSI_QUOTES ANSI DB2 MAXDB MSSQL ORACLE POSTGRESQL) ) {
$replace = "REPLACE($replace, '$mode', '')"
}
$replace = qq{REPLACE($replace, ',,', ',')};
my $new_sql_mode my $new_sql_mode
= '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, ' = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
. '@@SQL_MODE := ' . $replace . ', ' . q{@@SQL_MODE := '', }
. '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, ' . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
. '@@SQL_QUOTE_SHOW_CREATE := 1 */'; . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, ' my $old_sql_mode
. '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */'; = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
. q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
PTDEBUG && _d($new_sql_mode); PTDEBUG && _d($new_sql_mode);
eval { $dbh->do($new_sql_mode); }; eval { $dbh->do($new_sql_mode); };

30
lib/TableParser.pm
View File

@@ -56,25 +56,21 @@ sub get_create_table {
my $q = $self->{Quoter}; my $q = $self->{Quoter};
# To ensure a consistent output, we save the current (old) SQL mode, # To ensure a consistent output, we save the current (old) SQL mode,
# then set it to the new SQL mode that what we need. When done, even # then set it to the new SQL mode that what we need, which is the
# if an error occurs, we restore the old SQL mode. # default sql_mode=''. When done, even if an error occurs, we restore
# the old SQL mode. The main thing is that we do not want ANSI_QUOTES
# We don't want ANSI_QUOTES on here, nor any of the modes that # because there's code all throughout the tools that expect backtick `
# implicitly turn that on. # quoted idents, not double-quote " quoted idents. For example:
my $replace = q{@@SQL_MODE}; # https://bugs.launchpad.net/percona-toolkit/+bug/1058285
# The others automatically turn on ANSI_QUOTES
for my $mode ( qw(ANSI_QUOTES ANSI DB2 MAXDB MSSQL ORACLE POSTGRESQL) ) {
$replace = "REPLACE($replace, '$mode', '')"
}
$replace = qq{REPLACE($replace, ',,', ',')};
my $new_sql_mode my $new_sql_mode
= '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, ' = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
. '@@SQL_MODE := ' . $replace . ', ' . q{@@SQL_MODE := '', }
. '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, ' . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
. '@@SQL_QUOTE_SHOW_CREATE := 1 */'; . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, ' my $old_sql_mode
. '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */'; = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
. q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
# Set new SQL mode. # Set new SQL mode.
PTDEBUG && _d($new_sql_mode); PTDEBUG && _d($new_sql_mode);

96
t/pt-online-schema-change/ansi_quotes.t Normal file
View File

@@ -0,0 +1,96 @@
#!/usr/bin/env perl
BEGIN {
die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
};
use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use Test::More;
use Data::Dumper;
use PerconaTest;
use Sandbox;
require "$trunk/bin/pt-online-schema-change";
diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
diag(`MODE_ANSI=1 $trunk/sandbox/start-sandbox master 12348 >/dev/null`);
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $dbh = $sb->get_dbh_for('master1');
if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master 12348';
}
# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
# so we need to specify --lock-wait-timeout=3 else the tool will die.
my $master_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox';
my @args = (qw(--lock-wait-timeout 3));
my $output;
my $exit_status;
my $sample = "t/pt-online-schema-change/samples/";
# ############################################################################
# pt-online-schema-change doesn't work with ANSI_QUOTES + some other sql_modes
# https://bugs.launchpad.net/percona-toolkit/+bug/1058285
# ############################################################################
$sb->load_file('master1', "$sample/sql-mode-bug-1058285.sql");
($output, $exit_status) = full_output(
sub { pt_online_schema_change::main(@args,
"$master_dsn,D=issue26211,t=process_model_inst",
"--alter", "ADD COLUMN foo int",
qw(--dry-run --print --alter-foreign-keys-method auto)) },
);
is(
$exit_status,
0,
"--dry-run exit 0 (bug 1058285)"
);
unlike(
$output,
qr/errno: 121/,
"No error 121 (bug 1058285)"
);
($output, $exit_status) = full_output(
sub { pt_online_schema_change::main(@args,
"$master_dsn,D=issue26211,t=process_model_inst",
"--alter", "ADD COLUMN foo int",
qw(--execute --alter-foreign-keys-method auto)) },
);
is(
$exit_status,
0,
"--execute exit 0 (bug 1058285)"
);
unlike(
$output,
qr/\QI need a max_rows argument/,
"No 'I need a max_rows' error message (bug 1073996)"
);
# ANSI_QUOTES are on, so it's "foo" not `foo`.
my $rows = $dbh->selectrow_arrayref("SHOW CREATE TABLE issue26211.process_model_inst");
like(
$rows->[1],
qr/"foo"\s+int/i,
"--alter actually worked (bug 1058285)"
);
# #############################################################################
# Done.
# #############################################################################
diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;

60
t/pt-online-schema-change/bugs.t
View File

@@ -193,69 +193,9 @@ is_deeply(
$master_dbh->do(q{DROP DATABASE IF EXISTS `bug_1041372`}); $master_dbh->do(q{DROP DATABASE IF EXISTS `bug_1041372`});
# ############################################################################
# pt-online-schema-change foreign key error
# Customer issue 26211
# ############################################################################
$sb->load_file('master', "$sample/issue-26211.sql");
my $retval;
# There's two bugs here. First, see that it lives ok:
($output, $retval) = full_output(sub { pt_online_schema_change::main(@args,
'--alter-foreign-keys-method', 'auto',
'--no-check-replication-filters',
'--alter', "ENGINE=InnoDB",
'--execute', "$master_dsn,D=bug_26211,t=prm_inst")});
is(
$retval,
0,
"Issue 26211: Lives ok"
) or diag($output);
unlike(
$output,
qr/\QI need a max_rows argument/,
"Issue 26211: No error message"
);
$sb->load_file('master', "$sample/issue-26211.sql");
# And now check that it works with this SQL mode
my ($old_mode) = $master_dbh->selectrow_array('select @@sql_mode');
chomp $old_mode;
diag("Old SQL mode: $old_mode");
my $new_mode = 'NO_AUTO_VALUE_ON_ZERO,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER';
diag("New SQL mode: $new_mode");
$master_dbh->do("SET GLOBAL sql_mode='$new_mode'");
# There's two bugs here. First, see that it lives ok:
($output, $retval) = full_output(sub { pt_online_schema_change::main(@args,
'--alter-foreign-keys-method', 'auto',
'--no-check-replication-filters',
'--alter', "ENGINE=InnoDB",
'--execute', "$master_dsn,D=bug_26211,t=prm_inst")});
is(
$retval,
0,
"Issue 26211 part 2: Lives ok"
);
unlike(
$output,
qr/Error/i,
"Issue 26211 part 2: No error message"
);
diag("Restoring SQL mode to $old_mode");
$master_dbh->do("set global sql_mode='$old_mode'");
$master_dbh->do(q{DROP DATABASE IF EXISTS `bug_26211`});
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
$sb->wipe_clean($master_dbh); $sb->wipe_clean($master_dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing; done_testing;

117
t/pt-online-schema-change/samples/issue-26211.sql
View File

@@ -1,117 +0,0 @@
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
DROP DATABASE IF EXISTS `bug_26211`;
CREATE DATABASE `bug_26211`;
USE `bug_26211`;
DROP TABLE IF EXISTS `mref`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `mref` (
`M_ID` decimal(10,0) NOT NULL ,
`PR_M_INST_ID` decimal(10,0) NOT NULL ,
KEY `I_M_ID` (`M_ID`),
KEY `I_PR_M_` (`PR_M_INST_ID`),
CONSTRAINT `FK_MREF_REF_PM` FOREIGN KEY (`M_ID`) REFERENCES `pm` (`M_ID`) ON DELETE CASCADE,
CONSTRAINT `FK_MREF_REF_PRMI` FOREIGN KEY (`PR_M_INST_ID`) REFERENCES `prm_inst` (`PR_M_INST_ID`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `pm`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `pm` (
`M_ID` decimal(10,0) NOT NULL ,
`P_MR_NUM` varchar(64) NOT NULL ,
`P_NUM` varchar(50) NOT NULL ,
`TYPE` varchar(50) DEFAULT NULL ,
`VERSION` decimal(10,0) NOT NULL ,
`XML` longtext NOT NULL ,
PRIMARY KEY (`M_ID`),
UNIQUE KEY `UK_PM` (`P_MR_NUM`,`P_NUM`),
KEY `I_PM_P_NUM` (`P_NUM`),
CONSTRAINT `FK_PM_REF_P` FOREIGN KEY (`P_NUM`) REFERENCES `p` (`P_NUM`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `p`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `p` (
`P_NUM` varchar(50) NOT NULL ,
`VERSION` decimal(10,0) NOT NULL ,
`TYPE` varchar(32) NOT NULL ,
`PROTECTED` decimal(1,0) NOT NULL ,
`DESCRIPTIONS` varchar(4000) DEFAULT NULL ,
PRIMARY KEY (`P_NUM`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `pr`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `pr` (
`PR_ID` decimal(10,0) NOT NULL ,
`NUM` varchar(64) NOT NULL ,
`HUB_RQD` decimal(1,0) NOT NULL ,
`TP_RQD` decimal(1,0) NOT NULL ,
`TRANS_TYPE_RQD` decimal(1,0) NOT NULL ,
`HUB_LABEL` varchar(255) DEFAULT NULL ,
`TP_LABEL` varchar(255) DEFAULT NULL ,
`TRANS_TYPE_LABEL` varchar(255) DEFAULT NULL ,
`TYPE` varchar(32) NOT NULL ,
`PR_M_FLAG` decimal(1,0) NOT NULL ,
`USER_DEFINED` decimal(1,0) NOT NULL ,
`DESCRIPTIONS` varchar(4000) DEFAULT NULL ,
`SIGNATURE` longtext ,
PRIMARY KEY (`PR_ID`),
KEY `pr_num_index` (`NUM`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `prm`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `prm` (
`PR_M_ID` decimal(10,0) NOT NULL ,
`M_ID` decimal(10,0) NOT NULL ,
`PR_ID` decimal(10,0) DEFAULT NULL ,
`ACTIVE_VERSION` decimal(10,0) DEFAULT NULL ,
`CURRENT_VERSION` decimal(10,0) DEFAULT NULL ,
`ENABLED` decimal(1,0) NOT NULL ,
`NUM` varchar(64) NOT NULL ,
PRIMARY KEY (`PR_M_ID`),
KEY `I_PRM_M_ID` (`M_ID`),
KEY `I_PRM_PR_ID` (`PR_ID`),
KEY `prm_num_indx` (`NUM`),
CONSTRAINT `FK_PMOD_REF_PR` FOREIGN KEY (`PR_ID`) REFERENCES `pr` (`PR_ID`),
CONSTRAINT `FK_PRM_REF_PM` FOREIGN KEY (`M_ID`) REFERENCES `pm` (`M_ID`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `prm_inst`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `prm_inst` (
`PR_M_INST_ID` decimal(10,0) NOT NULL,
`VERSION` decimal(10,0) NOT NULL,
`PR_M_ID` decimal(10,0) NOT NULL,
PRIMARY KEY (`PR_M_INST_ID`),
UNIQUE KEY `UK_PRM_INST` (`VERSION`,`PR_M_ID`),
KEY `I_PRM_INST_PR_MODE` (`PR_M_ID`),
CONSTRAINT `FK_PRMI_REF_PRM` FOREIGN KEY (`PR_M_ID`) REFERENCES `prm` (`PR_M_ID`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

33
t/pt-online-schema-change/samples/sql-mode-bug-1058285.sql Normal file
View File

@@ -0,0 +1,33 @@
DROP DATABASE IF EXISTS `issue26211`;
CREATE DATABASE `issue26211`;
USE `issue26211`;
CREATE TABLE `process_model` (
`PROC_MODEL_ID` decimal(10,0) NOT NULL,
`PKG_MEM_ID` decimal(10,0) NOT NULL,
`PROC_ID` decimal(10,0) DEFAULT NULL,
`ACTIVE_VERSION` decimal(10,0) DEFAULT NULL,
`CURRENT_VERSION` decimal(10,0) DEFAULT NULL,
`ENABLED` decimal(1,0) NOT NULL,
`NAME` varchar(64) NOT NULL,
`COMMENTS` varchar(4000) DEFAULT NULL,
PRIMARY KEY (`PROC_MODEL_ID`),
KEY `I_PROCESS_MODEL_PKG_MEM_ID` (`PKG_MEM_ID`),
KEY `I_PROCESS_MODEL_PROC_ID` (`PROC_ID`),
KEY `procmodel_name_indx` (`NAME`)
) ENGINE=InnoDB;
CREATE TABLE `process_model_inst` (
`PROC_MODEL_INST_ID` decimal(10,0) NOT NULL,
`VERSION` decimal(10,0) NOT NULL,
`PROC_MODEL_ID` decimal(10,0) NOT NULL,
`DATE_CREATED` datetime NOT NULL,
`CHANGE_NOTE` varchar(4000) DEFAULT NULL,
`XML` longtext NOT NULL,
`AUTHOR` varchar(50) DEFAULT NULL,
`CHECKSUM` varchar(64) DEFAULT NULL,
PRIMARY KEY (`PROC_MODEL_INST_ID`),
UNIQUE KEY `UK_PROCMODEL_INST` (`VERSION`,`PROC_MODEL_ID`),
KEY `I_PROCESS_MODEL_INST_PROC_MODE` (`PROC_MODEL_ID`),
CONSTRAINT `FK_PROCMODINST_REF_PROCMOD` FOREIGN KEY (`PROC_MODEL_ID`) REFERENCES `process_model` (`PROC_MODEL_ID`) ON DELETE CASCADE
) ENGINE=InnoDB;