Skip to content
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

Correctly skip skipped assertions in transaction tests #2844

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Correctly skip skipped assertions in transaction tests #2844

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
8b05b9a
Correctly skip skipped assertions in transaction tests
zachmu Feb 6, 2025
cad92ac
[ga-format-pr] Run ./format_repo.sh to fix formatting
zachmu Feb 6, 2025
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
4 changes: 4 additions & 0 deletions enginetest/evaluation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,10 @@ func TestTransactionScriptWithEngine(t *testing.T, e QueryEngine, harness Harnes
t.Skip()
}

if assertion.Skip {
t.Skip()
}

if assertion.ExpectedErr != nil {
AssertErrWithCtx(t, e, harness, clientSession, assertion.Query, assertion.Bindings, assertion.ExpectedErr)
} else if assertion.ExpectedErrStr != "" {
Expand Down
38 changes: 19 additions & 19 deletions sql/analyzer/rule_ids.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ type RuleId int

const (
// once before
applyDefaultSelectLimitId RuleId = iota // applyDefaultSelectLimit
validateOffsetAndLimitId // validateOffsetAndLimit
validateStarExpressionsId // validateStarExpressions
ValidateCreateTableId // validateCreateTable
validateAlterTableId // validateAlterTable
validateExprSemId // validateExprSem
loadStoredProceduresId // loadStoredProcedures
validateDropTablesId // validateDropTables
resolveDropConstraintId // resolveDropConstraint
validateDropConstraintId // validateDropConstraint
resolveCreateSelectId // resolveCreateSelect
resolveSubqueriesId // resolveSubqueries
resolveUnionsId // resolveUnions
ValidateColumnDefaultsId // validateColumnDefaults
validateCreateTriggerId // validateCreateTrigger
validateReadOnlyDatabaseId // validateReadOnlyDatabase
validateReadOnlyTransactionId // validateReadOnlyTransaction
validateDatabaseSetId // validateDatabaseSet
validatePrivilegesId // validatePrivileges
applyDefaultSelectLimitId RuleId = iota // applyDefaultSelectLimit
validateOffsetAndLimitId // validateOffsetAndLimit
validateStarExpressionsId // validateStarExpressions
ValidateCreateTableId // validateCreateTable
validateAlterTableId // validateAlterTable
validateExprSemId // validateExprSem
loadStoredProceduresId // loadStoredProcedures
validateDropTablesId // validateDropTables
resolveDropConstraintId // resolveDropConstraint
validateDropConstraintId // validateDropConstraint
resolveCreateSelectId // resolveCreateSelect
resolveSubqueriesId // resolveSubqueries
resolveUnionsId // resolveUnions
ValidateColumnDefaultsId // validateColumnDefaults
validateCreateTriggerId // validateCreateTrigger
validateReadOnlyDatabaseId // validateReadOnlyDatabase
validateReadOnlyTransactionId // validateReadOnlyTransaction
validateDatabaseSetId // validateDatabaseSet
validatePrivilegesId // validatePrivileges

// default
flattenTableAliasesId // flattenTableAliases
Expand Down
Loading