fix fill decimal (#1875)

Co-authored-by: Klepov Alex <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Konstantin Prokopenko <[email protected]>

Author: 4 people

CHANGELOG.md

@@ -1,5 +1,6 @@
+* Fixed scan a column of type `Decimal(precision,scale)` into a struct field of type `types.Decimal{}` using `ScanStruct()`
+* Fixed race in integration test `TestTopicWriterLogMessagesWithoutData`
 * Fixed traces handling in `topic.Reader`
-* Fixed race in integration test `TestTopicWriterLogMessagesWithoutData` 
 
 ## v3.117.0
 * Fixed `conn/pool.Get()` behaviour for YDB databases with public IPs. Bug was introduced in v3.116.2

internal/query/scanner/struct_test.go

@@ -1,15 +1,18 @@
 package scanner
 
 import (
+	"math/big"
 	"reflect"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/decimal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/value"
 	"github.com/ydb-platform/ydb-go-sdk/v3/pkg/xtest"
+	ttypes "github.com/ydb-platform/ydb-go-sdk/v3/table/types"
 )
 
 func TestFieldName(t *testing.T) {
@@ -909,3 +912,96 @@ func TestScannerStructOrdering(t *testing.T) {
 	require.Equal(t, "B", row.B)
 	require.Equal(t, "C", row.C)
 }
+
+func TestScannerDecimal(t *testing.T) {
+	scanner := Struct(NewData(
+		[]*Ydb.Column{
+			{
+				Name: "A",
+				Type: &Ydb.Type{
+					Type: &Ydb.Type_DecimalType{
+						DecimalType: &Ydb.DecimalType{Scale: 9, Precision: 22},
+					},
+				},
+			},
+		},
+		[]*Ydb.Value{
+			{
+				Value: &Ydb.Value_Low_128{
+					Low_128: 10200000000,
+				},
+			},
+		},
+	))
+	var row struct {
+		A ttypes.Decimal
+	}
+	expected := ttypes.Decimal{Bytes: decimal.BigIntToByte(big.NewInt(10200000000), 22, 9), Precision: 22, Scale: 9}
+	err := scanner.ScanStruct(&row)
+	require.NoError(t, err)
+	require.Equal(t, expected, row.A)
+}
+
+func TestScannerDecimalNegative(t *testing.T) {
+	scanner := Struct(NewData(
+		[]*Ydb.Column{
+			{
+				Name: "A",
+				Type: &Ydb.Type{
+					Type: &Ydb.Type_DecimalType{
+						DecimalType: &Ydb.DecimalType{Scale: 9, Precision: 22},
+					},
+				},
+			},
+		},
+		[]*Ydb.Value{
+			{
+				Value: &Ydb.Value_Low_128{
+					Low_128: 18446744071704551616,
+				},
+				High_128: 0xffffffffffffffff,
+			},
+		},
+	))
+	var row struct {
+		A ttypes.Decimal
+	}
+	expected := ttypes.Decimal{Bytes: decimal.BigIntToByte(big.NewInt(-2005000000), 22, 9), Precision: 22, Scale: 9}
+	err := scanner.ScanStruct(&row)
+	require.NoError(t, err)
+	require.Equal(t, expected, row.A)
+}
+
+func TestScannerDecimalBigDecimal(t *testing.T) {
+	scanner := Struct(NewData(
+		[]*Ydb.Column{
+			{
+				Name: "A",
+				Type: &Ydb.Type{
+					Type: &Ydb.Type_DecimalType{
+						DecimalType: &Ydb.DecimalType{Scale: 9, Precision: 22},
+					},
+				},
+			},
+		},
+		[]*Ydb.Value{
+			{
+				// val: 1844674407370955.1615
+				Value: &Ydb.Value_Low_128{
+					Low_128: 3136633892082024448,
+				},
+				High_128: 5421010862427522,
+			},
+		},
+	))
+	var row struct {
+		A ttypes.Decimal
+	}
+	expectedVal := decimal.Decimal{
+		Bytes:     [16]byte{0, 19, 66, 97, 114, 199, 77, 130, 43, 135, 143, 232, 0, 0, 0, 0},
+		Precision: 22, Scale: 9,
+	}
+	err := scanner.ScanStruct(&row)
+	require.NoError(t, err)
+	require.Equal(t, expectedVal, row.A)
+}

internal/value/value.go

@@ -611,6 +611,11 @@ func (v *decimalValue) castTo(dst any) error {
 	case *driver.Value:
 		*dstValue = v
 
+		return nil
+	case *decimal.Decimal:
+		decVal := decimal.Decimal{Bytes: v.value, Precision: v.Precision(), Scale: v.Scale()}
+		*dstValue = decVal
+
 		return nil
 	default:
 		return xerrors.WithStackTrace(fmt.Errorf(

tests/integration/query_execute_test.go

@@ -9,6 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math/big"
 	"math/rand"
 	"os"
 	"path"
@@ -20,6 +21,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/decimal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/value"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/version"
 	"github.com/ydb-platform/ydb-go-sdk/v3/log"
@@ -707,3 +709,65 @@ func TestQueryWideIntervalTypes(t *testing.T) {
 		})
 	}
 }
+
+// https://github.com/ydb-platform/ydb-go-sdk/issues/1785
+func TestIssue1785FillDecimalFields(t *testing.T) {
+	ctx, cancel := context.WithCancel(xtest.Context(t))
+	defer cancel()
+	db, err := ydb.Open(ctx,
+		os.Getenv("YDB_CONNECTION_STRING"),
+		ydb.WithAccessTokenCredentials(os.Getenv("YDB_ACCESS_TOKEN_CREDENTIALS")),
+		ydb.WithTraceQuery(
+			log.Query(
+				log.Default(os.Stdout,
+					log.WithLogQuery(),
+					log.WithColoring(),
+					log.WithMinLevel(log.INFO),
+				),
+				trace.QueryEvents,
+			),
+		),
+	)
+	require.NoError(t, err)
+	t.Run("Query", func(t *testing.T) {
+		type RowData struct {
+			Id         uint64        `sql:"id"`
+			DecimalVal types.Decimal `sql:"dc"`
+		}
+		result, err := db.Query().Query(ctx, `
+        SELECT id, dc
+        FROM AS_TABLE(
+          AsList(
+            AsStruct(1u AS id, decimal("10.01",22,9) AS dc),
+            AsStruct(2u AS id, decimal("-5.33",22,9) AS dc),
+			AsStruct(3u AS id, decimal("1844674407370955.1615",22,9) AS dc)
+            )
+          );
+        `,
+			query.WithSyntax(query.SyntaxYQL),
+			query.WithIdempotent(),
+		)
+		require.NoError(t, err)
+		resultSet, err := result.NextResultSet(ctx)
+		require.NoError(t, err)
+		row, err := resultSet.NextRow(ctx)
+		require.NoError(t, err)
+		var rd RowData
+		err = row.ScanStruct(&rd)
+		require.NoError(t, err)
+		require.EqualValues(t, uint64(1), rd.Id)
+		require.EqualValues(t, types.Decimal{Bytes: decimal.BigIntToByte(big.NewInt(10010000000), 22, 9), Precision: 22, Scale: 9}, rd.DecimalVal)
+		row, err = resultSet.NextRow(ctx)
+		require.NoError(t, err)
+		err = row.ScanStruct(&rd)
+		require.NoError(t, err)
+		require.EqualValues(t, uint64(2), rd.Id)
+		require.EqualValues(t, types.Decimal{Bytes: decimal.BigIntToByte(big.NewInt(-5330000000), 22, 9), Precision: 22, Scale: 9}, rd.DecimalVal)
+		row, err = resultSet.NextRow(ctx)
+		require.NoError(t, err)
+		err = row.ScanStruct(&rd)
+		require.NoError(t, err)
+		expectedVal := types.Decimal{Bytes: [16]byte{0, 19, 66, 97, 114, 199, 77, 130, 43, 135, 143, 232, 0, 0, 0, 0}, Precision: 22, Scale: 9}
+		require.EqualValues(t, expectedVal, rd.DecimalVal)
+	})
+}