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

Merge pull request #51 from gkdr/export-order-by

Browse source 
Export OrderByClause type through alias.
This commit is contained in:
go-jet 2020-09-06 16:22:55 +02:00 • committed by GitHub
commit 29119d71d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mysql/delete_statement.go
View file

@ -7,7 +7,7 @@ type DeleteStatement interface {
Statement Statement
WHERE(expression BoolExpression) DeleteStatement WHERE(expression BoolExpression) DeleteStatement
ORDER_BY(orderByClauses ...jet.OrderByClause) DeleteStatement ORDER_BY(orderByClauses ...OrderByClause) DeleteStatement
LIMIT(limit int64) DeleteStatement LIMIT(limit int64) DeleteStatement
} }
@ -38,7 +38,7 @@ func (d *deleteStatementImpl) WHERE(expression BoolExpression) DeleteStatement {
return d return d
} }
func (d *deleteStatementImpl) ORDER_BY(orderByClauses ...jet.OrderByClause) DeleteStatement { func (d *deleteStatementImpl) ORDER_BY(orderByClauses ...OrderByClause) DeleteStatement {
d.OrderBy.List = orderByClauses d.OrderBy.List = orderByClauses
return d return d
} }

4
mysql/select_statement.go
View file

@ -46,7 +46,7 @@ type SelectStatement interface {
GROUP_BY(groupByClauses ...jet.GroupByClause) SelectStatement GROUP_BY(groupByClauses ...jet.GroupByClause) SelectStatement
HAVING(boolExpression BoolExpression) SelectStatement HAVING(boolExpression BoolExpression) SelectStatement
WINDOW(name string) windowExpand WINDOW(name string) windowExpand
ORDER_BY(orderByClauses ...jet.OrderByClause) SelectStatement ORDER_BY(orderByClauses ...OrderByClause) SelectStatement
LIMIT(limit int64) SelectStatement LIMIT(limit int64) SelectStatement
OFFSET(offset int64) SelectStatement OFFSET(offset int64) SelectStatement
FOR(lock RowLock) SelectStatement FOR(lock RowLock) SelectStatement
@ -128,7 +128,7 @@ func (s *selectStatementImpl) WINDOW(name string) windowExpand {
return windowExpand{selectStatement: s} return windowExpand{selectStatement: s}
} }
func (s *selectStatementImpl) ORDER_BY(orderByClauses ...jet.OrderByClause) SelectStatement { func (s *selectStatementImpl) ORDER_BY(orderByClauses ...OrderByClause) SelectStatement {
s.OrderBy.List = orderByClauses s.OrderBy.List = orderByClauses
return s return s
} }

4
mysql/set_statement.go
View file

@ -17,7 +17,7 @@ func UNION_ALL(lhs, rhs jet.SerializerStatement, selects ...jet.SerializerStatem
type setStatement interface { type setStatement interface {
setOperators setOperators
ORDER_BY(orderByClauses ...jet.OrderByClause) setStatement ORDER_BY(orderByClauses ...OrderByClause) setStatement
LIMIT(limit int64) setStatement LIMIT(limit int64) setStatement
OFFSET(offset int64) setStatement OFFSET(offset int64) setStatement
@ -70,7 +70,7 @@ func newSetStatementImpl(operator string, all bool, selects []jet.SerializerStat
return newSetStatement return newSetStatement
} }
func (s *setStatementImpl) ORDER_BY(orderByClauses ...jet.OrderByClause) setStatement { func (s *setStatementImpl) ORDER_BY(orderByClauses ...OrderByClause) setStatement {
s.setOperator.OrderBy.List = orderByClauses s.setOperator.OrderBy.List = orderByClauses
return s return s
} }

3
mysql/types.go
View file

@ -17,5 +17,8 @@ type ColumnAssigment = jet.ColumnAssigment
// PrintableStatement is a statement which sql query can be logged // PrintableStatement is a statement which sql query can be logged
type PrintableStatement = jet.PrintableStatement type PrintableStatement = jet.PrintableStatement
// OrderByClause is the combination of an expression and the wanted ordering to use as input for ORDER BY.
type OrderByClause = jet.OrderByClause
// SetLogger sets automatic statement logging // SetLogger sets automatic statement logging
var SetLogger = jet.SetLoggerFunc var SetLogger = jet.SetLoggerFunc

4
postgres/select_statement.go
View file

@ -49,7 +49,7 @@ type SelectStatement interface {
GROUP_BY(groupByClauses ...jet.GroupByClause) SelectStatement GROUP_BY(groupByClauses ...jet.GroupByClause) SelectStatement
HAVING(boolExpression BoolExpression) SelectStatement HAVING(boolExpression BoolExpression) SelectStatement
WINDOW(name string) windowExpand WINDOW(name string) windowExpand
ORDER_BY(orderByClauses ...jet.OrderByClause) SelectStatement ORDER_BY(orderByClauses ...OrderByClause) SelectStatement
LIMIT(limit int64) SelectStatement LIMIT(limit int64) SelectStatement
OFFSET(offset int64) SelectStatement OFFSET(offset int64) SelectStatement
FOR(lock RowLock) SelectStatement FOR(lock RowLock) SelectStatement
@ -131,7 +131,7 @@ func (s *selectStatementImpl) WINDOW(name string) windowExpand {
return windowExpand{selectStatement: s} return windowExpand{selectStatement: s}
} }
func (s *selectStatementImpl) ORDER_BY(orderByClauses ...jet.OrderByClause) SelectStatement { func (s *selectStatementImpl) ORDER_BY(orderByClauses ...OrderByClause) SelectStatement {
s.OrderBy.List = orderByClauses s.OrderBy.List = orderByClauses
return s return s
} }

4
postgres/set_statement.go
View file

@ -41,7 +41,7 @@ func EXCEPT_ALL(lhs, rhs jet.SerializerStatement) setStatement {
type setStatement interface { type setStatement interface {
setOperators setOperators
ORDER_BY(orderByClauses ...jet.OrderByClause) setStatement ORDER_BY(orderByClauses ...OrderByClause) setStatement
LIMIT(limit int64) setStatement LIMIT(limit int64) setStatement
OFFSET(offset int64) setStatement OFFSET(offset int64) setStatement
@ -114,7 +114,7 @@ func newSetStatementImpl(operator string, all bool, selects []jet.SerializerStat
return newSetStatement return newSetStatement
} }
func (s *setStatementImpl) ORDER_BY(orderByClauses ...jet.OrderByClause) setStatement { func (s *setStatementImpl) ORDER_BY(orderByClauses ...OrderByClause) setStatement {
s.setOperator.OrderBy.List = orderByClauses s.setOperator.OrderBy.List = orderByClauses
return s return s
} }

3
postgres/types.go
View file

@ -17,5 +17,8 @@ type ColumnAssigment = jet.ColumnAssigment
// PrintableStatement is a statement which sql query can be logged // PrintableStatement is a statement which sql query can be logged
type PrintableStatement = jet.PrintableStatement type PrintableStatement = jet.PrintableStatement
// OrderByClause is the combination of an expression and the wanted ordering to use as input for ORDER BY.
type OrderByClause = jet.OrderByClause
// SetLogger sets automatic statement logging // SetLogger sets automatic statement logging
var SetLogger = jet.SetLoggerFunc var SetLogger = jet.SetLoggerFunc