fix: Now run definers cleanup once after combining files. ✨

Closes #7

cmd/dump.go

@@ -48,7 +48,7 @@ to quickly create a Cobra application.`,
 			return
 		}
 		fmt.Printf(
-			"%s combining dump files\n\r",
+			"%s Combining files\n\r",
 			style.Success(icon.Info),
 		)
 
@@ -65,13 +65,17 @@ to quickly create a Cobra application.`,
 			return
 		}
 		fmt.Printf(
-			"%s Completer combining dump files\n\r",
+			"%s Completed combining files\n\r",
 			style.Success(icon.Check),
 		)
 		fmt.Printf(
 			"%s Zipping file\n\r",
 			style.Success(icon.Info),
 		)
+
+		// Strip definers from the Dumpfile
+		myDump.RemoveDefiners(filename)
+
 		filename, _ = dump.ZipFile(filename)
 		timeElapsed := time.Since(start)
 		fmt.Printf(

internal/dump/dump.go

@@ -96,13 +96,22 @@ func WithPassword(password string) Option {
 	}
 }
 func (c *Client) Dump() error {
+
 	// Construct schema output
 	fmt.Printf("%s Dumping schema %s from %s\n\r",
 		style.Success(icon.Info),
-		lipgloss.NewStyle().Foreground(color.Purple).Render(c.hostname),
 		lipgloss.NewStyle().Foreground(color.Yellow).Render(fmt.Sprint(c.databaseName)),
+		lipgloss.NewStyle().Foreground(color.Purple).Render(c.hostname),
 	)
 
+	f, _ := os.OpenFile(filepath.Join(c.storagePath, c.databaseName+"-keys.sql"), os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
+
+	_, err := f.WriteString("SET FOREIGN_KEY_CHECKS=0;\n")
+	if err != nil {
+		return err
+	}
+	f.Close()
+
 	response, err := exec.Command(c.executable,
 		"--host="+c.hostname,
 		"--port="+strconv.Itoa(c.port),
@@ -111,6 +120,7 @@ func (c *Client) Dump() error {
 		"--no-create-db",
 		"--no-data",
 		"--skip-triggers",
+		"--compact",
 		"--result-file", filepath.Join(c.storagePath, c.databaseName+"-schema.sql"),
 		c.databaseName).CombinedOutput()
 	if err != nil {
@@ -121,20 +131,19 @@ func (c *Client) Dump() error {
 		)
 		return err
 	}
-	removeDefiners(filepath.Join(c.storagePath, c.databaseName+"-schema.sql"))
 
 	fmt.Printf(
 		"%s Done dumping schema %s from %s\n\r",
 		style.Success(icon.Check),
-		lipgloss.NewStyle().Foreground(color.Purple).Render(c.hostname),
 		lipgloss.NewStyle().Foreground(color.Yellow).Render(fmt.Sprint(c.databaseName)),
+		lipgloss.NewStyle().Foreground(color.Purple).Render(c.hostname),
 	)
 	// Construct data output
 
 	fmt.Printf("%s Dumping data %s from %s\n\r",
 		style.Success(icon.Info),
-		lipgloss.NewStyle().Foreground(color.Purple).Render(c.hostname),
 		lipgloss.NewStyle().Foreground(color.Yellow).Render(fmt.Sprint(c.databaseName)),
+		lipgloss.NewStyle().Foreground(color.Purple).Render(c.hostname),
 	)
 
 	_ = exec.Command(c.executable,
@@ -145,21 +154,22 @@ func (c *Client) Dump() error {
 		"--no-create-db",
 		"--no-create-info",
 		"--skip-triggers",
+		"--compact",
 		"--result-file", filepath.Join(c.storagePath, c.databaseName+"-data.sql"),
 		c.databaseName).Run()
-	removeDefiners(filepath.Join(c.storagePath, c.databaseName+"-data.sql"))
+
 	fmt.Printf(
 		"%s Done dumping data %s from %s\n\r",
 		style.Success(icon.Check),
-		lipgloss.NewStyle().Foreground(color.Purple).Render(c.hostname),
 		lipgloss.NewStyle().Foreground(color.Yellow).Render(fmt.Sprint(c.databaseName)),
+		lipgloss.NewStyle().Foreground(color.Purple).Render(c.hostname),
 	)
 
 	// Construct routines/triggers output
 	fmt.Printf("%s Dumping routines %s from %s\n\r",
 		style.Success(icon.Info),
-		lipgloss.NewStyle().Foreground(color.Purple).Render(c.hostname),
 		lipgloss.NewStyle().Foreground(color.Yellow).Render(fmt.Sprint(c.databaseName)),
+		lipgloss.NewStyle().Foreground(color.Purple).Render(c.hostname),
 	)
 
 	_ = exec.Command(c.executable,
@@ -172,9 +182,10 @@ func (c *Client) Dump() error {
 		"--no-data",
 		"--triggers",
 		"--routines",
+		"--compact",
 		"--result-file", filepath.Join(c.storagePath, c.databaseName+"-routines.sql"),
 		c.databaseName).Run()
-	removeDefiners(filepath.Join(c.storagePath, c.databaseName+"-routines.sql"))
+
 	fmt.Printf(
 		"%s Done dumping routines %s from %s\n\r",
 		style.Success(icon.Check),
@@ -185,15 +196,9 @@ func (c *Client) Dump() error {
 	return nil
 }
 
-func removeDefiners(filename string) {
-	// Regex 1: .*(DEFINER=[a-zA-Z0-9\x60%@]+).* (Used by procedures/funcs)
-	// Regex 2: .*(\/\*\!50003.*!50003+).* (Used by triggers)
-	// Regex 3: (\/\*\!50013.*DEFINER \*\/) (Used in schema)
-	// TODO: Add routine body to strip definers.
-	expressions := make([]string, 3)
-	expressions[0] = `s/(^.*)(.DEFINER=[a-zA-Z0-9\x60%@]+)(.*)/$1$3/g`
-	expressions[1] = `s/(.*)(\/\*\!50003.*!50003+)(.*)/$1$3/g`
-	expressions[2] = `s/(\/\*\!50013.*DEFINER \*\/)//g`
+func (c *Client) RemoveDefiners(filename string) {
+	expressions := make([]string, 1)
+	expressions[0] = `s/DEFINER=[^ ]* / /g`
 
 	if !strings.Contains(filename, "data") {
 		for _, re := range expressions {
@@ -221,10 +226,11 @@ func removeDefiners(filename string) {
 }
 
 func (c *Client) Combine() (string, error) {
-	var files [3]string
-	files[0] = "schema"
-	files[1] = "data"
-	files[2] = "routines"
+	var files [4]string
+	files[0] = "keys"
+	files[1] = "schema"
+	files[2] = "data"
+	files[3] = "routines"
 
 	filepath.Join(c.storagePath, c.databaseName+"-backup.sql")
 	err := concatenate.FilesToFile(filepath.Join(c.storagePath, c.databaseName+"-backup.sql"),
@@ -233,6 +239,7 @@ func (c *Client) Combine() (string, error) {
 		filepath.Join(c.storagePath, c.databaseName+"-"+files[0]+".sql"),
 		filepath.Join(c.storagePath, c.databaseName+"-"+files[1]+".sql"),
 		filepath.Join(c.storagePath, c.databaseName+"-"+files[2]+".sql"),
+		filepath.Join(c.storagePath, c.databaseName+"-"+files[3]+".sql"),
 	)
 	if err != nil {
 		return "", err
@@ -248,37 +255,46 @@ func (c *Client) Combine() (string, error) {
 }
 
 func ZipFile(filename string) (string, error) {
-	fmt.Println("creating zip archive")
 	//Create a new zip archive and named archive.zip
 	archive, err := os.Create(util.FileNameWithoutExt(filename) + ".zip")
+
 	if err != nil {
 		panic(err)
 		// this is to catch errors if any
 	}
 	defer archive.Close()
-	fmt.Println("archive file created successfully....")
+	_, file := filepath.Split(filename)
 
 	//Create a new zip writer
 	zipWriter := zip.NewWriter(archive)
-	fmt.Println("opening .sql file")
+	fmt.Printf(
+		"%s Opening .sql file\n\r",
+		style.Success(icon.Info),
+	)
 
 	f1, err := os.Open(filename)
 	if err != nil {
 		panic(err)
 	}
 	defer f1.Close()
-	fmt.Println("adding file to archive..")
-	w1, err := zipWriter.Create(filename)
+	fmt.Printf(
+		"%s Adding file to archive\n\r",
+		style.Success(icon.Info),
+	)
+	w1, err := zipWriter.Create(file)
 	if err != nil {
 		panic(err)
 	}
 	if _, err := io.Copy(w1, f1); err != nil {
 		panic(err)
 	}
-	fmt.Println("closing archive")
+	fmt.Printf(
+		"%s Closing archive\n\r",
+		style.Success(icon.Info),
+	)
 	zipWriter.Close()
 	f1.Close()
-	_ = os.Remove(filename)
+	os.Remove(filename)
 
 	return util.FileNameWithoutExt(filename) + ".zip", nil
 }

justfile

@@ -8,11 +8,11 @@ install:
 
 build:
     @echo -n "Building app ... "
-    @go build {{flags}} -o bin/ && echo "OK" || echo "FAILED"
+    @go build {{flags}} -o bin/gosqldump ./main.go && echo "OK" || echo "FAILED"
 
 build-win:
     @echo -n "Building app for windows ... "
-    @GOOS=windows GOARCH=amd64 go build {{flags}} -o bin/ && echo "OK" || echo "FAILED"
+    @GOOS=windows GOARCH=amd64 go build {{flags}} -o bin/gosqldump.exe ./main.go && echo "OK" || echo "FAILED"
 update:
     go get -u
     go mod tidy -v