From e9955aba03208f5c141c5bb0708d8769f0eaf30b Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Thu, 23 May 2024 17:30:30 -0700 Subject: [PATCH] Fixed dolt diff table for schemas --- go/libraries/doltcore/sqle/database.go | 2 +- go/libraries/doltcore/sqle/dolt_log_table_function.go | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go/libraries/doltcore/sqle/database.go b/go/libraries/doltcore/sqle/database.go index 0efc0ced2d..64e9f5f51b 100644 --- a/go/libraries/doltcore/sqle/database.go +++ b/go/libraries/doltcore/sqle/database.go @@ -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 } diff --git a/go/libraries/doltcore/sqle/dolt_log_table_function.go b/go/libraries/doltcore/sqle/dolt_log_table_function.go index 21014d37fb..4107bca274 100644 --- a/go/libraries/doltcore/sqle/dolt_log_table_function.go +++ b/go/libraries/doltcore/sqle/dolt_log_table_function.go @@ -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 }