Merge pull request taozhi8833998#405 from taozhi8833998/bug-interval

support interval string

Author: taozhi8833998

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sql-parser",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "simple node sql parser",
   "main": "index.js",
   "types": "index.d.ts",

pegjs/postgresql.pegjs

@@ -41,6 +41,7 @@
     'INNER': true,
     'INSERT': true,
     'INTO': true,
+    'INTERVAL': true,
     'IS': true,
 
     'JOIN': true,
@@ -1872,8 +1873,8 @@ expr_list
     }
 
 interval_expr
-  = KW_INTERVAL                    __
-    e:expr                       __
+  = KW_INTERVAL __
+    e:expr __
     u: interval_unit {
       // => { type: 'interval', expr: expr; unit: interval_unit; }
       return {
@@ -1882,6 +1883,15 @@ interval_expr
         unit: u.toLowerCase(),
       }
     }
+  / KW_INTERVAL __
+    e:literal_string  {
+      // => { type: 'interval', expr: expr; unit: interval_unit; }
+      return {
+        type: 'interval',
+        expr: e,
+        unit: '',
+      }
+    }
 
 case_expr
   = KW_CASE                         __

src/interval.js

@@ -1,9 +1,10 @@
-import { toUpper } from './util'
+import { toUpper, hasVal } from './util'
 import { exprToSQL } from './expr'
 
 function intervalToSQL(intervalExpr) {
   const { expr, unit } = intervalExpr
-  return `INTERVAL ${exprToSQL(expr)} ${toUpper(unit)}`
+  const result = ['INTERVAL', exprToSQL(expr), toUpper(unit)]
+  return result.filter(hasVal).join(' ')
 }
 
 export {

test/ast.spec.js

@@ -331,6 +331,16 @@ describe('AST', () => {
         });
 
         describe('date function', () => {
+            it('should interval string', () => {
+                const opt = {
+                    database: 'postgresql'
+                }
+                expect(getParsedSql("SELECT NOW() - INTERVAL '7 DAY'", opt))
+                .to.equal("SELECT NOW() - INTERVAL '7 DAY'");
+                expect(getParsedSql("SELECT NOW() - INTERVAL 7 DAY", opt))
+                    .to.equal("SELECT NOW() - INTERVAL 7 DAY");
+            })
+
             it('should support adddate function', () => {
                 expect(getParsedSql('SELECT ADDDATE(c, INTERVAL 10 DAY) as b FROM tableA'))
                     .to.equal('SELECT ADDDATE(`c`, INTERVAL 10 DAY) AS `b` FROM `tableA`');