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

Fixed tests

Browse Source
This commit is contained in:
Tim Sehn
2025-06-25 11:58:38 -07:00
parent 62fa01efc0
commit f1f63d679e
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
go/libraries/doltcore/sqle/integration_test/dolt_procedures_history_test.go
View File

@@ -56,23 +56,23 @@ var (
var setupDoltProceduresCommon = []testCommand{
// Create initial procedure
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE test_proc1() BEGIN SELECT 1; END"}},
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE test_proc1() SELECT 1"}},
{cmd.AddCmd{}, args{"."}},
{cmd.CommitCmd{}, args{"-m", "first commit: added test_proc1"}},
// Create a second procedure
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE test_proc2(IN x INT) BEGIN SELECT x * 2; END"}},
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE test_proc2(x INT) SELECT x * 2"}},
{cmd.AddCmd{}, args{"."}},
{cmd.CommitCmd{}, args{"-m", "second commit: added test_proc2"}},
// Modify the first procedure
{cmd.SqlCmd{}, args{"-q", "DROP PROCEDURE test_proc1"}},
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE test_proc1() BEGIN SELECT 'modified'; END"}},
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE test_proc1() SELECT 'modified'"}},
{cmd.AddCmd{}, args{"."}},
{cmd.CommitCmd{}, args{"-m", "third commit: modified test_proc1"}},
// Add a third procedure
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE test_proc3(OUT result VARCHAR(50)) BEGIN SET result = 'hello world'; END"}},
{cmd.SqlCmd{}, args{"-q", "CREATE PROCEDURE test_proc3() SELECT 'hello world' as result"}},
{cmd.AddCmd{}, args{"."}},
{cmd.CommitCmd{}, args{"-m", "fourth commit: added test_proc3"}},
@@ -92,7 +92,7 @@ func doltProceduresHistoryTableTests() []doltProceduresTableTest {
name: "check correct number of history entries",
query: "SELECT COUNT(*) FROM dolt_history_dolt_procedures",
rows: []sql.Row{
{int64(9)}, // test_proc1(4 commits) + test_proc2(3 commits) + test_proc3(1 commit) = 8 total
{int64(8)}, // test_proc1(3 commits) + test_proc2(3 commits) + test_proc3(1 commit) + initial(1 commit) = 8 total
},
},
{
@@ -120,7 +120,7 @@ func doltProceduresHistoryTableTests() []doltProceduresTableTest {
name: "check commit_hash is not null",
query: "SELECT COUNT(*) FROM dolt_history_dolt_procedures WHERE commit_hash IS NOT NULL",
rows: []sql.Row{
{int64(9)}, // Total number of procedure entries across all commits
{int64(8)}, // Total number of procedure entries across all commits
},
},
{
@@ -136,21 +136,21 @@ func doltProceduresHistoryTableTests() []doltProceduresTableTest {
name: "check committer column exists",
query: "SELECT COUNT(*) FROM dolt_history_dolt_procedures WHERE committer IS NOT NULL",
rows: []sql.Row{
{int64(9)}, // All entries should have committer info
{int64(8)}, // All entries should have committer info
},
},
{
name: "verify create_stmt column contains procedure definitions",
query: "SELECT COUNT(*) FROM dolt_history_dolt_procedures WHERE create_stmt LIKE '%PROCEDURE%'",
rows: []sql.Row{
{int64(9)}, // All entries should have CREATE PROCEDURE in create_stmt
{int64(8)}, // All entries should have CREATE PROCEDURE in create_stmt
},
},
{
name: "check created_at and modified_at are not null",
query: "SELECT COUNT(*) FROM dolt_history_dolt_procedures WHERE created_at IS NOT NULL AND modified_at IS NOT NULL",
rows: []sql.Row{
{int64(9)}, // All entries should have timestamp info
{int64(8)}, // All entries should have timestamp info
},
},
}

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

@@ -911,29 +911,29 @@ SQL
@test "system-tables: query dolt_history_dolt_procedures system table" {
# Set up test data with procedures across multiple commits
dolt sql -q "CREATE PROCEDURE test_proc1(x INT) BEGIN SELECT x * 2 as result; END"
dolt sql -q "CREATE PROCEDURE test_proc1(x INT) SELECT x * 2 as result"
dolt add .
dolt commit -m "add first procedure"
dolt sql -q "CREATE PROCEDURE test_proc2(name VARCHAR(50)) BEGIN SELECT CONCAT('Hello, ', name) as greeting; END"
dolt sql -q "CREATE PROCEDURE test_proc2(name VARCHAR(50)) SELECT CONCAT('Hello, ', name) as greeting"
dolt add .
dolt commit -m "add second procedure"
dolt sql -q "DROP PROCEDURE test_proc1"
dolt sql -q "CREATE PROCEDURE test_proc1(x INT, y INT) BEGIN SELECT x + y as sum; END" # modified
dolt sql -q "CREATE PROCEDURE test_proc1(x INT, y INT) SELECT x + y as sum" # modified
dolt add .
dolt commit -m "modify first procedure"
# Test that the table exists and has correct schema
run dolt sql -r csv -q 'DESCRIBE dolt_history_dolt_procedures'
[ "$status" -eq 0 ]
[[ "$output" =~ "name,varchar(64)" ]] || false
[[ "$output" =~ "create_stmt,varchar(4096)" ]] || false
[[ "$output" =~ "created_at,timestamp" ]] || false
[[ "$output" =~ "modified_at,timestamp" ]] || false
[[ "$output" =~ "sql_mode,varchar(256)" ]] || false
[[ "$output" =~ "name,varchar" ]] || false
[[ "$output" =~ "create_stmt,varchar" ]] || false
[[ "$output" =~ "created_at,datetime" ]] || false
[[ "$output" =~ "modified_at,datetime" ]] || false
[[ "$output" =~ "sql_mode,varchar" ]] || false
[[ "$output" =~ "commit_hash,char(32)" ]] || false
[[ "$output" =~ "committer,varchar(1024)" ]] || false
[[ "$output" =~ "committer,varchar" ]] || false
[[ "$output" =~ "commit_date,datetime" ]] || false
# Test that we have procedure history across commits