Merge pull request #2836 from dolthub/fulghum/backup_restore_testing

Author: fulghum

core/override_functions.go

@@ -108,6 +108,21 @@ func rootValueWalkAddrs(sm types.SerialMessage, cb func(addr hash.Hash) error) e
 			return err
 		}
 	}
+	// Walk all Doltgres root object fields (sequences, types, functions, procedures, triggers, extensions, casts).
+	// Each field stores a 20-byte hash pointing to a prolly address map in the chunk store. Without walking these,
+	// backup/restore (SyncRoots/PullChunks) will not copy the root object chunks and they will be absent after restore.
+	for _, ros := range storage.RootObjectSerializations {
+		addrBytes := ros.Bytes(&msg)
+		if len(addrBytes) == 0 {
+			continue
+		}
+		objAddr := hash.New(addrBytes)
+		if !objAddr.IsEmpty() {
+			if err = cb(objAddr); err != nil {
+				return err
+			}
+		}
+	}
 	return nil
 }
 

testing/go/auth_test.go

@@ -1153,6 +1153,14 @@ func TestAuthTests(t *testing.T) {
 // Each time a new Dolt procedure is introduced in a ScriptTest, it's grouped into a set of related procedures. Each set
 // is separated by a new line.
 func TestAuthDoltProcedures(t *testing.T) {
+	tempDir, err := os.MkdirTemp("", t.Name())
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { _ = os.RemoveAll(tempDir) })
+	authTestFireUrl := func(path string) string {
+		return "file://" + filepath.ToSlash(filepath.Join(tempDir, path))
+	}
 	RunScripts(t, []ScriptTest{
 		{
 			UseLocalFileSystem: true,
@@ -1395,6 +1403,11 @@ func TestAuthDoltProcedures(t *testing.T) {
 				authTestSkipAsSuper("select dolt_count_commits('--from=main', '--to=test');", []sql.Row{{"{0}"}}, ""),
 
 				authTestAssertAsSuper("select dolt_backup('remove', 'bak1');", []sql.Row{{"{0}"}}, ""),
+				authTestAssertAsSuper(fmt.Sprintf("select dolt_backup('add', 'bak2', '%s');", authTestFireUrl("bak2")), []sql.Row{{"{0}"}}, ""),
+				authTestAssertAsSuper("select dolt_backup('sync', 'bak2');", []sql.Row{{"{0}"}}, ""),
+				authTestAssertAsSuper(fmt.Sprintf("select dolt_backup('restore', '%s', 'restored_db');", authTestFireUrl("bak2")), []sql.Row{{"{0}"}}, ""),
+				authTestAssertAsSuper("drop database restored_db;", []sql.Row{}, ""),
+				authTestAssertAsSuper("select dolt_backup('remove', 'bak2');", []sql.Row{{"{0}"}}, ""),
 				authTestAssertAsSuper(fmt.Sprintf("select dolt_remote('add', 'origin', '%s');", authTestFireUrl("bak1")), []sql.Row{{"{0}"}}, ""),
 
 				authTestAssertAsSuper("select dolt_fetch('origin', 'main');", []sql.Row{{"{0}"}}, ""),
@@ -1504,6 +1517,8 @@ func TestAuthDoltProcedures(t *testing.T) {
 				authTestSkipAssertAsBasic("select dolt_count_commits('--from=main', '--to=test');", []sql.Row{{"{0}"}}, ""),
 
 				authTestAssertAsBasic("select dolt_backup('remove', 'bak1');", nil, functions.ErrDoltProcedurePermissionDenied.Error()),
+				authTestAssertAsBasic("select dolt_backup('sync', 'bak1');", nil, functions.ErrDoltProcedurePermissionDenied.Error()),
+				authTestAssertAsBasic(fmt.Sprintf("select dolt_backup('restore', '%s', 'restored_db');", authTestFireUrl("bak1")), nil, functions.ErrDoltProcedurePermissionDenied.Error()),
 				authTestAssertAsBasic(fmt.Sprintf("select dolt_remote('add', 'origin', '%s');", authTestFireUrl("bak1")), nil, functions.ErrDoltProcedurePermissionDenied.Error()),
 
 				authTestAssertAsBasic("select dolt_fetch('origin', 'main');", nil, functions.ErrDoltProcedurePermissionDenied.Error()),
@@ -1605,9 +1620,3 @@ func authTestGrantBasic(object string, privileges ...string) ScriptTestAssertion
 		Expected: []sql.Row{},
 	}
 }
-
-// authTestFireUrl returns a file:// URL path for a temp file.
-func authTestFireUrl(path string) string {
-	path = filepath.Join(os.TempDir(), path)
-	return "file://" + filepath.ToSlash(filepath.Clean(path))
-}