Skip to content

Commit d9fa725

Browse files
authored
fix: ListMigrations query for YDB (#685)
1 parent 2b41513 commit d9fa725

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
2727
SELECT * FROM regions WHERE name = '${REGION}';
2828
```
2929

30+
- Fixed query for list migrations in YDB (#684)
31+
3032
## [v3.17.0] - 2023-12-15
3133

3234
- Standardised the MIT license (#647)

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/sethvargo/go-retry v0.2.4
1313
github.com/tursodatabase/libsql-client-go v0.0.0-20231216154754-8383a53d618f
1414
github.com/vertica/vertica-sql-go v1.3.3
15-
github.com/ydb-platform/ydb-go-sdk/v3 v3.55.0
15+
github.com/ydb-platform/ydb-go-sdk/v3 v3.55.1
1616
github.com/ziutek/mymysql v1.5.4
1717
go.uber.org/multierr v1.11.0
1818
golang.org/x/sync v0.6.0
@@ -70,7 +70,7 @@ require (
7070
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
7171
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
7272
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
73-
github.com/ydb-platform/ydb-go-genproto v0.0.0-20231215113745-46f6d30f974a // indirect
73+
github.com/ydb-platform/ydb-go-genproto v0.0.0-20240126124512-dbb0e1720dbf // indirect
7474
go.opentelemetry.io/otel v1.20.0 // indirect
7575
go.opentelemetry.io/otel/trace v1.20.0 // indirect
7676
golang.org/x/crypto v0.17.0 // indirect

go.sum

+4
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,12 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17
249249
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
250250
github.com/ydb-platform/ydb-go-genproto v0.0.0-20231215113745-46f6d30f974a h1:9wx+kCrCQCdwmDe1AFW5yAHdzlo+RV7lcy6y7Zq661s=
251251
github.com/ydb-platform/ydb-go-genproto v0.0.0-20231215113745-46f6d30f974a/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
252+
github.com/ydb-platform/ydb-go-genproto v0.0.0-20240126124512-dbb0e1720dbf h1:ckwNHVo4bv2tqNkgx3W3HANh3ta1j6TR5qw08J1A7Tw=
253+
github.com/ydb-platform/ydb-go-genproto v0.0.0-20240126124512-dbb0e1720dbf/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
252254
github.com/ydb-platform/ydb-go-sdk/v3 v3.55.0 h1:KqnJX8vE4+33FXgsbigjsIOhFfJYppFsupZcw4NjBks=
253255
github.com/ydb-platform/ydb-go-sdk/v3 v3.55.0/go.mod h1:1UiKA9dSZM4gbFEBw2nT/7bHgWIGaCU1i8DFj0LP460=
256+
github.com/ydb-platform/ydb-go-sdk/v3 v3.55.1 h1:Ebo6J5AMXgJ3A438ECYotA0aK7ETqjQx9WoZvVxzKBE=
257+
github.com/ydb-platform/ydb-go-sdk/v3 v3.55.1/go.mod h1:udNPW8eupyH/EZocecFmaSNJacKKYjzQa7cVgX5U2nc=
254258
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
255259
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
256260
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

internal/dialect/dialectquery/ydb.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@ func (c *Ydb) GetMigrationByVersion(tableName string) string {
4141
}
4242

4343
func (c *Ydb) ListMigrations(tableName string) string {
44-
// "--!syntax_pg" enables query processing with PostgreSQL-compatible syntax.
45-
// YQL by design strictly forbids the execution of SELECT statements without columns from ORDER BY clause.
46-
// In PostgreSQL-compatible mode, SELECT statements can be processed without columns from ORDER BY clause.
47-
q := `--!syntax_pg
48-
SELECT version_id, is_applied FROM %s ORDER BY tstamp DESC`
44+
q := `
45+
SELECT version_id, is_applied, tstamp AS __discard_column_tstamp
46+
FROM %s ORDER BY __discard_column_tstamp DESC`
4947
return fmt.Sprintf(q, tableName)
5048
}

0 commit comments

Comments
 (0)