Skip to content

Commit 61bc734

Browse files
authored
Merge pull request #832 from ydb-platform/placeholder
* Supported placeholder "_" for ignored column names in `database/sql…
2 parents 2395b19 + 686bc4e commit 61bc734

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* Supported placeholder "_" for ignored column names in `database/sql` result sets
2+
13
## v3.52.0
24
* Added `table.Session.CopyTables` method
35
* Added `x-ydb-trace-id` header into grpc calls

internal/xsql/rows.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ var (
2323
_ driver.Rows = &single{}
2424

2525
_ types.Scanner = &valuer{}
26+
27+
ignoreColumnNamePlaceholder = "_"
2628
)
2729

2830
type rows struct {
@@ -41,11 +43,11 @@ func (r *rows) Columns() []string {
4143
r.nextSet.Do(func() {
4244
r.result.NextResultSet(context.Background())
4345
})
44-
var i int
45-
cs := make([]string, r.result.CurrentResultSet().ColumnCount())
46+
cs := make([]string, 0, r.result.CurrentResultSet().ColumnCount())
4647
r.result.CurrentResultSet().Columns(func(m options.Column) {
47-
cs[i] = m.Name
48-
i++
48+
if m.Name != ignoreColumnNamePlaceholder {
49+
cs = append(cs, m.Name)
50+
}
4951
})
5052
return cs
5153
}

0 commit comments

Comments
 (0)