Skip to content

Commit 33ae952

Browse files
committed
fixed integration tests with database/sql driver over query service
1 parent 5bd342d commit 33ae952

File tree

1 file changed

+32
-15
lines changed

1 file changed

+32
-15
lines changed

tests/integration/database_sql_regression_test.go

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919

2020
"github.com/ydb-platform/ydb-go-sdk/v3"
2121
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
22+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
2223
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/conn/table/badconn"
2324
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"
2425
"github.com/ydb-platform/ydb-go-sdk/v3/retry"
@@ -234,7 +235,12 @@ func TestUUIDSerializationDatabaseSQLIssue1501(t *testing.T) {
234235
var res [16]byte
235236

236237
err := row.Scan(&res)
237-
require.Error(t, err)
238+
switch driverEngine(db) {
239+
case xsql.TABLE_SERVICE:
240+
require.Error(t, err)
241+
case xsql.QUERY_SERVICE:
242+
require.NoError(t, err)
243+
}
238244
})
239245
t.Run("old-receive-to-bytes-with-force-wrapper", func(t *testing.T) {
240246
// test old behavior - for test way of safe work with data, written with bagged API version
@@ -256,10 +262,14 @@ func TestUUIDSerializationDatabaseSQLIssue1501(t *testing.T) {
256262
var res types.UUIDBytesWithIssue1501Type
257263

258264
err := row.Scan(&res)
259-
require.NoError(t, err)
260-
261-
resUUID := uuid.UUID(res.AsBytesArray())
262-
require.Equal(t, expectedResultWithBug, resUUID.String())
265+
switch driverEngine(db) {
266+
case xsql.TABLE_SERVICE:
267+
require.NoError(t, err)
268+
resUUID := uuid.UUID(res.AsBytesArray())
269+
require.Equal(t, expectedResultWithBug, resUUID.String())
270+
case xsql.QUERY_SERVICE:
271+
require.Error(t, err)
272+
}
263273
})
264274

265275
t.Run("old-receive-to-string", func(t *testing.T) {
@@ -341,11 +351,14 @@ func TestUUIDSerializationDatabaseSQLIssue1501(t *testing.T) {
341351

342352
var resBytes types.UUIDBytesWithIssue1501Type
343353
err := row.Scan(&resBytes)
344-
require.NoError(t, err)
345-
346-
resUUID := uuid.UUID(resBytes.AsBytesArray())
347-
348-
require.Equal(t, id, resUUID)
354+
switch driverEngine(db) {
355+
case xsql.TABLE_SERVICE:
356+
require.NoError(t, err)
357+
resUUID := uuid.UUID(resBytes.AsBytesArray())
358+
require.Equal(t, id, resUUID)
359+
case xsql.QUERY_SERVICE:
360+
require.Error(t, err)
361+
}
349362
})
350363
t.Run("old-send-uuid-receive-error-bad-request", func(t *testing.T) {
351364
var (
@@ -405,12 +418,16 @@ func TestUUIDSerializationDatabaseSQLIssue1501(t *testing.T) {
405418
var resFromDB types.UUIDBytesWithIssue1501Type
406419

407420
err := row.Scan(&resFromDB)
408-
require.NoError(t, err)
409-
410-
resUUID := resFromDB.PublicRevertReorderForIssue1501()
421+
switch driverEngine(db) {
422+
case xsql.TABLE_SERVICE:
423+
require.NoError(t, err)
424+
resUUID := resFromDB.PublicRevertReorderForIssue1501()
425+
resString := strings.ToUpper(resUUID.String())
426+
require.Equal(t, idString, resString)
427+
case xsql.QUERY_SERVICE:
428+
require.Error(t, err)
429+
}
411430

412-
resString := strings.ToUpper(resUUID.String())
413-
require.Equal(t, idString, resString)
414431
})
415432
t.Run("good-send-receive", func(t *testing.T) {
416433
var (

0 commit comments

Comments
 (0)