From 8b05b9aa9467a67be9ecc9aa875e13bb596003c7 Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Wed, 5 Feb 2025 17:24:26 -0800 Subject: [PATCH 1/2] Correctly skip skipped assertions in transaction tests --- enginetest/evaluation.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/enginetest/evaluation.go b/enginetest/evaluation.go index 719ee0abe3..f32baa859a 100644 --- a/enginetest/evaluation.go +++ b/enginetest/evaluation.go @@ -300,6 +300,10 @@ func TestTransactionScriptWithEngine(t *testing.T, e QueryEngine, harness Harnes if sh, ok := harness.(SkippingHarness); ok && sh.SkipQueryTest(assertion.Query) { t.Skip() } + + if assertion.Skip { + t.Skip() + } if assertion.ExpectedErr != nil { AssertErrWithCtx(t, e, harness, clientSession, assertion.Query, assertion.Bindings, assertion.ExpectedErr) From cad92ace74d97f8eb6b905053ca363d0fc5fd35a Mon Sep 17 00:00:00 2001 From: zachmu Date: Thu, 6 Feb 2025 01:26:39 +0000 Subject: [PATCH 2/2] [ga-format-pr] Run ./format_repo.sh to fix formatting --- enginetest/evaluation.go | 2 +- sql/analyzer/rule_ids.go | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/enginetest/evaluation.go b/enginetest/evaluation.go index f32baa859a..4b8ae12dfc 100644 --- a/enginetest/evaluation.go +++ b/enginetest/evaluation.go @@ -300,7 +300,7 @@ func TestTransactionScriptWithEngine(t *testing.T, e QueryEngine, harness Harnes if sh, ok := harness.(SkippingHarness); ok && sh.SkipQueryTest(assertion.Query) { t.Skip() } - + if assertion.Skip { t.Skip() } diff --git a/sql/analyzer/rule_ids.go b/sql/analyzer/rule_ids.go index 1aaa06e936..1d20e7498b 100644 --- a/sql/analyzer/rule_ids.go +++ b/sql/analyzer/rule_ids.go @@ -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