Skip to content

Commit 2461778

Browse files
committed
rewrited ydb-go-sdk codegen to ranges back (+ upped testada go.mod version to 1.23)
1 parent b0c7864 commit 2461778

File tree

38 files changed

+222
-436
lines changed

38 files changed

+222
-436
lines changed

examples/authors/ydb/query.sql.go

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/codegen/golang/imports.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ func (i *importer) interfaceImports() fileImports {
276276
})
277277

278278
std["context"] = struct{}{}
279-
279+
280280
sqlpkg := parseDriver(i.Options.SqlPackage)
281281
if sqlpkg.IsYDBGoSDK() {
282282
pkg[ImportSpec{Path: "github.com/ydb-platform/ydb-go-sdk/v3/query"}] = struct{}{}
@@ -418,25 +418,17 @@ func (i *importer) queryImports(filename string) fileImports {
418418

419419
if sqlpkg.IsYDBGoSDK() {
420420
hasParams := false
421-
hasManyQueries := false
422421
for _, q := range gq {
423422
if !q.Arg.isEmpty() {
424423
hasParams = true
425-
}
426-
if q.Cmd == metadata.CmdMany {
427-
hasManyQueries = true
424+
break
428425
}
429426
}
430427
if hasParams {
431428
pkg[ImportSpec{Path: "github.com/ydb-platform/ydb-go-sdk/v3"}] = struct{}{}
432429
}
433430
pkg[ImportSpec{Path: "github.com/ydb-platform/ydb-go-sdk/v3/query"}] = struct{}{}
434431
pkg[ImportSpec{Path: "github.com/ydb-platform/ydb-go-sdk/v3/pkg/xerrors"}] = struct{}{}
435-
436-
if hasManyQueries {
437-
std["errors"] = struct{}{}
438-
std["io"] = struct{}{}
439-
}
440432
}
441433

442434
if i.Options.WrapErrors {

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,7 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{if $.EmitMethodsWithDBA
107107
{{else}}
108108
var items []{{.Ret.DefineType}}
109109
{{end -}}
110-
for {
111-
row, err := result.NextRow(ctx)
112-
if errors.Is(err, io.EOF) {
113-
break
114-
}
110+
for row, err := range result.Rows(ctx) {
115111
if err != nil {
116112
{{- if $.WrapErrors}}
117113
return nil, xerrors.WithStackTrace(fmt.Errorf("query {{.MethodName}}: %w", err))

internal/endtoend/testdata/array_in/ydb/ydb-go-sdk/go/query.sql.go

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/cast_coalesce/ydb/ydb-go-sdk/go/query.sql.go

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/cast_null/ydb/ydb-go-sdk/go/query.sql.go

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/coalesce/ydb/ydb-go-sdk/go/query.sql.go

Lines changed: 6 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/coalesce_as/ydb/ydb-go-sdk/go/query.sql.go

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/comparisons/ydb/ydb-go-sdk/go/query.sql.go

Lines changed: 7 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/ddl_alter_table_rename/ydb/ydb-go-sdk/go/query.sql.go

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)