From bf5af4ed79b9b5d224c430e6d7dfe3054f7fdbc7 Mon Sep 17 00:00:00 2001
From: Raphael 'kena' Poss <knz@thaumogen.net>
Date: Thu, 31 Oct 2019 14:08:32 +0100
Subject: [PATCH] sql: link to issue #42061 from the XXA00 error hint

CockroachDB currently allows an explicit BEGIN..COMMIT txn containing
DDL to fail atomicity in certain cases. These cases are detected
during COMMIT and reported to the client as error XXA00.

This patch extends the error message to link to issue #42061 which
describes and handles this situation further.

Release note (sql change): the error message generated when a
txn containing DDL is both partially committed and partially rolled back
(error XXA00) now contains a link to github issue #42061 where this
situation is discussed further.
---
 pkg/sql/conn_executor.go                      |  2 +
 .../testdata/logic_test/strict_ddl_atomicity  | 38 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 pkg/sql/logictest/testdata/logic_test/strict_ddl_atomicity

diff --git a/pkg/sql/conn_executor.go b/pkg/sql/conn_executor.go
index cb2317101387..d656f1664e4f 100644
--- a/pkg/sql/conn_executor.go
+++ b/pkg/sql/conn_executor.go
@@ -2035,6 +2035,8 @@ func (ex *connExecutor) txnStateTransitionsApplyWrapper(
 					newErr = errors.WithHint(newErr,
 						"Some of the non-DDL statements may have committed successfully, but some of the DDL statement(s) failed.\n"+
 							"Manual inspection may be required to determine the actual state of the database.")
+					newErr = errors.WithIssueLink(newErr,
+						errors.IssueLink{IssueURL: "https://github.com/cockroachdb/cockroach/issues/42061"})
 					res.SetError(newErr)
 				}
 			}
diff --git a/pkg/sql/logictest/testdata/logic_test/strict_ddl_atomicity b/pkg/sql/logictest/testdata/logic_test/strict_ddl_atomicity
new file mode 100644
index 000000000000..a4f3a9f13aea
--- /dev/null
+++ b/pkg/sql/logictest/testdata/logic_test/strict_ddl_atomicity
@@ -0,0 +1,38 @@
+# Default behavior, where atomicity violations are allowed
+
+statement ok
+CREATE TABLE testing (k int, v string);
+  INSERT INTO testing (k,v) VALUES (1, 'a'), (2, 'b'), (3, 'a'), (4, 'b');
+  CREATE TABLE unrelated(x INT)
+
+
+statement ok
+BEGIN
+
+statement ok
+ALTER TABLE testing ADD CONSTRAINT "unique_values" UNIQUE(v)
+
+statement ok
+INSERT INTO testing (k,v) VALUES (5, 'c');
+INSERT INTO unrelated(x) VALUES (1);
+
+
+statement error pgcode XXA00 violates unique constraint.*\n.*\n.*\n.*\n.*issues/42061
+COMMIT
+
+# oops!
+query IT rowsort
+SELECT * FROM testing
+----
+1  a
+2  b
+3  a
+4  b
+5  c
+
+# oops again!
+query I
+SELECT * FROM unrelated
+----
+1
+