Merge pull request #1253 from OS-M/empty-db-dsn-fix

Fixed empty database in DSN while using config.WithDatabase

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,4 @@
+* Fixed `config.WithDatabase` behaviour with empty database in DSN string
 * Added experimental method `query/Client.Execute` for execute query and read materialized result
 
 ## v3.69.0

internal/dsn/dsn.go

@@ -35,8 +35,10 @@ func Parse(dsn string) (info parsedInfo, err error) {
 	info.Options = append(info.Options,
 		config.WithSecure(uri.Scheme != insecureSchema),
 		config.WithEndpoint(uri.Host),
-		config.WithDatabase(uri.Path),
 	)
+	if uri.Path != "" {
+		info.Options = append(info.Options, config.WithDatabase(uri.Path))
+	}
 	if uri.User != nil {
 		password, _ := uri.User.Password()
 		info.UserInfo = &UserInfo{

internal/dsn/dsn_test.go

@@ -124,3 +124,15 @@ func TestParseConnectionString(t *testing.T) {
 		})
 	}
 }
+
+func TestParseConnectionStringEmptyDatabase(t *testing.T) {
+	info, err := Parse("grpc://ydb-ru.yandex.net:2135")
+	if err != nil {
+		t.Fatalf("Received unexpected error:\n%+v", err)
+	}
+	c := config.New(config.WithDatabase("mydb"))
+	c = c.With(info.Options...)
+	require.False(t, c.Secure())
+	require.Equal(t, "ydb-ru.yandex.net:2135", c.Endpoint())
+	require.Equal(t, "mydb", c.Database())
+}