mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2025-12-30 16:12:39 -06:00
Code Issues Packages Projects Releases 114 Wiki Activity

Fixed dolt diff table for schemas

Browse Source
This commit is contained in:
Zach Musgrave
2024-05-23 17:30:30 -07:00
parent 57398ec3de
commit e9955aba03
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/libraries/doltcore/sqle/database.go
View File

@@ -1607,7 +1607,7 @@ func (db Database) doltSchemaTableHash(ctx *sql.Context) (hash.Hash, error) {
return hash.Hash{}, err
}
tableHash, _, err := root.GetTableHash(ctx, doltdb.SchemasTableName)
tableHash, _, err := root.GetTableHash(ctx, doltdb.TableName{Name: doltdb.SchemasTableName})
return tableHash, err
}

7
go/libraries/doltcore/sqle/dolt_log_table_function.go
View File

@@ -808,18 +808,19 @@ func shouldDecorateWithRefs(decoration string) bool {
// didTableChangeBetweenRootValues checks if the given table changed between the two given root values.
func didTableChangeBetweenRootValues(ctx *sql.Context, child, parent0, parent1 doltdb.RootValue, tableName string) (bool, error) {
childHash, childOk, err := child.GetTableHash(ctx, tableName)
// TODO: schema
childHash, childOk, err := child.GetTableHash(ctx, doltdb.TableName{Name: tableName})
if err != nil {
return false, err
}
parent0Hash, parent0Ok, err := parent0.GetTableHash(ctx, tableName)
parent0Hash, parent0Ok, err := parent0.GetTableHash(ctx, doltdb.TableName{Name: tableName})
if err != nil {
return false, err
}
var parent1Hash hash.Hash
var parent1Ok bool
if parent1 != nil {
parent1Hash, parent1Ok, err = parent1.GetTableHash(ctx, tableName)
parent1Hash, parent1Ok, err = parent1.GetTableHash(ctx, doltdb.TableName{Name: tableName})
if err != nil {
return false, err
}