feat: support make_interval func in pg

Author: taozhi8833998

pegjs/postgresql.pegjs

@@ -5006,8 +5006,37 @@ substring_funcs_clause
         separator
       }
   }
+
+make_interval_func_args_item
+  = n:('years'i / 'months'i / 'weeks'i / 'days'i / 'hours'i / 'mins'i) __ '=>' __ v:(integer / expr) {
+    // => { type: 'func_arg', value: { name: ident_name; symbol: '=>', value: literal_numeric; } }
+      return { type: 'func_arg', value: { name: n, symbol: '=>', expr: v } };
+    }
+  / n:('secs'i) __ '=>' __ v:(double_float / expr) {
+    // => IGNORE
+      return { type: 'func_arg', value: { name: n, symbol: '=>', expr: v } };
+    }
+
+make_interval_func_args
+  = head:make_interval_func_args_item tail:(__ COMMA __ make_interval_func_args_item)* {
+    // => make_interval_func_args_item[]
+      return { type: 'expr_list', value: createList(head, tail) };
+    }
+  / expr_list
+  
+make_interval_func_clause
+  = name:'make_interval'i __ LPAREN __ l:make_interval_func_args __ RPAREN {
+    // => { type: 'function'; name: proc_func_name; args: make_interval_func_args; }
+      return {
+        type: 'function',
+        name: { name: [{ type: 'origin', value: name }] },
+        args: l,
+        ...getLocationObject(),
+      }
+  }
+  
 func_call
-  = trim_func_clause / tablefunc_clause / substring_funcs_clause
+  = trim_func_clause / tablefunc_clause / substring_funcs_clause / make_interval_func_clause
   / name:'now'i __ LPAREN __ l:expr_list? __ RPAREN __ 'at'i __ KW_TIME __ 'zone'i __ z:literal_string {
     // => { type: 'function'; name: proc_func_name; args: expr_list; suffix: literal_string; }
       z.prefix = 'at time zone'
@@ -5338,49 +5367,52 @@ line_terminator
 literal_numeric
   = n:number {
     // => number | { type: 'bigint'; value: string; }
-      if (n && n.type === 'bigint') return n
+      if (n && typeof n === 'object') return n
       return { type: 'number', value: n };
     }
 
-number
-  = int_:int? frac:frac exp:exp {
-    const numStr = (int_ || '') + frac + exp
+integer
+  = int_:int exp:exp {
+    // => IGNORE
+    const numStr = int_ + exp
     return {
       type: 'bigint',
       value: numStr
     }
   }
-  / int_:int? frac:frac {
+  / int_:int {
     // => IGNORE
-    const numStr = (int_ || '') + frac
-    if (int_ && isBigInt(int_)) return {
+    if (isBigInt(int_)) return {
       type: 'bigint',
-      value: numStr
+      value: int_
     }
-    return parseFloat(numStr);
+    return { type: 'number', value: parseFloat(int_) };
   }
-  / int_:int exp:exp {
-    // => IGNORE
-    const numStr = int_ + exp
+double_float
+  = int_:int? frac:frac exp:exp {
+    const numStr = (int_ || '') + frac + exp
     return {
       type: 'bigint',
       value: numStr
     }
   }
-  / int_:int {
+  / int_:int? frac:frac {
     // => IGNORE
-    if (isBigInt(int_)) return {
+    const numStr = (int_ || '') + frac
+    if (int_ && isBigInt(int_)) return {
       type: 'bigint',
-      value: int_
+      value: numStr
     }
-    return parseFloat(int_);
+    return parseFloat(numStr);
   }
+number
+  = double_float / integer
 
 int
   = digits
   / digit:digit
   / op:("-" / "+" ) digits:digits { return op + digits; }
-   / op:("-" / "+" ) digit:digit { return op + digit; }
+  / op:("-" / "+" ) digit:digit { return op + digit; }
 
 frac
   = "." digits:digits { return "." + digits; }

src/expr.js

@@ -6,7 +6,7 @@ import { binaryToSQL } from './binary'
 import { caseToSQL } from './case'
 import { collateToSQL } from './collate'
 import { columnDefinitionToSQL, columnRefToSQL, fullTextSearchToSQL } from './column'
-import { anyValueFuncToSQL, castToSQL, extractFunToSQL, flattenFunToSQL, funcToSQL, jsonObjectArgToSQL, lambdaToSQL, tablefuncFunToSQL } from './func'
+import { anyValueFuncToSQL, castToSQL, extractFunToSQL, flattenFunToSQL, funcArgToSQL, funcToSQL, jsonObjectArgToSQL, lambdaToSQL, tablefuncFunToSQL } from './func'
 import { intervalToSQL } from './interval'
 import { jsonExprToSQL, jsonVisitorExprToSQL } from './json'
 import { selectToSQL } from './select'
@@ -40,6 +40,7 @@ const exprToSQLConvertFn = {
   json              : jsonExprToSQL,
   json_object_arg   : jsonObjectArgToSQL,
   json_visitor      : jsonVisitorExprToSQL,
+  func_arg          : funcArgToSQL,
   show              : showToSQL,
   struct            : arrayStructExprToSQL,
   tablefunc         : tablefuncFunToSQL,

src/func.js

@@ -86,6 +86,11 @@ function flattenFunToSQL(stmt) {
   return `${toUpper(type)}(${argsStr})`
 }
 
+function funcArgToSQL(argExpr) {
+  const { name, symbol, expr } = argExpr.value
+  return [name, symbol, exprToSQL(expr)].filter(hasVal).join(' ')
+}
+
 function funcToSQL(expr) {
   const { args, array_index, name, args_parentheses, parentheses, over, suffix } = expr
   const overStr = overToSQL(over)
@@ -132,6 +137,7 @@ export {
   castToSQL,
   extractFunToSQL,
   flattenFunToSQL,
+  funcArgToSQL,
   funcToSQL,
   jsonObjectArgToSQL,
   lambdaToSQL,

test/postgres.spec.js

@@ -1748,6 +1748,19 @@ describe('Postgres', () => {
         'DROP VIEW "view_name"'
       ]
     },
+    {
+      title: 'make interval func',
+      sql: [
+        `SELECT
+            gid,
+            '2020-01-01 00:00:00'::TIMESTAMP WITH TIME ZONE + make_interval(secs => (
+                (gid - (SELECT min(gid) FROM nyct20))::FLOAT / (SELECT max(gid) - min(gid) FROM nyct20)) * 31536000 -- One year in seconds
+            ) AS generated_timestamp
+        FROM
+            nyct20;`,
+        `SELECT gid, '2020-01-01 00:00:00'::TIMESTAMP WITH TIME ZONE + MAKE_INTERVAL(secs => ((gid - (SELECT MIN(gid) FROM "nyct20"))::FLOAT / (SELECT MAX(gid) - MIN(gid) FROM "nyct20")) * 31536000) AS "generated_timestamp" FROM "nyct20"`
+      ]
+    },
   ]
   function neatlyNestTestedSQL(sqlList){
     sqlList.forEach(sqlInfo => {