Support for additional mathematical functions.

This commit is contained in:
zer0sub 2019-06-01 15:00:37 +02:00
parent cf022ab68d
commit 52bdd4b59f
14 changed files with 436 additions and 79 deletions

View file

@ -5,8 +5,8 @@ import "errors"
type funcExpressionImpl struct {
expressionInterfaceImpl
name string
expression []expression
name string
expressions []expression
}
func ROW(expressions ...expression) expression {
@ -15,8 +15,8 @@ func ROW(expressions ...expression) expression {
func newFunc(name string, expressions []expression, parent expression) *funcExpressionImpl {
funcExp := &funcExpressionImpl{
name: name,
expression: expressions,
name: name,
expressions: expressions,
}
if parent != nil {
@ -30,12 +30,12 @@ func newFunc(name string, expressions []expression, parent expression) *funcExpr
func (f *funcExpressionImpl) serialize(statement statementType, out *queryData, options ...serializeOption) error {
if f == nil {
return errors.New("Function expression is nil. ")
return errors.New("Function expressions is nil. ")
}
out.writeString(f.name + "(")
err := serializeExpressionList(statement, f.expression, ", ", out)
err := serializeExpressionList(statement, f.expressions, ", ", out)
if err != nil {
return err
}
@ -44,8 +44,6 @@ func (f *funcExpressionImpl) serialize(statement statementType, out *queryData,
return nil
}
// ------------------- FLOAT FUNCTIONS --------------------------//
type floatFunc struct {
funcExpressionImpl
floatInterfaceImpl
@ -60,20 +58,6 @@ func newFloatFunc(name string, expressions ...expression) FloatExpression {
return floatFunc
}
func COUNTf(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("COUNT", floatExpression)
}
func MAXf(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("MAX", floatExpression)
}
func SUMf(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("SUM", floatExpression)
}
// ------------------- FLOAT FUNCTIONS --------------------------//
type integerFunc struct {
funcExpressionImpl
integerInterfaceImpl
@ -88,14 +72,88 @@ func newIntegerFunc(name string, expressions ...expression) IntegerExpression {
return floatFunc
}
func COUNTi(integerExpression IntegerExpression) IntegerExpression {
return newIntegerFunc("COUNT", integerExpression)
// ------------------ Mathematical functions ---------------//
func ABSf(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("ABS", floatExpression)
}
func ABSi(integerExpression IntegerExpression) FloatExpression {
return newFloatFunc("ABS", integerExpression)
}
func SQRTf(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("SQRT", floatExpression)
}
func SQRTi(integerExpression IntegerExpression) FloatExpression {
return newFloatFunc("SQRT", integerExpression)
}
func CBRTf(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("CBRT", floatExpression)
}
func CBRTi(integerExpression IntegerExpression) FloatExpression {
return newFloatFunc("CBRT", integerExpression)
}
func CEIL(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("CEIL", floatExpression)
}
func FLOOR(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("FLOOR", floatExpression)
}
func ROUND(floatExpression FloatExpression, intExpression ...IntegerExpression) FloatExpression {
if len(intExpression) > 0 {
return newFloatFunc("ROUND", floatExpression, intExpression[0])
}
return newFloatFunc("ROUND", floatExpression)
}
func SIGN(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("SIGN", floatExpression)
}
func TRUNC(floatExpression FloatExpression, intExpression ...IntegerExpression) FloatExpression {
if len(intExpression) > 0 {
return newFloatFunc("TRUNC", floatExpression, intExpression[0])
}
return newFloatFunc("TRUNC", floatExpression)
}
func LN(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("LN", floatExpression)
}
func LOG(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("LOG", floatExpression)
}
// ----------------- Group function operators -------------------//
func MAXf(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("MAX", floatExpression)
}
func MAXi(integerExpression IntegerExpression) IntegerExpression {
return newIntegerFunc("MAX", integerExpression)
}
func SUMf(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("SUM", floatExpression)
}
func SUMi(integerExpression IntegerExpression) IntegerExpression {
return newIntegerFunc("SUM", integerExpression)
}
func COUNTf(floatExpression FloatExpression) FloatExpression {
return newFloatFunc("COUNT", floatExpression)
}
func COUNTi(integerExpression IntegerExpression) IntegerExpression {
return newIntegerFunc("COUNT", integerExpression)
}