Merge pull request #904 from planetscale/mcrauwel/fix-dump-from-replica

writing dump files with @replica naming will make the dump not-importable.

Author: mcrauwel

internal/dumper/dumper.go

@@ -311,7 +311,7 @@ func (d *Dumper) dumpTable(conn *Connection, database string, table string, useR
 
 		if (chunkbytes / 1024 / 1024) >= d.cfg.ChunksizeInMB {
 			query := strings.Join(inserts, ";\n") + ";\n"
-			file := fmt.Sprintf("%s/%s.%s.%05d.sql", d.cfg.Outdir, databaseHandle, table, fileNo)
+			file := fmt.Sprintf("%s/%s.%s.%05d.sql", d.cfg.Outdir, database, table, fileNo)
 			err = writeFile(file, query)
 			if err != nil {
 				return err

internal/dumper/dumper_test.go

@@ -311,7 +311,7 @@ func TestDumperUseUseReplica(t *testing.T) {
 	err = d.Run(context.Background())
 	c.Assert(err, qt.IsNil)
 
-	dat, err := os.ReadFile(cfg.Outdir + "/test@replica.t1-05-11.00001.sql")
+	dat, err := os.ReadFile(cfg.Outdir + "/test.t1-05-11.00001.sql")
 	c.Assert(err, qt.IsNil)
 
 	want := strings.Contains(string(dat), `(11,"11\"xx\"","",NULL,210.01,NULL)`)
@@ -826,13 +826,13 @@ func TestDumperAllUseReplica(t *testing.T) {
 	err = d.Run(context.Background())
 	c.Assert(err, qt.IsNil)
 
-	dat_test1, err_test1 := os.ReadFile(cfg.Outdir + "/test1@replica.t1-05-11.00001.sql")
+	dat_test1, err_test1 := os.ReadFile(cfg.Outdir + "/test1.t1-05-11.00001.sql")
 	c.Assert(err_test1, qt.IsNil)
 
 	want_test1 := strings.Contains(string(dat_test1), `(11,"11\"xx\"","",NULL,210.01,NULL)`)
 	c.Assert(want_test1, qt.IsTrue)
 
-	dat_test2, err_test2 := os.ReadFile(cfg.Outdir + "/test2@replica.t1-05-11.00001.sql")
+	dat_test2, err_test2 := os.ReadFile(cfg.Outdir + "/test2.t1-05-11.00001.sql")
 	c.Assert(err_test2, qt.IsNil)
 
 	want_test2 := strings.Contains(string(dat_test2), `(1337)`)
@@ -1203,13 +1203,13 @@ func TestDumperMultipleUseReplica(t *testing.T) {
 	err = d.Run(context.Background())
 	c.Assert(err, qt.IsNil)
 
-	dat_test1, err_test1 := os.ReadFile(cfg.Outdir + "/test1@replica.t1-05-11.00001.sql")
+	dat_test1, err_test1 := os.ReadFile(cfg.Outdir + "/test1.t1-05-11.00001.sql")
 	c.Assert(err_test1, qt.IsNil)
 
 	want_test1 := strings.Contains(string(dat_test1), `(11,"11\"xx\"","",NULL,210.01,NULL)`)
 	c.Assert(want_test1, qt.IsTrue)
 
-	dat_test2, err_test2 := os.ReadFile(cfg.Outdir + "/test2@replica.t1-05-11.00001.sql")
+	dat_test2, err_test2 := os.ReadFile(cfg.Outdir + "/test2.t1-05-11.00001.sql")
 	c.Assert(err_test2, qt.IsNil)
 
 	want_test2 := strings.Contains(string(dat_test2), `(1337)`)