cherry pick #1142 to release-2.0 (#1151)

pingcap · Oct 13, 2020 · 9a02110 · 9a02110
1 parent d69705a
commit 9a02110
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/dumpling/dumpling.go b/dumpling/dumpling.go
@@ -59,6 +59,7 @@ func (m *Dumpling) Init(ctx context.Context) error {
 	var err error
 	m.dumpConfig, err = m.constructArgs()
 	m.detectSQLMode()
+	m.logger.Info("create dumpling", zap.Stringer("config", m.dumpConfig))
 	return err
 }
 
@@ -211,7 +212,6 @@ func (m *Dumpling) constructArgs() (*export.Config, error) {
 		return nil, err
 	}
 	dumpConfig.TableFilter = tableFilter
-	dumpConfig.EscapeBackslash = true
 	dumpConfig.CompleteInsert = true // always keep column name in `INSERT INTO` statements.
 	dumpConfig.Logger = m.logger.Logger
 
@@ -254,16 +254,15 @@ func (m *Dumpling) constructArgs() (*export.Config, error) {
 		dumpConfig.PosAfterConnect = true
 	}
 
-	m.logger.Info("create dumpling", zap.Stringer("config", dumpConfig))
-
 	if !cfg.CaseSensitive {
 		dumpConfig.TableFilter = filter.CaseInsensitive(dumpConfig.TableFilter)
 	}
 
 	return dumpConfig, nil
 }
 
-// detectSQLMode tries to detect SQL mode from upstream. If success, write it to LoaderConfig
+// detectSQLMode tries to detect SQL mode from upstream. If success, write it to LoaderConfig.
+// Because loader will use this SQL mode, we need to treat disable `EscapeBackslash` when NO_BACKSLASH_ESCAPES
 func (m *Dumpling) detectSQLMode() {
 	db, err := sql.Open("mysql", m.dumpConfig.GetDSN(""))
 	if err != nil {
@@ -277,4 +276,9 @@ func (m *Dumpling) detectSQLMode() {
 	}
 	m.logger.Info("found upstream SQL mode", zap.String("SQL mode", sqlMode))
 	m.cfg.LoaderConfig.SQLMode = sqlMode
+	if strings.Contains(sqlMode, "NO_BACKSLASH_ESCAPES") {
+		m.dumpConfig.EscapeBackslash = false
+	} else {
+		m.dumpConfig.EscapeBackslash = true
+	}
 }
diff --git a/tests/full_mode/data/db1.prepare.sql b/tests/full_mode/data/db1.prepare.sql
@@ -3,9 +3,10 @@ create database `full_mode`;
 use `full_mode`;
 create table t1 (id int, name varchar(20), primary key(`id`));
 insert into t1 (id, name) values (1, 'arya'), (2, 'catelyn');
-insert into t1 (id, name) values (3, 'Eddard Stark');
-update t1 set name = 'Arya Stark' where id = 1;
-update t1 set name = 'Catelyn Stark' where name = 'catelyn';
+insert into t1 (id, name) values (3, 'Eddard
+Stark');
+update t1 set name = 'Arya S\\\\tark' where id = 1;
+update t1 set name = 'Catelyn S\"\n\ttark' where name = 'catelyn';
 
 -- test multi column index with generated column
 alter table t1 add column info json;

diff --git a/tests/full_mode/run.sh b/tests/full_mode/run.sh
@@ -110,6 +110,8 @@ function escape_schema() {
 function run() {
     fail_acquire_global_lock
 
+    run_sql_both_source "SET @@GLOBAL.SQL_MODE='NO_BACKSLASH_ESCAPES'"
+
     run_sql_file $cur/data/db1.prepare.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1
     check_contains 'Query OK, 2 rows affected'
     run_sql_file $cur/data/db2.prepare.sql $MYSQL_HOST2 $MYSQL_PORT2 $MYSQL_PASSWORD2
@@ -148,6 +150,7 @@ function run() {
     echo "check dump files have been cleaned"
     ls $WORK_DIR/worker1/dumped_data.test && exit 1 || echo "worker1 auto removed dump files"
     ls $WORK_DIR/worker2/dumped_data.test && exit 1 || echo "worker2 auto removed dump files"
+    run_sql_both_source "SET @@GLOBAL.SQL_MODE='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'"
 }
 
 cleanup_data full_mode