Merge pull request #276 from ydb-platform/dsn

* Supported parsing of database name from connection string URI path

Author: asmyasnikov

.github/workflows/tests.yml

@@ -51,7 +51,7 @@ jobs:
     env:
       OS: ${{ matrix.os }}
       GO: ${{ matrix.go-version }}
-      YDB_CONNECTION_STRING: grpcs://localhost:2135/?database=/local
+      YDB_CONNECTION_STRING: grpcs://localhost:2135/local
       YDB_SSL_ROOT_CERTIFICATES_FILE: /tmp/ydb_certs/ca.pem
       YDB_SHUTDOWN_URLS: http://localhost:8765/actors/kqp_proxy?force_shutdown=all
       HIDE_APPLICATION_OUTPUT: 1
@@ -94,7 +94,7 @@ jobs:
     env:
       OS: ${{ matrix.os }}
       GO: ${{ matrix.go-version }}
-      YDB_CONNECTION_STRING: grpcs://localhost:2135/?database=/local
+      YDB_CONNECTION_STRING: grpcs://localhost:2135/local
       YDB_SSL_ROOT_CERTIFICATES_FILE: /tmp/ydb_certs/ca.pem
     runs-on: ${{ matrix.os }}
     steps:
@@ -136,7 +136,7 @@ jobs:
     env:
       OS: ${{ matrix.os }}
       GO: ${{ matrix.go-version }}
-      YDB_CONNECTION_STRING: grpcs://localhost:2135/?database=/local
+      YDB_CONNECTION_STRING: grpcs://localhost:2135/local
       YDB_SSL_ROOT_CERTIFICATES_FILE: /tmp/ydb_certs/ca.pem
     runs-on: ${{ matrix.os }}
     steps:
@@ -177,7 +177,7 @@ jobs:
     env:
       OS: ${{ matrix.os }}
       GO: ${{ matrix.go-version }}
-      YDB_CONNECTION_STRING: grpcs://localhost:2135/?database=/local
+      YDB_CONNECTION_STRING: grpcs://localhost:2135/local
       YDB_SSL_ROOT_CERTIFICATES_FILE: /tmp/ydb_certs/ca.pem
     runs-on: ${{ matrix.os }}
     steps:
@@ -218,7 +218,7 @@ jobs:
     env:
       OS: ${{ matrix.os }}
       GO: ${{ matrix.go-version }}
-      YDB_CONNECTION_STRING: grpcs://localhost:2135/?database=/local
+      YDB_CONNECTION_STRING: grpcs://localhost:2135/local
       YDB_SSL_ROOT_CERTIFICATES_FILE: /tmp/ydb_certs/ca.pem
     runs-on: ${{ matrix.os }}
     steps:

CHANGELOG.md

@@ -1,3 +1,4 @@
+* Supported parsing of database name from connection string URI path
 * Added `options.WithExecuteScanQueryStats` option
 * Added to query stats plan and AST
 * Changed behaviour of `result.Stats()` (if query result have no stats - returns `nil`) 

internal/dsn/dsn.go

@@ -10,6 +10,7 @@ import (
 
 var (
 	parsers = map[string]Parser{
+		// for compatibility with old connection string format
 		"database": func(database string) ([]config.Option, error) {
 			return []config.Option{
 				config.WithDatabase(database),
@@ -40,6 +41,7 @@ func Parse(dsn string) (options []config.Option, err error) {
 		options,
 		config.WithEndpoint(uri.Host),
 		config.WithSecure(uri.Scheme != insecureSchema),
+		config.WithDatabase(uri.Path),
 	)
 	for param, values := range uri.Query() {
 		if p, has := parsers[param]; has {

internal/dsn/dsn_test.go

@@ -35,6 +35,13 @@ func TestParseConnectionString(t *testing.T) {
 			"/ru/home/gvit/mydb",
 			"123",
 		},
+		{
+			"grpc://ydb-ru.yandex.net:2135/ru/home/gvit/mydb?token=123",
+			false,
+			"ydb-ru.yandex.net:2135",
+			"/ru/home/gvit/mydb",
+			"123",
+		},
 		{
 			"grpcs://ydb.serverless.yandexcloud.net:2135/?" +
 				"database=/ru-central1/b1g8skpblkos03malf3s/etn02qso4v3isjb00te1&token=123",
@@ -43,6 +50,22 @@ func TestParseConnectionString(t *testing.T) {
 			"/ru-central1/b1g8skpblkos03malf3s/etn02qso4v3isjb00te1",
 			"123",
 		},
+		{
+			"grpcs://ydb.serverless.yandexcloud.net:2135" +
+				"/ru-central1/b1g8skpblkos03malf3s/etn02qso4v3isjb00te1?token=123",
+			true,
+			"ydb.serverless.yandexcloud.net:2135",
+			"/ru-central1/b1g8skpblkos03malf3s/etn02qso4v3isjb00te1",
+			"123",
+		},
+		{
+			"grpcs://ydb.serverless.yandexcloud.net:2135" +
+				"/ru-central1/b1g8skpblkos03malf3s/etn02qso4v3isjb00te1?database=/ru/home/gvit/mydb&token=123",
+			true,
+			"ydb.serverless.yandexcloud.net:2135",
+			"/ru/home/gvit/mydb",
+			"123",
+		},
 		{
 			"grpcs://lb.etn03r9df42nb631unbv.ydb.mdb.yandexcloud.net:2135/?" +
 				"database=/ru-central1/b1g8skpblkos03malf3s/etn03r9df42nb631unbv&token=123",
@@ -51,13 +74,28 @@ func TestParseConnectionString(t *testing.T) {
 			"/ru-central1/b1g8skpblkos03malf3s/etn03r9df42nb631unbv",
 			"123",
 		},
+		{
+			"grpcs://lb.etn03r9df42nb631unbv.ydb.mdb.yandexcloud.net:2135" +
+				"/ru-central1/b1g8skpblkos03malf3s/etn03r9df42nb631unbv?token=123",
+			true,
+			"lb.etn03r9df42nb631unbv.ydb.mdb.yandexcloud.net:2135",
+			"/ru-central1/b1g8skpblkos03malf3s/etn03r9df42nb631unbv",
+			"123",
+		},
 		{
 			"abcd://ydb-ru.yandex.net:2135/?database=/ru/home/gvit/mydb",
 			true,
 			"ydb-ru.yandex.net:2135",
 			"/ru/home/gvit/mydb",
 			"",
 		},
+		{
+			"abcd://ydb-ru.yandex.net:2135/ru/home/gvit/mydb",
+			true,
+			"ydb-ru.yandex.net:2135",
+			"/ru/home/gvit/mydb",
+			"",
+		},
 	} {
 		t.Run(test.connectionString, func(t *testing.T) {
 			options, err := Parse(test.connectionString)