Skip to content

Commit

Permalink
Merge branch 'main' into use-ghfs
Browse files Browse the repository at this point in the history
  • Loading branch information
@kromiii
kromiii authored May 6, 2024
2 parents 1d62af7 + 8b88520 commit 8d3286c
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 98 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## [v1.74.2](https://github.com/k1LoW/tbls/compare/v1.74.1...v1.74.2) - 2024-05-02
### Fix bug 🐛
- Support the case where name in index_info is NULL. by @k1LoW in https://github.com/k1LoW/tbls/pull/579

## [v1.74.1](https://github.com/k1LoW/tbls/compare/v1.74.0...v1.74.1) - 2024-05-01
### Other Changes
- chore(deps): bump golang.org/x/net from 0.22.0 to 0.23.0 by @dependabot in https://github.com/k1LoW/tbls/pull/575
- chore(deps): bump the dependencies group with 7 updates by @dependabot in https://github.com/k1LoW/tbls/pull/577

## [v1.74.0](https://github.com/k1LoW/tbls/compare/v1.73.3...v1.74.0) - 2024-04-13
### Other Changes
- chore(deps): bump the dependencies group with 5 updates by @dependabot in https://github.com/k1LoW/tbls/pull/568
Expand Down
6 changes: 4 additions & 2 deletions drivers/sqlite/sqlite.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ WHERE name != 'sqlite_sequence' AND (type = 'table' OR type = 'view');`)
var (
colRank string
colRankWithinTable string
col string
col sql.NullString
cols []string
)
row, err := l.db.Query(fmt.Sprintf("PRAGMA index_info(`%s`)", indexName))
Expand All @@ -264,7 +264,9 @@ WHERE name != 'sqlite_sequence' AND (type = 'table' OR type = 'view');`)
if err != nil {
return errors.WithStack(err)
}
cols = append(cols, col)
if col.Valid {
cols = append(cols, col.String)
}
}

switch indexCreatedBy {
Expand Down
51 changes: 23 additions & 28 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ module github.com/k1LoW/tbls
go 1.22.2

require (
cloud.google.com/go/bigquery v1.60.0
cloud.google.com/go/spanner v1.56.0
cloud.google.com/go/bigquery v1.61.0
cloud.google.com/go/spanner v1.60.0
github.com/aquasecurity/go-version v0.0.0-20210121072130-637058cfe492
github.com/aws/aws-sdk-go v1.51.21
github.com/aws/aws-sdk-go v1.51.32
github.com/beta/freetype v0.0.1
github.com/expr-lang/expr v1.16.4
github.com/expr-lang/expr v1.16.5
github.com/gertd/go-pluralize v0.2.1
github.com/go-sql-driver/mysql v1.8.1
github.com/goccy/go-graphviz v0.1.2
Expand All @@ -24,7 +24,7 @@ require (
github.com/loadoff/excl v0.0.0-20171207172601-c6a9e4c4b4c4
github.com/mattn/go-runewidth v0.0.15
github.com/mattn/go-sqlite3 v1.14.22
github.com/microsoft/go-mssqldb v1.7.0
github.com/microsoft/go-mssqldb v1.7.1
github.com/minio/pkg v1.7.5
github.com/olekukonko/tablewriter v0.0.5
github.com/pkg/errors v0.9.1
Expand All @@ -37,14 +37,15 @@ require (
gitlab.com/golang-commonmark/mdurl v0.0.0-20191124015652-932350d1cb84
go.mongodb.org/mongo-driver v1.15.0
golang.org/x/image v0.15.0
golang.org/x/oauth2 v0.18.0
google.golang.org/api v0.170.0
golang.org/x/oauth2 v0.19.0
google.golang.org/api v0.175.0
)

require (
cloud.google.com/go v0.112.1 // indirect
cloud.google.com/go/compute v1.24.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go v0.112.2 // indirect
cloud.google.com/go/auth v0.2.2 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.1 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/iam v1.1.7 // indirect
filippo.io/edwards25519 v1.1.0 // indirect
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
Expand All @@ -53,8 +54,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 // indirect
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
github.com/apache/arrow/go/v14 v14.0.2 // indirect
github.com/apache/arrow/go/v15 v15.0.0 // indirect
github.com/apache/arrow/go/v15 v15.0.2 // indirect
github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect
Expand All @@ -74,10 +74,8 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cli/go-gh/v2 v2.6.0 // indirect
github.com/cli/safeexec v1.0.1 // indirect
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa // indirect
github.com/danieljoos/wincred v1.2.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
github.com/envoyproxy/go-control-plane v0.12.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
Expand Down Expand Up @@ -126,8 +124,6 @@ require (
github.com/sahilm/fuzzy v0.1.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
Expand All @@ -139,22 +135,21 @@ require (
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.18.0 // indirect
golang.org/x/tools v0.20.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
google.golang.org/grpc v1.62.1 // indirect
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 8d3286c

Please sign in to comment.