Merge cockroachdb#108203 cockroachdb#108280

108203: sql: use PG error code for txn errors r=rafiss a=rafiss

Epic: None
Release note: None

108280: sql: skip TestSQLStatsRegions test r=koorosh a=koorosh

Skip test due to increased failures after
recent fixes.

Release note: None

Epic: None

Co-authored-by: Rafi Shamim <[email protected]>
Co-authored-by: Andrii Vorobiov <[email protected]>

Author: 3 people

pkg/ccl/testccl/sqlstatsccl/sql_stats_test.go

@@ -39,6 +39,7 @@ func TestSQLStatsRegions(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.WithIssue(t, 107582, "flaky test")
 	skip.UnderRace(t, "test is to slow for race")
 	skip.UnderStress(t, "test is too heavy to run under stress")
 

pkg/sql/exec_util.go

@@ -739,8 +739,8 @@ var overrideAlterPrimaryRegionInSuperRegion = settings.RegisterBoolSetting(
 	false,
 ).WithPublic()
 
-var errNoTransactionInProgress = errors.New("there is no transaction in progress")
-var errTransactionInProgress = errors.New("there is already a transaction in progress")
+var errNoTransactionInProgress = pgerror.New(pgcode.NoActiveSQLTransaction, "there is no transaction in progress")
+var errTransactionInProgress = pgerror.New(pgcode.ActiveSQLTransaction, "there is already a transaction in progress")
 
 const sqlTxnName string = "sql txn"
 const metricsSampleInterval = 10 * time.Second

pkg/sql/logictest/testdata/logic_test/txn

@@ -142,7 +142,7 @@ x y
 statement ok
 BEGIN TRANSACTION
 
-statement error there is already a transaction in progress
+statement error pgcode 25001 there is already a transaction in progress
 BEGIN TRANSACTION
 
 statement ok
@@ -156,10 +156,10 @@ BEGIN TRANSACTION
 statement ok
 UPDATE kv SET v = 'b' WHERE k in ('a')
 
-statement error there is already a transaction in progress
+statement error pgcode 25001 there is already a transaction in progress
 BEGIN TRANSACTION
 
-statement error current transaction is aborted, commands ignored until end of transaction block
+statement error pgcode 25P02 current transaction is aborted, commands ignored until end of transaction block
 SELECT * FROM kv
 
 statement ok
@@ -176,15 +176,15 @@ BEGIN; END
 
 # COMMIT/ROLLBACK without a transaction are errors.
 
-statement error there is no transaction in progress
+statement error pgcode 25P01 there is no transaction in progress
 COMMIT TRANSACTION
 
-statement error there is no transaction in progress
+statement error pgcode 25P01 there is no transaction in progress
 ROLLBACK TRANSACTION
 
 # Set isolation level without a transaction is an error.
 
-statement error there is no transaction in progress
+statement error pgcode 25P01 there is no transaction in progress
 SET TRANSACTION ISOLATION LEVEL SNAPSHOT
 
 statement ok
@@ -393,7 +393,7 @@ COMMIT
 
 # User priority.
 
-statement error there is no transaction in progress
+statement error pgcode 25P01 there is no transaction in progress
 SET TRANSACTION PRIORITY LOW
 
 statement ok

pkg/sql/pgwire/testdata/pgtest/implicit_txn

@@ -59,7 +59,7 @@ ErrorResponse
 ReadyForQuery
 ----
 {"Type":"BindComplete"}
-{"Type":"ErrorResponse","Code":"XXUUU"}
+{"Type":"ErrorResponse","Code":"25001"}
 {"Type":"ReadyForQuery","TxStatus":"E"}
 
 send