Gleipnir/jet
4
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Order by sql serialization simplified.

Browse source
This commit is contained in:
zer0sub 2019-05-08 12:49:36 +02:00
parent f016a93d78
commit d9bbec3795
7 changed files with 32 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

29
sqlbuilder/column.go
View file

@ -77,20 +77,33 @@ func (c *baseColumn) DefaultAlias() projection {
return c.AS(c.tableName + "." + c.name)
}
func (c baseColumn) serialize(out *queryData) error {
setOrderBy := out.statementType == set_statement && out.clauseType == order_by_clause
if setOrderBy {
func (c *baseColumn) serializeAsOrderBy(out *queryData) error {
if out.statementType == set_statement {
// set statement (UNION, EXCEPT ...) can reference only select projections in order by clause
out.WriteString(`"`)
if c.tableName != "" {
out.WriteString(c.tableName)
out.WriteString(".")
}
out.WriteString(c.name)
out.WriteString(`"`)
return nil
}
return c.serialize(out)
}
func (c baseColumn) serialize(out *queryData) error {
if c.tableName != "" {
out.WriteString(c.tableName)
out.WriteString(".")
}
wrapColumnName := strings.Contains(c.name, ".") && !setOrderBy
wrapColumnName := strings.Contains(c.name, ".")
if wrapColumnName {
out.WriteString(`"`)
@ -102,9 +115,5 @@ func (c baseColumn) serialize(out *queryData) error {
out.WriteString(`"`)
}
if setOrderBy {
out.WriteString(`"`)
}
return nil
}