Cast dialect clean up.
This commit is contained in:
parent
6ee2f45548
commit
cb606f9026
3 changed files with 22 additions and 13 deletions
|
|
@ -76,8 +76,8 @@ func (b *castExpression) serialize(statement StatementType, out *SqlBuilder, opt
|
||||||
expression := b.expression
|
expression := b.expression
|
||||||
castType := b.cast
|
castType := b.cast
|
||||||
|
|
||||||
if castOverride := out.Dialect.CastOverride(); castOverride != nil {
|
if castOverride := out.Dialect.SerializeOverride("CAST"); castOverride != nil {
|
||||||
return castOverride(expression, castType)(statement, out, options...)
|
return castOverride(expression, String(castType))(statement, out, options...)
|
||||||
}
|
}
|
||||||
|
|
||||||
out.WriteString("CAST(")
|
out.WriteString("CAST(")
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@ type Dialect interface {
|
||||||
Name() string
|
Name() string
|
||||||
PackageName() string
|
PackageName() string
|
||||||
SerializeOverride(operator string) SerializeOverride
|
SerializeOverride(operator string) SerializeOverride
|
||||||
CastOverride() CastOverride
|
|
||||||
AliasQuoteChar() byte
|
AliasQuoteChar() byte
|
||||||
IdentifierQuoteChar() byte
|
IdentifierQuoteChar() byte
|
||||||
ArgumentPlaceholder() QueryPlaceholderFunc
|
ArgumentPlaceholder() QueryPlaceholderFunc
|
||||||
|
|
@ -31,14 +30,12 @@ type SerializeOverride func(expressions ...Expression) SerializeFunc
|
||||||
|
|
||||||
type QueryPlaceholderFunc func(ord int) string
|
type QueryPlaceholderFunc func(ord int) string
|
||||||
|
|
||||||
type CastOverride func(expression Expression, castType string) SerializeFunc
|
|
||||||
type UpdateAssigmentFunc func(columns []IColumn, values []Clause, out *SqlBuilder) (err error)
|
type UpdateAssigmentFunc func(columns []IColumn, values []Clause, out *SqlBuilder) (err error)
|
||||||
|
|
||||||
type DialectParams struct {
|
type DialectParams struct {
|
||||||
Name string
|
Name string
|
||||||
PackageName string
|
PackageName string
|
||||||
SerializeOverrides map[string]SerializeOverride
|
SerializeOverrides map[string]SerializeOverride
|
||||||
CastOverride CastOverride
|
|
||||||
AliasQuoteChar byte
|
AliasQuoteChar byte
|
||||||
IdentifierQuoteChar byte
|
IdentifierQuoteChar byte
|
||||||
ArgumentPlaceholder QueryPlaceholderFunc
|
ArgumentPlaceholder QueryPlaceholderFunc
|
||||||
|
|
@ -52,7 +49,6 @@ func NewDialect(params DialectParams) Dialect {
|
||||||
name: params.Name,
|
name: params.Name,
|
||||||
packageName: params.PackageName,
|
packageName: params.PackageName,
|
||||||
serializeOverrides: params.SerializeOverrides,
|
serializeOverrides: params.SerializeOverrides,
|
||||||
castOverride: params.CastOverride,
|
|
||||||
aliasQuoteChar: params.AliasQuoteChar,
|
aliasQuoteChar: params.AliasQuoteChar,
|
||||||
identifierQuoteChar: params.IdentifierQuoteChar,
|
identifierQuoteChar: params.IdentifierQuoteChar,
|
||||||
argumentPlaceholder: params.ArgumentPlaceholder,
|
argumentPlaceholder: params.ArgumentPlaceholder,
|
||||||
|
|
@ -65,7 +61,6 @@ type dialectImpl struct {
|
||||||
name string
|
name string
|
||||||
packageName string
|
packageName string
|
||||||
serializeOverrides map[string]SerializeOverride
|
serializeOverrides map[string]SerializeOverride
|
||||||
castOverride CastOverride
|
|
||||||
aliasQuoteChar byte
|
aliasQuoteChar byte
|
||||||
identifierQuoteChar byte
|
identifierQuoteChar byte
|
||||||
argumentPlaceholder QueryPlaceholderFunc
|
argumentPlaceholder QueryPlaceholderFunc
|
||||||
|
|
@ -86,10 +81,6 @@ func (d *dialectImpl) SerializeOverride(operator string) SerializeOverride {
|
||||||
return d.serializeOverrides[operator]
|
return d.serializeOverrides[operator]
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *dialectImpl) CastOverride() CastOverride {
|
|
||||||
return d.castOverride
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *dialectImpl) AliasQuoteChar() byte {
|
func (d *dialectImpl) AliasQuoteChar() byte {
|
||||||
return d.aliasQuoteChar
|
return d.aliasQuoteChar
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,11 +13,11 @@ func NewDialect() jet.Dialect {
|
||||||
|
|
||||||
serializeOverrides := map[string]jet.SerializeOverride{}
|
serializeOverrides := map[string]jet.SerializeOverride{}
|
||||||
serializeOverrides["REGEXP_LIKE"] = postgres_REGEXP_LIKE_function
|
serializeOverrides["REGEXP_LIKE"] = postgres_REGEXP_LIKE_function
|
||||||
|
serializeOverrides["CAST"] = postgresCAST
|
||||||
|
|
||||||
dialectParams := jet.DialectParams{
|
dialectParams := jet.DialectParams{
|
||||||
Name: "PostgreSQL",
|
Name: "PostgreSQL",
|
||||||
PackageName: "postgres",
|
PackageName: "postgres",
|
||||||
CastOverride: castFunc,
|
|
||||||
SerializeOverrides: serializeOverrides,
|
SerializeOverrides: serializeOverrides,
|
||||||
AliasQuoteChar: '"',
|
AliasQuoteChar: '"',
|
||||||
IdentifierQuoteChar: '"',
|
IdentifierQuoteChar: '"',
|
||||||
|
|
@ -31,8 +31,26 @@ func NewDialect() jet.Dialect {
|
||||||
return jet.NewDialect(dialectParams)
|
return jet.NewDialect(dialectParams)
|
||||||
}
|
}
|
||||||
|
|
||||||
func castFunc(expression jet.Expression, castType string) jet.SerializeFunc {
|
func postgresCAST(expressions ...jet.Expression) jet.SerializeFunc {
|
||||||
return func(statement jet.StatementType, out *jet.SqlBuilder, options ...jet.SerializeOption) error {
|
return func(statement jet.StatementType, out *jet.SqlBuilder, options ...jet.SerializeOption) error {
|
||||||
|
if len(expressions) < 2 {
|
||||||
|
return errors.New("jet: invalid number of expressions for operator")
|
||||||
|
}
|
||||||
|
|
||||||
|
expression := expressions[0]
|
||||||
|
|
||||||
|
litExpr, ok := expressions[1].(jet.LiteralExpression)
|
||||||
|
|
||||||
|
if !ok {
|
||||||
|
return errors.New("jet: cast invalid cast type")
|
||||||
|
}
|
||||||
|
|
||||||
|
castType, ok := litExpr.Value().(string)
|
||||||
|
|
||||||
|
if !ok {
|
||||||
|
return errors.New("jet: cast type is not string")
|
||||||
|
}
|
||||||
|
|
||||||
if err := jet.Serialize(expression, statement, out, options...); err != nil {
|
if err := jet.Serialize(expression, statement, out, options...); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue