diff options
Diffstat (limited to 'vendor/github.com/uptrace/bun/dialect')
7 files changed, 54 insertions, 3 deletions
diff --git a/vendor/github.com/uptrace/bun/dialect/dialect.go b/vendor/github.com/uptrace/bun/dialect/dialect.go index f209f892e..03b81fbbc 100644 --- a/vendor/github.com/uptrace/bun/dialect/dialect.go +++ b/vendor/github.com/uptrace/bun/dialect/dialect.go @@ -10,6 +10,8 @@ func (n Name) String() string { return "sqlite" case MySQL: return "mysql" + case MSSQL: + return "mssql" default: return "invalid" } @@ -20,4 +22,5 @@ const ( PG SQLite MySQL + MSSQL ) diff --git a/vendor/github.com/uptrace/bun/dialect/feature/feature.go b/vendor/github.com/uptrace/bun/dialect/feature/feature.go index 92d43ce21..510d6e5de 100644 --- a/vendor/github.com/uptrace/bun/dialect/feature/feature.go +++ b/vendor/github.com/uptrace/bun/dialect/feature/feature.go @@ -6,18 +6,27 @@ type Feature = internal.Flag const ( CTE Feature = 1 << iota + WithValues Returning + InsertReturning + Output // mssql DefaultPlaceholder DoubleColonCast ValuesRow UpdateMultiTable InsertTableAlias + UpdateTableAlias DeleteTableAlias AutoIncrement + Identity TableCascade TableIdentity TableTruncate InsertOnConflict // INSERT ... ON CONFLICT InsertOnDuplicateKey // INSERT ... ON DUPLICATE KEY InsertIgnore // INSERT IGNORE ... + TableNotExists + OffsetFetch + SelectExists + UpdateFromTable ) diff --git a/vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go b/vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go index 44e639141..852132b7f 100644 --- a/vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go +++ b/vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go @@ -2,9 +2,11 @@ package pgdialect import ( "database/sql" + "fmt" "strconv" "strings" + "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" "github.com/uptrace/bun/dialect/feature" "github.com/uptrace/bun/dialect/sqltype" @@ -13,6 +15,13 @@ import ( var pgDialect = New() +func init() { + if Version() != bun.Version() { + panic(fmt.Errorf("pgdialect and Bun must have the same version: v%s != v%s", + Version(), bun.Version())) + } +} + type Dialect struct { schema.BaseDialect @@ -24,15 +33,20 @@ func New() *Dialect { d := new(Dialect) d.tables = schema.NewTables(d) d.features = feature.CTE | + feature.WithValues | feature.Returning | + feature.InsertReturning | feature.DefaultPlaceholder | feature.DoubleColonCast | feature.InsertTableAlias | + feature.UpdateTableAlias | feature.DeleteTableAlias | feature.TableCascade | feature.TableIdentity | feature.TableTruncate | - feature.InsertOnConflict + feature.TableNotExists | + feature.InsertOnConflict | + feature.SelectExists return d } diff --git a/vendor/github.com/uptrace/bun/dialect/pgdialect/sqltype.go b/vendor/github.com/uptrace/bun/dialect/pgdialect/sqltype.go index 1fbfa7d7f..bfef89fa1 100644 --- a/vendor/github.com/uptrace/bun/dialect/pgdialect/sqltype.go +++ b/vendor/github.com/uptrace/bun/dialect/pgdialect/sqltype.go @@ -53,7 +53,6 @@ func fieldSQLType(field *schema.Field) string { if v, ok := field.Tag.Option("composite"); ok { return v } - if _, ok := field.Tag.Option("hstore"); ok { return "hstore" } diff --git a/vendor/github.com/uptrace/bun/dialect/pgdialect/version.go b/vendor/github.com/uptrace/bun/dialect/pgdialect/version.go new file mode 100644 index 000000000..a3adb36aa --- /dev/null +++ b/vendor/github.com/uptrace/bun/dialect/pgdialect/version.go @@ -0,0 +1,6 @@ +package pgdialect + +// Version is the current release version. +func Version() string { + return "1.1.3" +} diff --git a/vendor/github.com/uptrace/bun/dialect/sqlitedialect/dialect.go b/vendor/github.com/uptrace/bun/dialect/sqlitedialect/dialect.go index 2536fe401..e79dcb004 100644 --- a/vendor/github.com/uptrace/bun/dialect/sqlitedialect/dialect.go +++ b/vendor/github.com/uptrace/bun/dialect/sqlitedialect/dialect.go @@ -3,13 +3,22 @@ package sqlitedialect import ( "database/sql" "encoding/hex" + "fmt" + "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" "github.com/uptrace/bun/dialect/feature" "github.com/uptrace/bun/dialect/sqltype" "github.com/uptrace/bun/schema" ) +func init() { + if Version() != bun.Version() { + panic(fmt.Errorf("sqlitedialect and Bun must have the same version: v%s != v%s", + Version(), bun.Version())) + } +} + type Dialect struct { schema.BaseDialect @@ -21,10 +30,15 @@ func New() *Dialect { d := new(Dialect) d.tables = schema.NewTables(d) d.features = feature.CTE | + feature.WithValues | feature.Returning | + feature.InsertReturning | feature.InsertTableAlias | + feature.UpdateTableAlias | feature.DeleteTableAlias | - feature.InsertOnConflict + feature.InsertOnConflict | + feature.TableNotExists | + feature.SelectExists return d } diff --git a/vendor/github.com/uptrace/bun/dialect/sqlitedialect/version.go b/vendor/github.com/uptrace/bun/dialect/sqlitedialect/version.go new file mode 100644 index 000000000..76a755a86 --- /dev/null +++ b/vendor/github.com/uptrace/bun/dialect/sqlitedialect/version.go @@ -0,0 +1,6 @@ +package sqlitedialect + +// Version is the current release version. +func Version() string { + return "1.1.3" +} |