diff options
| author |  kim (grufwub) <grufwub@gmail.com> | 2021-09-08 21:13:54 +0100 |
|---|---|---|
| committer | kim (grufwub) <grufwub@gmail.com> | 2021-09-08 21:13:54 +0100 |
| commit | 6a2d0d9508392425392738743fa4dd5b5d93bdb4 (patch) | |
| tree | 2c076235c197acbb9080745fc79a4b41aaa5452e /vendor/github.com/uptrace/bun/dialect | |
| parent | update sqlite library -> v1.13.0 (diff) | |
| parent | Merge pull request #195 from NyaaaWhatsUpDoc/update/bun-library (diff) | |
| download | gotosocial-6a2d0d9508392425392738743fa4dd5b5d93bdb4.tar.xz | |
Merge remote-tracking branch 'upstream/main' into update/sqlite-library
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
Diffstat (limited to 'vendor/github.com/uptrace/bun/dialect')
| -rw-r--r-- | vendor/github.com/uptrace/bun/dialect/dialect.go | 9 | ||||
| -rw-r--r-- | vendor/github.com/uptrace/bun/dialect/feature/feature.go | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/vendor/github.com/uptrace/bun/dialect/dialect.go b/vendor/github.com/uptrace/bun/dialect/dialect.go index 9ff8b2461..f209f892e 100644 --- a/vendor/github.com/uptrace/bun/dialect/dialect.go +++ b/vendor/github.com/uptrace/bun/dialect/dialect.go @@ -8,10 +8,8 @@ func (n Name) String() string { return "pg" case SQLite: return "sqlite" - case MySQL5: - return "mysql5" - case MySQL8: - return "mysql8" + case MySQL: + return "mysql" default: return "invalid" } @@ -21,6 +19,5 @@ const ( Invalid Name = iota PG SQLite - MySQL5 - MySQL8 + MySQL ) diff --git a/vendor/github.com/uptrace/bun/dialect/feature/feature.go b/vendor/github.com/uptrace/bun/dialect/feature/feature.go index ff8f1d625..257e091fa 100644 --- a/vendor/github.com/uptrace/bun/dialect/feature/feature.go +++ b/vendor/github.com/uptrace/bun/dialect/feature/feature.go @@ -4,10 +4,9 @@ import "github.com/uptrace/bun/internal" type Feature = internal.Flag -const DefaultFeatures = Returning | TableCascade - const ( - Returning Feature = 1 << iota + CTE Feature = 1 << iota + Returning DefaultPlaceholder DoubleColonCast ValuesRow |