From 3ec0e2cabdc27fb68132508b5c369e01deea236e Mon Sep 17 00:00:00 2001 From: Mathieu Kooiman Date: Sat, 13 Jul 2024 17:04:33 +0200 Subject: [PATCH] refactor: NewCustomExpression -> CustomExpression --- internal/jet/expression.go | 2 +- internal/jet/func_expression.go | 2 +- internal/jet/group_by_clause.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/jet/expression.go b/internal/jet/expression.go index aedb555..05b1797 100644 --- a/internal/jet/expression.go +++ b/internal/jet/expression.go @@ -278,7 +278,7 @@ type customExpression struct { parts []Serializer } -func NewCustomExpression(parts ...Serializer) Expression { +func CustomExpression(parts ...Serializer) Expression { ret := customExpression{ parts: parts, } diff --git a/internal/jet/func_expression.go b/internal/jet/func_expression.go index 43c7ec3..7e49880 100644 --- a/internal/jet/func_expression.go +++ b/internal/jet/func_expression.go @@ -548,7 +548,7 @@ func TO_TIMESTAMP(timestampzStr, format StringExpression) TimestampzExpression { // EXTRACT extracts time component from time expression func EXTRACT(field string, from Expression) Expression { - return NewCustomExpression(Token("EXTRACT("), Token(field), Token("FROM"), from, Token(")")) + return CustomExpression(Token("EXTRACT("), Token(field), Token("FROM"), from, Token(")")) } // CURRENT_DATE returns current date diff --git a/internal/jet/group_by_clause.go b/internal/jet/group_by_clause.go index 59e244b..017bb4e 100644 --- a/internal/jet/group_by_clause.go +++ b/internal/jet/group_by_clause.go @@ -35,7 +35,7 @@ func GROUPING(expressions ...Expression) IntegerExpression { // WITH_ROLLUP operator is used with the GROUP BY clause to generate all prefixes of a group of columns including the empty list. // It creates extra rows in the result set that represent the subtotal values for each combination of columns. func WITH_ROLLUP(expressions ...Expression) GroupByClause { - return NewCustomExpression( + return CustomExpression( parametersSerializer(expressions), Token("WITH ROLLUP"), ) }