Merge pull request #692 from ydb-platform/issues-row-col

print issue row:col

Author: asmyasnikov

internal/xerrors/issues.go

@@ -26,12 +26,24 @@ func (ii issues) String() string {
 			b.WriteByte(',')
 		}
 		b.WriteByte('{')
+		if p := m.GetPosition(); p != nil {
+			if file := p.GetFile(); file != "" {
+				b.WriteString(file)
+				b.WriteByte(':')
+			}
+			b.WriteString(strconv.Itoa(int(p.GetRow())))
+			b.WriteByte(':')
+			b.WriteString(strconv.Itoa(int(p.GetColumn())))
+			b.WriteString(" => ")
+		}
 		if code := m.GetIssueCode(); code != 0 {
 			b.WriteByte('#')
 			b.WriteString(strconv.Itoa(int(code)))
 			b.WriteByte(' ')
 		}
+		b.WriteByte('\'')
 		b.WriteString(strings.TrimSuffix(m.GetMessage(), "."))
+		b.WriteByte('\'')
 		if len(m.Issues) > 0 {
 			b.WriteByte(' ')
 			b.WriteString(issues(m.Issues).String())

internal/xerrors/operation_test.go

@@ -50,6 +50,11 @@ func Test_operationError_Error(t *testing.T) {
 				{
 					Message:   "issue one",
 					IssueCode: 1,
+					Position: &Ydb_Issue.IssueMessage_Position{
+						Row:    15,
+						Column: 3,
+						File:   "",
+					},
 				},
 				{
 					Message:   "issue two",
@@ -58,6 +63,11 @@ func Test_operationError_Error(t *testing.T) {
 						{
 							Message:   "issue three",
 							IssueCode: 3,
+							Position: &Ydb_Issue.IssueMessage_Position{
+								Row:    16,
+								Column: 4,
+								File:   "test.yql",
+							},
 						},
 						{
 							Message:   "issue four",
@@ -66,7 +76,7 @@ func Test_operationError_Error(t *testing.T) {
 					},
 				},
 			})),
-			text: "operation/PRECONDITION_FAILED (code = 400120, issues = [{#1 issue one},{#2 issue two [{#3 issue three},{#4 issue four}]}])", //nolint:lll
+			text: "operation/PRECONDITION_FAILED (code = 400120, issues = [{15:3 => #1 'issue one'},{#2 'issue two' [{test.yql:16:4 => #3 'issue three'},{#4 'issue four'}]}])", //nolint:lll
 		},
 	} {
 		t.Run("", func(t *testing.T) {

tests/integration/table_data_query_issue_row_col_test.go

@@ -0,0 +1,61 @@
+//go:build !fast
+// +build !fast
+
+package integration
+
+import (
+	"context"
+	"os"
+	"path"
+	"regexp"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ydb-platform/ydb-go-sdk/v3"
+	"github.com/ydb-platform/ydb-go-sdk/v3/sugar"
+	"github.com/ydb-platform/ydb-go-sdk/v3/table"
+	"github.com/ydb-platform/ydb-go-sdk/v3/table/options"
+	"github.com/ydb-platform/ydb-go-sdk/v3/table/types"
+)
+
+func TestDataQueryIssueRowCol(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	db, err := ydb.Open(ctx,
+		os.Getenv("YDB_CONNECTION_STRING"),
+		ydb.WithAccessTokenCredentials(os.Getenv("YDB_ACCESS_TOKEN_CREDENTIALS")),
+	)
+	require.NoError(t, err)
+	exists, err := sugar.IsTableExists(ctx, db.Scheme(), path.Join(db.Name(), "users"))
+	require.NoError(t, err)
+	if exists {
+		err = db.Table().Do(ctx, func(ctx context.Context, s table.Session) (err error) {
+			return s.DropTable(ctx, path.Join(db.Name(), "users"))
+		})
+		require.NoError(t, err)
+	}
+	err = db.Table().Do(ctx, func(ctx context.Context, s table.Session) (err error) {
+		return s.CreateTable(ctx, path.Join(db.Name(), "users"),
+			options.WithColumn("id", types.TypeUint64),
+			options.WithPrimaryKeyColumn("id"),
+		)
+	})
+	require.NoError(t, err)
+	err = db.Table().Do(ctx, func(ctx context.Context, s table.Session) (err error) {
+		_, _, err = s.Execute(ctx, table.DefaultTxControl(), `
+				UPSERT INTO "users" (id) VALUES (1);
+			`, nil,
+		)
+		return err
+	})
+	require.Error(t, err)
+	err = ydb.OperationError(err)
+	require.Error(t, err)
+	re := regexp.MustCompile(", address = [a-zA-Z0-9.:-]+,")
+	errText := re.ReplaceAllStringFunc(err.Error(), func(s string) string {
+		return ","
+	})
+	require.Equal(t, "operation/GENERIC_ERROR (code = 400080, issues = [{2:17 => 'String literal can not be used here'}])", errText) //nolint:lll
+}