loader: fixup importing tables with dash #14

Author: bohutang

src/common/dumper_test.go

@@ -85,7 +85,7 @@ func TestDumper(t *testing.T) {
 		Rows: [][]sqltypes.Value{
 			{
 				sqltypes.MakeTrusted(querypb.Type_VARCHAR, []byte("t1")),
-				sqltypes.MakeTrusted(querypb.Type_VARCHAR, []byte("CREATE TABLE `t1` (`a` int(11) DEFAULT NULL,`b` varchar(100) DEFAULT NULL) ENGINE=InnoDB")),
+				sqltypes.MakeTrusted(querypb.Type_VARCHAR, []byte("CREATE TABLE `t1-05-11` (`a` int(11) DEFAULT NULL,`b` varchar(100) DEFAULT NULL) ENGINE=InnoDB")),
 			},
 		}}
 
@@ -98,10 +98,10 @@ func TestDumper(t *testing.T) {
 		},
 		Rows: [][]sqltypes.Value{
 			{
-				sqltypes.MakeTrusted(querypb.Type_VARCHAR, []byte("t1")),
+				sqltypes.MakeTrusted(querypb.Type_VARCHAR, []byte("t1-05-11")),
 			},
 			{
-				sqltypes.MakeTrusted(querypb.Type_VARCHAR, []byte("t2")),
+				sqltypes.MakeTrusted(querypb.Type_VARCHAR, []byte("t2-05-11")),
 			},
 		}}
 
@@ -137,7 +137,7 @@ func TestDumper(t *testing.T) {
 	{
 		Dumper(log, args)
 	}
-	dat, err := ioutil.ReadFile(args.Outdir + "/test.t1.00001.sql")
+	dat, err := ioutil.ReadFile(args.Outdir + "/test.t1-05-11.00001.sql")
 	assert.Nil(t, err)
 	want := strings.Contains(string(dat), `(11,"11\"xx\"","",NULL,210.01,NULL)`)
 	assert.True(t, want)

src/common/loader.go

@@ -83,6 +83,8 @@ func restoreTableSchema(log *xlog.Log, overwrite bool, tables []string, conn *Co
 		base := filepath.Base(table)
 		name := strings.TrimSuffix(base, schemaSuffix)
 		db := strings.Split(name, ".")[0]
+		tbl := strings.Split(name, ".")[1]
+		name = fmt.Sprintf("`%v`.`%v`", db, tbl)
 
 		log.Info("working.table[%s]", name)
 

src/common/loader_test.go

@@ -29,7 +29,7 @@ func TestLoader(t *testing.T) {
 	// fakedbs.
 	{
 		fakedbs.AddQuery("create database if not exists `test`", &sqltypes.Result{})
-		fakedbs.AddQuery("create table `t1` (`a` int(11) default null,`b` varchar(100) default null) engine=innodb", &sqltypes.Result{})
+		fakedbs.AddQuery("create table `t1-05-11` (`a` int(11) default null,`b` varchar(100) default null) engine=innodb", &sqltypes.Result{})
 		fakedbs.AddQueryPattern("use .*", &sqltypes.Result{})
 		fakedbs.AddQueryPattern("insert into .*", &sqltypes.Result{})
 		fakedbs.AddQueryPattern("drop table .*", &sqltypes.Result{})