Merge pull request #1671 from ydb-platform/cleanup-database-sql

fixed cleanup for database/sql driver

Author: asmyasnikov

tests/integration/database_sql_metrics_test.go

@@ -35,11 +35,12 @@ func TestDatabaseSqlMetrics(t *testing.T) {
 		[]string{"database.sql.conns{}", "database.sql.tx{}"},
 		xslices.Keys(registry.gauges.data),
 	)
-	require.EqualValues(t, 1, registry.gauges.data["database.sql.conns{}"].gauges["database.sql.conns{}"].value)
+	require.NotNil(t, registry.gauges.data["database.sql.conns{}"].gauges)
 
 	cc1, err := db.Conn(ctx)
 	require.NoError(t, err)
 	require.NotNil(t, cc1)
+	require.NotNil(t, registry.gauges.data["database.sql.conns{}"].gauges["database.sql.conns{}"])
 	require.EqualValues(t, 1, registry.gauges.data["database.sql.conns{}"].gauges["database.sql.conns{}"].value)
 	require.Empty(t, registry.gauges.data["database.sql.tx{}"].gauges)
 

tests/integration/helpers_test.go

@@ -145,21 +145,17 @@ func (scope *scopeT) driverNamed(name string, opts ...ydb.Option) *ydb.Driver {
 func (scope *scopeT) SQLDriver(opts ...ydb.ConnectorOption) *sql.DB {
 	f := func() (*fixenv.GenericResult[*sql.DB], error) {
 		driver := scope.Driver()
-		scope.Logf("Create sql db connector")
+		scope.Logf("Create database/sql connector for YDB")
 		connector, err := ydb.Connector(driver, opts...)
 		if err != nil {
 			return nil, err
 		}
 
 		db := sql.OpenDB(connector)
 
-		scope.Logf("Ping db")
-		err = db.PingContext(scope.Ctx)
-		if err != nil {
-			return nil, err
-		}
-
-		return fixenv.NewGenericResult(db), nil
+		return fixenv.NewGenericResultWithCleanup(db, func() {
+			scope.Require.NoError(db.Close())
+		}), nil
 	}
 	return fixenv.CacheResult(scope.Env, f)
 }