Skip to content

Fix the warning checks in enginetest to be more strict #2792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Fix the warning checks in enginetest to be more strict #2792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ff0c79
Fix the warning checks in enginetest to be more strict
macneale4 Dec 13, 2024
5c4a14a
Disable doltgres tests from tripping on mysql warnings
macneale4 Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion enginetest/evaluation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,15 +1042,25 @@ func AssertWarningAndTestQuery(
// check warnings depend on context, which ServerEngine does not depend on
if expectedWarningsCount > 0 {
assert.Equal(t, expectedWarningsCount, len(ctx.Warnings()))
// Verify that if warnings are expected, we also configured a specific value check.
if expectedCode == 0 && len(expectedWarningMessageSubstring) == 0 {
require.Fail("Invalid test setup. Warning expected, but no value validation was configured.")
}
} else {
if expectedCode != 0 || len(expectedWarningMessageSubstring) != 0 {
require.Fail("Invalid test setup. No warnings expected, but value validation was configured")
}
assert.Zero(t, len(ctx.Warnings()), "Unexpected warnings")
}

if expectedCode > 0 {
// Not ideal. We are only supporting all warning codes being identical in a given test.
for _, warning := range ctx.Warnings() {
assert.Equal(t, expectedCode, warning.Code, "Unexpected warning code")
}
}

if len(expectedWarningMessageSubstring) > 0 {
// Not ideal. All messages must have the same substring for a given test.
for _, warning := range ctx.Warnings() {
assert.Contains(t, warning.Message, expectedWarningMessageSubstring, "Unexpected warning message")
}
Expand Down
89 changes: 56 additions & 33 deletions enginetest/queries/insert_queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,7 +1529,8 @@ var InsertScripts = []ScriptTest{
},
},
{
Name: "Try INSERT IGNORE with primary key, non null, and single row violations",
Name: "Try INSERT IGNORE with primary key, non null, and single row violations",
Dialect: "mysql",
SetUpScript: []string{
"CREATE TABLE y (pk int primary key, c1 int NOT NULL);",
"INSERT IGNORE INTO y VALUES (1, 1), (1,2), (2, 2), (3, 3)",
Expand All @@ -1546,49 +1547,56 @@ var InsertScripts = []ScriptTest{
Expected: []sql.Row{
{types.OkResult{RowsAffected: 1}},
},
ExpectedWarning: mysql.ERDupEntry,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERDupEntry,
},
{
Query: "INSERT IGNORE INTO y VALUES (5, NULL)",
Expected: []sql.Row{
{types.OkResult{RowsAffected: 1}},
},
ExpectedWarning: mysql.ERBadNullError,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERBadNullError,
},
{
Query: "INSERT IGNORE INTO y SELECT * FROM y WHERE pk=(SELECT pk+10 FROM y WHERE pk > 1);",
Expected: []sql.Row{
{types.OkResult{RowsAffected: 0}},
},
ExpectedWarning: mysql.ERSubqueryNo1Row,
ExpectedWarningsCount: 5,
ExpectedWarning: mysql.ERSubqueryNo1Row,
},
{
Query: "INSERT IGNORE INTO y SELECT 10, 0 FROM dual WHERE 1=(SELECT 1 FROM dual UNION SELECT 2 FROM dual);",
Expected: []sql.Row{
{types.OkResult{RowsAffected: 0}},
},
ExpectedWarning: mysql.ERSubqueryNo1Row,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERSubqueryNo1Row,
},
{
Query: "INSERT IGNORE INTO y SELECT 11, 0 FROM dual WHERE 1=(SELECT 1 FROM dual UNION SELECT 2 FROM dual) UNION SELECT 12, 0 FROM dual;",
Expected: []sql.Row{
{types.OkResult{RowsAffected: 1}},
},
ExpectedWarning: mysql.ERSubqueryNo1Row,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERSubqueryNo1Row,
},
{
Query: "INSERT IGNORE INTO y SELECT 13, 0 FROM dual UNION SELECT 14, 0 FROM dual WHERE 1=(SELECT 1 FROM dual UNION SELECT 2 FROM dual);",
Expected: []sql.Row{
{types.OkResult{RowsAffected: 1}},
},
ExpectedWarning: mysql.ERSubqueryNo1Row,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERSubqueryNo1Row,
},
{
Query: "INSERT IGNORE INTO y VALUES (3, 8)",
Expected: []sql.Row{
{types.OkResult{RowsAffected: 0}},
},
ExpectedWarning: mysql.ERDupEntry,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERDupEntry,
},
},
},
Expand Down Expand Up @@ -2164,7 +2172,8 @@ var InsertScripts = []ScriptTest{
},
},
{
Name: "INSERT IGNORE works with FK Violations",
Name: "INSERT IGNORE works with FK Violations",
Dialect: "mysql",
SetUpScript: []string{
"CREATE TABLE t1 (id INT PRIMARY KEY, v int);",
"CREATE TABLE t2 (id INT PRIMARY KEY, v2 int, CONSTRAINT mfk FOREIGN KEY (v2) REFERENCES t1(id));",
Expand All @@ -2176,7 +2185,8 @@ var InsertScripts = []ScriptTest{
Expected: []sql.Row{
{types.OkResult{RowsAffected: 0}},
},
ExpectedWarning: mysql.ErNoReferencedRow2,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ErNoReferencedRow2,
},
},
},
Expand Down Expand Up @@ -2622,7 +2632,8 @@ var InsertIgnoreScripts = []ScriptTest{
Expected: []sql.Row{
{types.OkResult{RowsAffected: 1}},
},
ExpectedWarning: mysql.ERBadNullError,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERBadNullError,
},
},
},
Expand All @@ -2638,7 +2649,8 @@ var InsertIgnoreScripts = []ScriptTest{
Expected: []sql.Row{
{types.OkResult{RowsAffected: 1}},
},
ExpectedWarning: mysql.ERTruncatedWrongValueForField,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERTruncatedWrongValueForField,
},
{
Query: "SELECT * FROM t1",
Expand All @@ -2651,7 +2663,8 @@ var InsertIgnoreScripts = []ScriptTest{
Expected: []sql.Row{
{types.OkResult{RowsAffected: 1}},
},
ExpectedWarning: mysql.ERUnknownError,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERUnknownError,
},
{
Query: "SELECT * FROM t2",
Expand All @@ -2675,7 +2688,8 @@ var InsertIgnoreScripts = []ScriptTest{
Expected: []sql.Row{
{types.OkResult{RowsAffected: 2}},
},
ExpectedWarning: mysql.ERTruncatedWrongValueForField,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERTruncatedWrongValueForField,
},
{
Query: "SELECT * FROM t1",
Expand All @@ -2688,7 +2702,8 @@ var InsertIgnoreScripts = []ScriptTest{
Expected: []sql.Row{
{types.OkResult{RowsAffected: 1}},
},
ExpectedWarning: mysql.ERUnknownError,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERUnknownError,
},
{
Query: "SELECT * FROM t2",
Expand Down Expand Up @@ -2722,7 +2737,8 @@ var InsertIgnoreScripts = []ScriptTest{
Expected: []sql.Row{
{types.OkResult{RowsAffected: 3}},
},
ExpectedWarning: mysql.ERDupEntry,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERDupEntry,
},
{
Query: "SELECT * from one_uniq;",
Expand All @@ -2735,7 +2751,8 @@ var InsertIgnoreScripts = []ScriptTest{
Expected: []sql.Row{
{types.OkResult{RowsAffected: 8}},
},
ExpectedWarning: mysql.ERDupEntry,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERDupEntry,
},
{
Query: "SELECT * from two_uniq;",
Expand Down Expand Up @@ -2784,7 +2801,8 @@ var IgnoreWithDuplicateUniqueKeyKeylessScripts = []ScriptTest{
Expected: []sql.Row{
{types.OkResult{RowsAffected: 3}},
},
ExpectedWarning: mysql.ERDupEntry,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERDupEntry,
},
{
Query: "SELECT * from one_uniq;",
Expand All @@ -2797,7 +2815,8 @@ var IgnoreWithDuplicateUniqueKeyKeylessScripts = []ScriptTest{
Expected: []sql.Row{
{types.OkResult{RowsAffected: 8}},
},
ExpectedWarning: mysql.ERDupEntry,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERDupEntry,
},
{
Query: "SELECT * from two_uniq;",
Expand Down Expand Up @@ -2831,9 +2850,10 @@ var IgnoreWithDuplicateUniqueKeyKeylessScripts = []ScriptTest{
Expected: []sql.Row{{types.NewOkResult(0)}},
},
{
Query: "INSERT IGNORE INTO keyless VALUES (1, 3)",
Expected: []sql.Row{{types.NewOkResult(0)}},
ExpectedWarning: mysql.ERDupEntry,
Query: "INSERT IGNORE INTO keyless VALUES (1, 3)",
Expected: []sql.Row{{types.NewOkResult(0)}},
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERDupEntry,
},
},
},
Expand All @@ -2857,27 +2877,28 @@ var IgnoreWithDuplicateUniqueKeyKeylessScripts = []ScriptTest{
ExpectedErr: sql.ErrUniqueKeyViolation,
},
{
Query: "UPDATE IGNORE keyless SET val = 1 where pk = 1",
Expected: []sql.Row{{newUpdateResult(1, 1)}},
ExpectedWarning: mysql.ERDupEntry,
Query: "UPDATE IGNORE keyless SET val = 1 where pk = 1",
Expected: []sql.Row{{newUpdateResult(1, 1)}},
},
{
Query: "ALTER TABLE keyless ADD CONSTRAINT c UNIQUE(val)",
Expected: []sql.Row{{types.NewOkResult(0)}},
},
{
Query: "UPDATE IGNORE keyless SET val = 3 where pk = 1",
Expected: []sql.Row{{newUpdateResult(1, 0)}},
ExpectedWarning: mysql.ERDupEntry,
Query: "UPDATE IGNORE keyless SET val = 3 where pk = 1",
Expected: []sql.Row{{newUpdateResult(1, 0)}},
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERDupEntry,
},
{
Query: "SELECT * FROM keyless ORDER BY pk",
Expected: []sql.Row{{1, 1}, {2, 2}, {3, 3}},
},
{
Query: "UPDATE IGNORE keyless SET val = val + 1 ORDER BY pk",
Expected: []sql.Row{{newUpdateResult(3, 1)}},
ExpectedWarning: mysql.ERDupEntry,
Query: "UPDATE IGNORE keyless SET val = val + 1 ORDER BY pk",
Expected: []sql.Row{{newUpdateResult(3, 1)}},
ExpectedWarningsCount: 2,
ExpectedWarning: mysql.ERDupEntry,
},
{
Query: "SELECT * FROM keyless ORDER BY pk",
Expand All @@ -2890,7 +2911,8 @@ var IgnoreWithDuplicateUniqueKeyKeylessScripts = []ScriptTest{
var InsertBrokenScripts = []ScriptTest{
// TODO: Condense all of our casting logic into a single error.
{
Name: "Test that INSERT IGNORE assigns the closest dataype correctly",
Name: "Test that INSERT IGNORE assigns the closest dataype correctly",
Dialect: "mysql",
SetUpScript: []string{
"CREATE TABLE x (pk int primary key, c1 varchar(20) NOT NULL);",
`INSERT IGNORE INTO x VALUES (1, "one"), (2, TRUE), (3, "three")`,
Expand All @@ -2915,7 +2937,8 @@ var InsertBrokenScripts = []ScriptTest{
Expected: []sql.Row{
{types.OkResult{RowsAffected: 1}},
},
ExpectedWarning: mysql.ERTruncatedWrongValueForField,
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERTruncatedWrongValueForField,
},
},
},
Expand Down
56 changes: 32 additions & 24 deletions enginetest/queries/update_queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,18 +623,20 @@ var UpdateIgnoreScripts = []ScriptTest{
},
Assertions: []ScriptTestAssertion{
{
Query: "UPDATE IGNORE pkTable set pk = pk + 1, val = val + 1",
Expected: []sql.Row{{newUpdateResult(3, 1)}},
ExpectedWarning: mysql.ERDupEntry,
Query: "UPDATE IGNORE pkTable set pk = pk + 1, val = val + 1",
Expected: []sql.Row{{newUpdateResult(3, 1)}},
ExpectedWarningsCount: 2,
ExpectedWarning: mysql.ERDupEntry,
},
{
Query: "SELECT * FROM pkTable order by pk",
Expected: []sql.Row{{1, 1}, {2, 2}, {4, 4}},
},
{
Query: "UPDATE IGNORE idxTable set val = val + 1",
Expected: []sql.Row{{newUpdateResult(3, 1)}},
ExpectedWarning: mysql.ERDupEntry,
Query: "UPDATE IGNORE idxTable set val = val + 1",
Expected: []sql.Row{{newUpdateResult(3, 1)}},
ExpectedWarningsCount: 2,
ExpectedWarning: mysql.ERDupEntry,
},
{
Query: "SELECT * FROM idxTable order by pk",
Expand All @@ -649,9 +651,10 @@ var UpdateIgnoreScripts = []ScriptTest{
Expected: []sql.Row{{1, 1}, {2, 3}, {4, 4}},
},
{
Query: "UPDATE IGNORE pkTable SET pk = NULL",
Expected: []sql.Row{{newUpdateResult(3, 3)}},
ExpectedWarning: mysql.ERBadNullError,
Query: "UPDATE IGNORE pkTable SET pk = NULL",
Expected: []sql.Row{{newUpdateResult(3, 3)}},
ExpectedWarningsCount: 3,
ExpectedWarning: mysql.ERBadNullError,
},
{
Query: "SELECT * FROM pkTable order by pk",
Expand All @@ -666,9 +669,10 @@ var UpdateIgnoreScripts = []ScriptTest{
Expected: []sql.Row{{0, 0}, {0, 3}, {0, 4}},
},
{
Query: "UPDATE IGNORE idxTable set pk = pk + 1, val = val + 1", // two bad updates
Expected: []sql.Row{{newUpdateResult(3, 1)}},
ExpectedWarning: mysql.ERDupEntry,
Query: "UPDATE IGNORE idxTable set pk = pk + 1, val = val + 1", // two bad updates
Expected: []sql.Row{{newUpdateResult(3, 1)}},
ExpectedWarningsCount: 2,
ExpectedWarning: mysql.ERDupEntry,
},
{
Query: "SELECT * FROM idxTable order by pk",
Expand All @@ -684,18 +688,20 @@ var UpdateIgnoreScripts = []ScriptTest{
},
Assertions: []ScriptTestAssertion{
{
Query: "UPDATE IGNORE t1 SET v1 = 'dsddads'",
Expected: []sql.Row{{newUpdateResult(1, 1)}},
ExpectedWarning: mysql.ERTruncatedWrongValueForField,
Query: "UPDATE IGNORE t1 SET v1 = 'dsddads'",
Expected: []sql.Row{{newUpdateResult(1, 1)}},
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERTruncatedWrongValueForField,
},
{
Query: "SELECT * FROM t1",
Expected: []sql.Row{{1, 0, 1}},
},
{
Query: "UPDATE IGNORE t1 SET pk = 'dasda', v2 = 'dsddads'",
Expected: []sql.Row{{newUpdateResult(1, 1)}},
ExpectedWarning: mysql.ERTruncatedWrongValueForField,
Query: "UPDATE IGNORE t1 SET pk = 'dasda', v2 = 'dsddads'",
Expected: []sql.Row{{newUpdateResult(1, 1)}},
ExpectedWarningsCount: 2,
ExpectedWarning: mysql.ERTruncatedWrongValueForField,
},
{
Query: "SELECT * FROM t1",
Expand All @@ -713,9 +719,10 @@ var UpdateIgnoreScripts = []ScriptTest{
},
Assertions: []ScriptTestAssertion{
{
Query: "UPDATE IGNORE objects SET color = 'orange' where id = 2",
Expected: []sql.Row{{newUpdateResult(1, 0)}},
ExpectedWarning: mysql.ErNoReferencedRow2,
Query: "UPDATE IGNORE objects SET color = 'orange' where id = 2",
Expected: []sql.Row{{newUpdateResult(1, 0)}},
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ErNoReferencedRow2,
},
{
Query: "SELECT * FROM objects ORDER BY id",
Expand All @@ -732,9 +739,10 @@ var UpdateIgnoreScripts = []ScriptTest{
},
Assertions: []ScriptTestAssertion{
{
Query: "UPDATE IGNORE checksTable SET pk = pk + 1 where pk = 4",
Expected: []sql.Row{{newUpdateResult(1, 0)}},
ExpectedWarning: mysql.ERUnknownError,
Query: "UPDATE IGNORE checksTable SET pk = pk + 1 where pk = 4",
Expected: []sql.Row{{newUpdateResult(1, 0)}},
ExpectedWarningsCount: 1,
ExpectedWarning: mysql.ERUnknownError,
},
{
Query: "SELECT * from checksTable ORDER BY pk",
Expand Down
Loading