Minor style & logic fixes

Author: Viktor Pentyukhov

docker-compose.yml

@@ -27,8 +27,10 @@ services:
       - "2136:2136"
       - "8765:8765"
     restart: always
+    hostname: localhost
     environment:
       - YDB_USE_IN_MEMORY_PDISKS=true
       - GRPC_TLS_PORT=2135
       - GRPC_PORT=2136
       - MON_PORT=8765
+      

internal/codegen/golang/query.go

@@ -273,30 +273,41 @@ func (v QueryValue) YDBParamMapEntries() string {
 	if v.isEmpty() {
 		return ""
 	}
+
 	var parts []string
-	if v.Struct == nil {
-		if v.Column != nil && v.Column.IsNamedParam {
-			name := v.Column.GetName()
+	for _, field := range v.getParameterFields() {
+		if field.Column != nil && field.Column.IsNamedParam {
+			name := field.Column.GetName()
 			if name != "" {
 				key := fmt.Sprintf("%q", addDollarPrefix(name))
-				parts = append(parts, key+": "+escape(v.Name))
-			}
-		}
-	} else {
-		for _, f := range v.Struct.Fields {
-			if f.Column != nil && f.Column.IsNamedParam {
-				name := f.Column.GetName()
-				if name != "" {
-					key := fmt.Sprintf("%q", addDollarPrefix(name))
-					parts = append(parts, key+": "+escape(v.VariableForField(f)))
-				}
+				variable := v.VariableForField(field)
+				parts = append(parts, key+": "+escape(variable))
 			}
 		}
 	}
+
+	if len(parts) == 0 {
+		return ""
+	}
+
 	parts = append(parts, "")
 	return "\n" + strings.Join(parts, ",\n")
 }
 
+func (v QueryValue) getParameterFields() []Field {
+	if v.Struct == nil {
+		return []Field{
+			{
+				Name:   v.Name,
+				DBName: v.DBName,
+				Type:   v.Typ,
+				Column: v.Column,
+			},
+		}
+	}
+	return v.Struct.Fields
+}
+
 // A struct used to generate methods and fields on the Queries struct
 type Query struct {
 	Cmd          string

internal/codegen/golang/templates/template.tmpl

@@ -26,7 +26,7 @@ import (
 {{if .SQLDriver.IsPGX }}
 	{{- template "dbCodeTemplatePgx" .}}
 {{else if .SQLDriver.IsYDBGoSDK }}
-	{{- template "dbCodeYDB" .}}
+	{{- template "dbCodeTemplateYDB" .}}
 {{else}}
 	{{- template "dbCodeTemplateStd" .}}
 {{end}}

internal/codegen/golang/templates/ydb-go-sdk/dbCode.tmpl

@@ -1,4 +1,4 @@
-{{define "dbCodeYDB"}}
+{{define "dbCodeTemplateYDB"}}
 type DBTX interface {
     Exec(ctx context.Context, sql string, opts ...query.ExecuteOption) error
 	Query(ctx context.Context, sql string, opts ...query.ExecuteOption) (query.Result, error)

internal/config/v_two.json

@@ -38,7 +38,8 @@
                         "enum": [
                             "postgresql",
                             "mysql",
-                            "sqlite"
+                            "sqlite",
+                            "ydb"
                         ]
                     },
                     "schema": {

internal/sqltest/local/ydb.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"hash/fnv"
 	"math/rand"
-	"net"
 	"os"
 	"testing"
 	"time"
@@ -39,10 +38,6 @@ func link_YDB(t *testing.T, migrations []string, rw bool) *ydb.Driver {
 	if dbuiri == "" {
 		t.Skip("YDB_SERVER_URI is empty")
 	}
-	host, _, err := net.SplitHostPort(dbuiri)
-	if err != nil {
-		t.Fatalf("invalid YDB_SERVER_URI: %q", dbuiri)
-	}
 
 	baseDB := os.Getenv("YDB_DATABASE")
 	if baseDB == "" {
@@ -77,9 +72,6 @@ func link_YDB(t *testing.T, migrations []string, rw bool) *ydb.Driver {
 	db, err := ydb.Open(ctx, connectionString,
 		ydb.WithInsecure(),
 		ydb.WithDiscoveryInterval(time.Hour),
-		ydb.WithNodeAddressMutator(func(_ string) string {
-			return host
-		}),
 	)
 	if err != nil {
 		t.Fatalf("failed to open YDB connection: %s", err)