Merge pull request #8540 from dolthub/liuliu/pass-databaseName-to-DoltDBFromCS

liuliu/pass-databaseName-to-DoltDBFromCS

Author: liuliu-dev

go/libraries/doltcore/doltdb/doltdb.go

@@ -89,12 +89,12 @@ type DoltDB struct {
 }
 
 // DoltDBFromCS creates a DoltDB from a noms chunks.ChunkStore
-func DoltDBFromCS(cs chunks.ChunkStore) *DoltDB {
+func DoltDBFromCS(cs chunks.ChunkStore, databaseName string) *DoltDB {
 	vrw := types.NewValueStore(cs)
 	ns := tree.NewNodeStore(cs)
 	db := datas.NewTypesDatabase(vrw, ns)
 
-	return &DoltDB{db: hooksDatabase{Database: db}, vrw: vrw, ns: ns}
+	return &DoltDB{db: hooksDatabase{Database: db}, vrw: vrw, ns: ns, databaseName: databaseName}
 }
 
 // HackDatasDatabaseFromDoltDB unwraps a DoltDB to a datas.Database.

go/libraries/doltcore/env/memory.go

@@ -52,7 +52,7 @@ func NewMemoryDbData(ctx context.Context, cfg config.ReadableConfig) (DbData, er
 func NewMemoryDoltDB(ctx context.Context, initBranch string) (*doltdb.DoltDB, error) {
 	ts := &chunks.TestStorage{}
 	cs := ts.NewViewWithDefaultFormat()
-	ddb := doltdb.DoltDBFromCS(cs)
+	ddb := doltdb.DoltDBFromCS(cs, "")
 
 	m := "memory"
 	branchRef := ref.NewBranchRef(initBranch)

go/libraries/doltcore/migrate/integration_test.go

@@ -253,5 +253,5 @@ func initTestMigrationDB(ctx context.Context) (*doltdb.DoltDB, error) {
 	if err != nil {
 		return nil, err
 	}
-	return doltdb.DoltDBFromCS(cs), nil
+	return doltdb.DoltDBFromCS(cs, ""), nil
 }