mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-23 13:48:42 -05:00
Code Issues Packages Projects Releases 157 Wiki Activity

Better assertions for merge calls

Browse Source
This commit is contained in:
Zach Musgrave
2023-11-10 14:56:35 -08:00
parent abb3b9ffc3
commit d7af14c4a3
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go
+8 -8
View File
@@ -4292,7 +4292,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
Assertions: []queries.ScriptTestAssertion{
{
Query: "call dolt_merge('branch1')",
SkipResultsCheck: true,
Expected: []sql.Row{{doltCommit, 0, 0}},
},
{
Query: "select * from t1 order by id",
@@ -4308,7 +4308,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
},
{
Query: "call dolt_merge('branch2')",
SkipResultsCheck: true,
Expected: []sql.Row{{doltCommit, 0, 0}},
},
{
Query: "select * from t1 order by id",
@@ -4344,7 +4344,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
Assertions: []queries.ScriptTestAssertion{
{
Query: "call dolt_merge('branch1')",
SkipResultsCheck: true,
Expected: []sql.Row{{doltCommit, 0, 0}},
},
{
Query: "select * from t1 order by id",
@@ -4359,7 +4359,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
},
{
Query: "call dolt_merge('branch2')",
SkipResultsCheck: true,
Expected: []sql.Row{{doltCommit, 0, 0}},
},
{
Query: "select * from t1 order by id",
@@ -4393,7 +4393,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
Assertions: []queries.ScriptTestAssertion{
{
Query: "call dolt_merge('branch1')",
SkipResultsCheck: true,
Expected: []sql.Row{{doltCommit, 0, 0}},
},
{
Query: "select * from t1 order by id",
@@ -4432,7 +4432,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
Assertions: []queries.ScriptTestAssertion{
{
Query: "call dolt_merge('branch1')",
SkipResultsCheck: true,
Expected: []sql.Row{{doltCommit, 0, 0}},
},
{
Query: "select * from t1 order by id",
@@ -4448,7 +4448,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
},
{
Query: "call dolt_merge('branch2')",
SkipResultsCheck: true,
Expected: []sql.Row{{doltCommit, 0, 0}},
},
{
Query: "select * from t1 order by id",
@@ -4484,7 +4484,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
Assertions: []queries.ScriptTestAssertion{
{
Query: "call dolt_merge('branch1')",
SkipResultsCheck: true,
Expected: []sql.Row{{doltCommit, 0, 0}},
},
{
Query: "select * from t1 order by id",