From ddb1cc2f22fa985c9604469d15cce5b4ef83cdd7 Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Tue, 13 Jun 2023 15:37:28 -0700 Subject: [PATCH 1/2] Bug fix for dolt_diff in detached head state --- go/libraries/doltcore/sqle/dsess/session.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go/libraries/doltcore/sqle/dsess/session.go b/go/libraries/doltcore/sqle/dsess/session.go index 29aaa35e64..31ece1893d 100644 --- a/go/libraries/doltcore/sqle/dsess/session.go +++ b/go/libraries/doltcore/sqle/dsess/session.go @@ -821,7 +821,9 @@ func (d *DoltSession) ResolveRootForRef(ctx *sql.Context, dbName, refStr string) } headRef, err := d.CWBHeadRef(ctx, dbName) - if err != nil { + if err == doltdb.ErrOperationNotSupportedInDetachedHead { + // leave head ref nil, we may not need it (commit hash) + } else if err != nil { return nil, nil, "", err } From a752f09f75090d51f6f94389497cf951892a0a57 Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Tue, 13 Jun 2023 15:40:39 -0700 Subject: [PATCH 2/2] Fixed remaining bats tests --- integration-tests/bats/sql.bats | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-tests/bats/sql.bats b/integration-tests/bats/sql.bats index 98941edd54..41f7f8134b 100755 --- a/integration-tests/bats/sql.bats +++ b/integration-tests/bats/sql.bats @@ -2350,13 +2350,13 @@ SQL [[ "$output" =~ "name,create_stmt,created_at,modified_at" ]] || false [[ "$output" =~ 'p1,CREATE PROCEDURE p1() SELECT 5*5' ]] || false [[ "$output" =~ 'p2,CREATE PROCEDURE p2() SELECT 6*6' ]] || false - [[ "${#lines[@]}" = "4" ]] || false + run dolt sql -b -q "SET @@show_external_procedures = 0;SHOW PROCEDURE STATUS" -r=csv [ "$status" -eq "0" ] [[ "$output" =~ "Db,Name,Type,Definer,Modified,Created,Security_type,Comment,character_set_client,collation_connection,Database Collation" ]] || false [[ "$output" =~ ',p1,PROCEDURE,' ]] || false [[ "$output" =~ ',p2,PROCEDURE,' ]] || false - [[ "${#lines[@]}" = "4" ]] || false + # Drop p2 dolt sql -q "DROP PROCEDURE p2" run dolt sql -b -q "SET @@show_external_procedures = 0;SELECT * FROM dolt_procedures" -r=csv @@ -2364,17 +2364,18 @@ SQL [[ "$output" =~ "name,create_stmt,created_at,modified_at" ]] || false [[ "$output" =~ 'p1,CREATE PROCEDURE p1() SELECT 5*5' ]] || false [[ ! "$output" =~ 'p2,CREATE PROCEDURE p2() SELECT 6*6' ]] || false - [[ "${#lines[@]}" = "3" ]] || false + run dolt sql -b -q "SET @@show_external_procedures = 0;SHOW PROCEDURE STATUS" -r=csv [ "$status" -eq "0" ] [[ "$output" =~ "Db,Name,Type,Definer,Modified,Created,Security_type,Comment,character_set_client,collation_connection,Database Collation" ]] || false [[ "$output" =~ ',p1,PROCEDURE,' ]] || false [[ ! "$output" =~ ',p2,PROCEDURE,' ]] || false - [[ "${#lines[@]}" = "3" ]] || false + # Drop p2 again and error run dolt sql -q "DROP PROCEDURE p2" [ "$status" -eq "1" ] [[ "$output" =~ '"p2" does not exist' ]] || false + # Drop p1 using if exists dolt sql -q "DROP PROCEDURE IF EXISTS p1" run dolt sql -b -q "SET @@show_external_procedures = 0;SELECT * FROM dolt_procedures" -r=csv @@ -2382,13 +2383,12 @@ SQL [[ "$output" =~ "name,create_stmt,created_at,modified_at" ]] || false [[ ! "$output" =~ 'p1,CREATE PROCEDURE p1() SELECT 5*5' ]] || false [[ ! "$output" =~ 'p2,CREATE PROCEDURE p2() SELECT 6*6' ]] || false - [[ "${#lines[@]}" = "2" ]] || false + run dolt sql -b -q "SET @@show_external_procedures = 0;SHOW PROCEDURE STATUS" -r=csv [ "$status" -eq "0" ] [[ "$output" =~ "Db,Name,Type,Definer,Modified,Created,Security_type,Comment,character_set_client,collation_connection,Database Collation" ]] || false [[ ! "$output" =~ ',p1,PROCEDURE,' ]] || false [[ ! "$output" =~ ',p2,PROCEDURE,' ]] || false - [[ "${#lines[@]}" = "2" ]] || false } @test "sql: check info_schema routines and parameters tables for stored procedures" {