mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-10 10:30:57 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

more test fixing

Browse Source
This commit is contained in:
Tim Sehn
2025-06-25 12:06:39 -07:00
parent ebaa769f95
commit 9fa5513d23
2 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
go/libraries/doltcore/sqle/integration_test/dolt_schemas_history_diff_test.go
View File

@@ -351,16 +351,16 @@ type doltProceduresTableTest struct {
var setupDoltProceduresDiffCommon = []testCommand{
// Start with a clean state
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE original_proc(x INT) BEGIN SELECT x * 2 as result; END"}},
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE helper_proc() BEGIN SELECT 'helper' as message; END"}},
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE original_proc(x INT) SELECT x * 2 as result"}},
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE helper_proc() SELECT 'helper' as message"}},
{cmd.AddCmd{}, args{"."}},
{cmd.CommitCmd{}, args{"-m", "base commit with original procedures"}},
// Make changes for diff (working directory changes)
{cmd.SqlCmd{}, args{"-q", "DROP PROCEDURE original_proc"}},
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE original_proc(x INT, y INT) BEGIN SELECT x + y as sum; END"}}, // modified
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE new_proc(name VARCHAR(50)) BEGIN SELECT CONCAT('Hello, ', name) as greeting; END"}}, // added
{cmd.SqlCmd{}, args{"-q", "DROP PROCEDURE helper_proc"}}, // removed
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE original_proc(x INT, y INT) SELECT x + y as sum"}}, // modified
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE new_proc(name VARCHAR(50)) SELECT CONCAT('Hello, ', name) as greeting"}}, // added
{cmd.SqlCmd{}, args{"-q", "DROP PROCEDURE helper_proc"}}, // removed
}
func doltProceduresDiffTableTests() []doltProceduresTableTest {

45
integration-tests/bats/system-tables.bats
View File

@@ -910,14 +910,9 @@ SQL
}
@test "system-tables: query dolt_diff_dolt_procedures system table" {
# dolt_diff_dolt_procedures starts empty
run dolt sql -q 'SELECT COUNT(*) FROM dolt_diff_dolt_procedures'
[ "$status" -eq 0 ]
[[ "$output" =~ " 0 " ]] || false
# Set up test data for diff scenarios
dolt sql -q "CREATE PROCEDURE original_proc(x INT) BEGIN SELECT x * 2 as result; END"
dolt sql -q "CREATE PROCEDURE helper_proc() BEGIN SELECT 'helper' as message; END"
# Set up test data for diff scenarios (diff table doesn't exist until there are procedures)
dolt sql -q "CREATE PROCEDURE original_proc(x INT) SELECT x * 2 as result"
dolt sql -q "CREATE PROCEDURE helper_proc() SELECT 'helper' as message"
# Before we commit our procedure changes we should see two new rows in the
# diff table where to_commit='WORKING'
@@ -935,28 +930,28 @@ SQL
# Make changes for diff (working directory changes)
dolt sql -q "DROP PROCEDURE original_proc"
dolt sql -q "CREATE PROCEDURE original_proc(x INT, y INT) BEGIN SELECT x + y as sum; END" # modified
dolt sql -q "CREATE PROCEDURE new_proc(name VARCHAR(50)) BEGIN SELECT CONCAT('Hello, ', name) as greeting; END" # added
dolt sql -q "CREATE PROCEDURE original_proc(x INT, y INT) SELECT x + y as sum" # modified
dolt sql -q "CREATE PROCEDURE new_proc(name VARCHAR(50)) SELECT CONCAT('Hello, ', name) as greeting" # added
dolt sql -q "DROP PROCEDURE helper_proc" # removed
# Test that the table exists and has correct schema
run dolt sql -r csv -q 'DESCRIBE dolt_diff_dolt_procedures'
[ "$status" -eq 0 ]
[[ "$output" =~ "to_name,varchar(64)" ]] || false
[[ "$output" =~ "to_create_stmt,varchar(4096)" ]] || false
[[ "$output" =~ "to_created_at,timestamp" ]] || false
[[ "$output" =~ "to_modified_at,timestamp" ]] || false
[[ "$output" =~ "to_sql_mode,varchar(256)" ]] || false
[[ "$output" =~ "to_commit,varchar(1023)" ]] || false
[[ "$output" =~ "to_commit_date,datetime(6)" ]] || false
[[ "$output" =~ "from_name,varchar(64)" ]] || false
[[ "$output" =~ "from_create_stmt,varchar(4096)" ]] || false
[[ "$output" =~ "from_created_at,timestamp" ]] || false
[[ "$output" =~ "from_modified_at,timestamp" ]] || false
[[ "$output" =~ "from_sql_mode,varchar(256)" ]] || false
[[ "$output" =~ "from_commit,varchar(1023)" ]] || false
[[ "$output" =~ "from_commit_date,datetime(6)" ]] || false
[[ "$output" =~ "diff_type,varchar(1023)" ]] || false
[[ "$output" =~ "to_name,varchar" ]] || false
[[ "$output" =~ "to_create_stmt,varchar" ]] || false
[[ "$output" =~ "to_created_at," ]] || false
[[ "$output" =~ "to_modified_at," ]] || false
[[ "$output" =~ "to_sql_mode,varchar" ]] || false
[[ "$output" =~ "to_commit,varchar" ]] || false
[[ "$output" =~ "to_commit_date,datetime" ]] || false
[[ "$output" =~ "from_name,varchar" ]] || false
[[ "$output" =~ "from_create_stmt,varchar" ]] || false
[[ "$output" =~ "from_created_at," ]] || false
[[ "$output" =~ "from_modified_at," ]] || false
[[ "$output" =~ "from_sql_mode,varchar" ]] || false
[[ "$output" =~ "from_commit,varchar" ]] || false
[[ "$output" =~ "from_commit_date,datetime" ]] || false
[[ "$output" =~ "diff_type,varchar" ]] || false
# Test that we have procedure diffs for the complete history including working changes
run dolt sql -q 'SELECT COUNT(*) FROM dolt_diff_dolt_procedures'