Merge branch 'master' into sgress454/allow-string-concat-in-like

taozhi8833998 · web-flow · commit 638d2c3e9ae9 · 2025-09-08T18:23:51.000+08:00
diff --git a/.babelrc b/.babelrc
@@ -13,8 +13,5 @@
         "debug": false
       }
     ]
-  ],
-  "plugins": [
-    "@babel/plugin-proposal-object-rest-spread"
   ]
-}
+}
diff --git a/.eslintrc b/.eslintrc
@@ -82,6 +82,7 @@
     ],
     "max-len": 0,
     "prefer-arrow-callback": 2,
+    "prefer-object-spread": "error",
     "arrow-spacing": [
       2,
       {
@@ -138,4 +139,4 @@
     "no-process-env": 0,
     "default-case": 0
   }
-}
+}
diff --git a/ast/postgresql.ts b/ast/postgresql.ts
@@ -284,7 +284,7 @@ export type create_table_definition = create_definition[];
 
 export type create_definition = create_column_definition | create_index_definition | create_fulltext_spatial_index_definition | create_constraint_definition;
 
-export type column_definition_opt = column_constraint | { auto_increment: 'auto_increment'; } | { unique: 'unique' | 'unique key'; } | { unique: 'key' | 'primary key'; } | { comment: keyword_comment; } | { collate: collate_expr; } | { column_format: column_format; } | { storage: storage } | { reference_definition: reference_definition; } | { check: check_constraint_definition; } | { character_set: { type: 'CHARACTER SET'; symbol: '=' | null; value: ident_without_kw_type; } };
+export type column_definition_opt = column_constraint | { auto_increment: 'auto_increment'; } | { unique: 'unique' | 'unique key'; } | { unique: 'key' | 'primary key'; } | { comment: keyword_comment; } | { generated_by_default: { type: 'origin', value: string } } | { collate: collate_expr; } | { column_format: column_format; } | { storage: storage } | { reference_definition: reference_definition; } | { check: check_constraint_definition; } | { character_set: { type: 'CHARACTER SET'; symbol: '=' | null; value: ident_without_kw_type; } };
 
 
 
@@ -1719,6 +1719,8 @@ type KW_SMALLINT = never;
 
 type KW_SERIAL = never;
 
+type KW_SMALLSERIAL = never;
+
 type KW_TINYINT = never;
 
 type KW_TINYTEXT = never;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-sql-parser",
-  "version": "5.3.11",
+  "version": "5.3.12",
   "description": "simple node sql parser",
   "main": "index.js",
   "types": "types.d.ts",
@@ -56,7 +56,6 @@
   "devDependencies": {
     "@babel/cli": "^7.5.5",
     "@babel/core": "^7.10.5",
-    "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
     "@babel/preset-env": "^7.10.4",
     "@babel/register": "^7.10.5",
     "@types/chai": "^4.1.7",
diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -30,6 +30,7 @@
     'ELSE': true,
     'END': true,
     'EXISTS': true,
+    'EXCEPT': true,
     'EXPLAIN': true,
 
     'FALSE': true,
@@ -296,6 +297,7 @@ set_op
   }
   / KW_MINUS { return 'minus' }
   / KW_INTERSECT { return 'intersect' }
+  / KW_EXCEPT { return 'except' }
 
 set_op_stmt
   = head:select_stmt tail:(__ set_op __ select_stmt)* __ ob: order_by_clause? __ l:limit_clause? {
@@ -3843,6 +3845,7 @@ KW_OVER     = "OVER"i     !ident_start
 KW_UNION    = "UNION"i    !ident_start
 KW_MINUS    = "MINUS"i    !ident_start
 KW_INTERSECT    = "INTERSECT"i    !ident_start
+KW_EXCEPT    = "EXCEPT"i    !ident_start
 KW_VALUES   = "VALUES"i   !ident_start
 KW_USING    = "USING"i    !ident_start
 
diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -491,6 +491,7 @@ set_op
   }
   / KW_MINUS { return 'minus' }
   / KW_INTERSECT { return 'intersect' }
+  / KW_EXCEPT { return 'except' }
 
 set_op_stmt
   = head:select_stmt tail:(__ set_op __ select_stmt)* __ ob: order_by_clause? __ l:limit_clause? {
@@ -2289,7 +2290,7 @@ with_clause
     }
 
 cte_definition
-  = name:(literal_string / ident_name / table_name) __ columns:cte_column_definition? __ KW_AS __ LPAREN __ stmt:set_op_stmt __ RPAREN {
+  = name:(literal_string / ident_name / table_name) __ columns:cte_column_definition? __ KW_AS __ LPAREN __ stmt:(value_clause / set_op_stmt) __ RPAREN {
     if (typeof name === 'string') name = { type: 'default', value: name }
     if (name.table) name = { type: 'default', value: name.table }
     return { name, stmt, columns };
@@ -4126,6 +4127,7 @@ KW_OVER     = "OVER"i     !ident_start
 KW_UNION    = "UNION"i    !ident_start
 KW_MINUS    = "MINUS"i    !ident_start
 KW_INTERSECT    = "INTERSECT"i    !ident_start
+KW_EXCEPT    = "EXCEPT"i    !ident_start
 KW_VALUES   = "VALUES"i   !ident_start
 KW_USING    = "USING"i    !ident_start
 
diff --git a/pegjs/snowflake.pegjs b/pegjs/snowflake.pegjs
@@ -2504,7 +2504,7 @@ table_base
     // => table_name & { as?: alias_clause; }
       if (t.type === 'var') {
         t.as = alias;
-        Object.assign(t, {...getLocationObject()})
+        t = { ...t, ...getLocationObject() }
         return t;
       } else {
         return {
diff --git a/pegjs/sqlite.pegjs b/pegjs/sqlite.pegjs
@@ -2427,7 +2427,7 @@ over_partition
   }
   / on_update_current_timestamp
 aggr_fun_count
-  = name:KW_COUNT __ LPAREN __ arg:count_arg __ RPAREN __ bc:over_partition? {
+  = name:(KW_COUNT / KW_GROUP_CONCAT) __ LPAREN __ arg:count_arg __ RPAREN __ bc:over_partition? {
       return {
         type: 'aggr_func',
         name: name,
@@ -2805,6 +2805,7 @@ KW_AND      = "AND"i        !ident_start { return 'AND'; }
 KW_OR       = "OR"i         !ident_start { return 'OR'; }
 
 KW_COUNT    = "COUNT"i      !ident_start { return 'COUNT'; }
+KW_GROUP_CONCAT = "GROUP_CONCAT"i  !ident_start { return 'GROUP_CONCAT'; }
 KW_MAX      = "MAX"i        !ident_start { return 'MAX'; }
 KW_MIN      = "MIN"i        !ident_start { return 'MIN'; }
 KW_SUM      = "SUM"i        !ident_start { return 'SUM'; }
diff --git a/pegjs/trino.pegjs b/pegjs/trino.pegjs
@@ -66,6 +66,7 @@
     'RENAME': true,
     // 'REPLACE': true,
     'RIGHT': true,
+    'ROW': true,
     'ROWS': true,
 
     'SELECT': true,
@@ -2470,7 +2471,7 @@ table_base
     // => table_name & { as?: alias_clause; }
       if (t.type === 'var') {
         t.as = alias;
-        Object.assign(t, {...getLocationObject()})
+        t = { ...t, ...getLocationObject() }
         return t;
       } else {
         return {
@@ -3073,6 +3074,21 @@ case_else = KW_ELSE __ result:expr {
     return { type: 'else', result: result };
   }
 
+row_value_list
+  = head:column_list_item tail:(__ COMMA __ column_list_item)* {
+      // => column_list_item[]
+      return createList(head, tail);
+    }
+
+row_expr
+  = KW_ROW __ LPAREN __ l:row_value_list __ RPAREN {
+    // => { type: 'row_constructor', value: row_value_list }
+    return {
+      type: 'struct',
+      keyword: 'row',
+      expr_list: l
+    };
+  }
 /**
  * Borrowed from PL/SQL ,the priority of below list IS ORDER BY DESC
  * ---------------------------------------------------------------------------------------------------
@@ -3347,6 +3363,7 @@ column_ref_array_index
   }
 primary
   = cast_expr
+  / row_expr
   / LPAREN __ list:or_and_where_expr __ RPAREN {
     // => or_and_where_expr
         list.parentheses = true;
@@ -4396,6 +4413,7 @@ KW_BIGSERIAL   = "BIGSERIAL"i   !ident_start { return 'BIGSERIAL'; }
 KW_REAL     = "REAL"i   !ident_start { return 'REAL'; }
 KW_DATE     = "DATE"i     !ident_start { return 'DATE'; }
 KW_DATETIME     = "DATETIME"i     !ident_start { return 'DATETIME'; }
+KW_ROW      = "ROW"i      !ident_start { return 'ROW'; }
 KW_ROWS     = "ROWS"i     !ident_start { return 'ROWS'; }
 KW_TIME     = "TIME"i     !ident_start { return 'TIME'; }
 KW_TIMESTAMP= "TIMESTAMP"i!ident_start { return 'TIMESTAMP'; }
diff --git a/src/array-struct.js b/src/array-struct.js
@@ -22,6 +22,7 @@ function arrayStructValueToSQL(expr) {
   } = expr
   switch (toUpper(type)) {
     case 'STRUCT':
+    case 'ROW':
       return `(${columnsToSQL(exprList)})`
     case 'ARRAY':
       return arrayExprListToSQL(expr)
diff --git a/src/with.js b/src/with.js
@@ -1,6 +1,6 @@
 import { columnRefToSQL } from './column'
 import { exprToSQL } from './expr'
-import { identifierToSql, literalToSQL } from './util'
+import { commonOptionConnector, identifierToSql, literalToSQL } from './util'
 
 /**
  * @param {Array<Object>} withExpr
@@ -11,7 +11,8 @@ function withToSQL(withExpr) {
   const withExprStr = withExpr.map(cte => {
     const { name, stmt, columns } = cte
     const column = Array.isArray(columns) ? `(${columns.map(columnRefToSQL).join(', ')})` : ''
-    return `${name.type === 'default' ? identifierToSql(name.value) : literalToSQL(name)}${column} AS (${exprToSQL(stmt)})`
+    const expr = commonOptionConnector(stmt.type === 'values' ? 'VALUES' : '', exprToSQL, stmt)
+    return `${name.type === 'default' ? identifierToSql(name.value) : literalToSQL(name)}${column} AS (${expr})`
   }).join(', ')
 
   return `WITH ${isRecursive}${withExprStr}`
diff --git a/test/mysql-mariadb.spec.js b/test/mysql-mariadb.spec.js
@@ -1326,6 +1326,20 @@ describe('mysql', () => {
           "SELECT `crème` AS `brûlée` FROM `café` WHERE `âtre` = 'Molière'"
         ]
       },
+      {
+        title: 'with clause',
+        sql: [
+          "WITH T AS (VALUES ROW('foobar')) SELECT * FROM T",
+          "WITH `T` AS (VALUES ROW('foobar')) SELECT * FROM `T`"
+        ]
+      },
+      {
+        title: 'except clause',
+        sql: [
+          "SELECT * FROM T1 EXCEPT SELECT * FROM T2",
+          "SELECT * FROM `T1` EXCEPT SELECT * FROM `T2`"
+        ]
+      },
     ]
     SQL_LIST.forEach(sqlInfo => {
       const { title, sql } = sqlInfo
diff --git a/test/sqlite.spec.js b/test/sqlite.spec.js
@@ -273,4 +273,20 @@ describe('sqlite', () => {
     const sql = `SELECT * FROM file WHERE path LIKE 'C:' || CHAR(92) || 'Users' || CHAR(92) || 'example.txt'`
     expect(getParsedSql(sql)).to.be.equal(`SELECT * FROM "file" WHERE "path" LIKE 'C:' || CHAR(92) || 'Users' || CHAR(92) || 'example.txt'`)
   })
+  it('should support GROUP_CONCAT', () => {
+    const sql = `SELECT
+        CASE
+            WHEN rs.url LIKE 'http://%' THEN SUBSTR(rs.url, 8, INSTR(SUBSTR(rs.url, 8), '/') - 1)
+            WHEN rs.url LIKE 'https://%' THEN SUBSTR(rs.url, 9, INSTR(SUBSTR(rs.url, 9), '/') - 1)
+            ELSE SUBSTR(rs.url, 1, INSTR(rs.url, '/') - 1)
+        END AS domain,
+        COUNT(*) AS total_citations,
+        COUNT(DISTINCT mr.model_id) AS models_citing,
+        COUNT(DISTINCT mr.response_id) AS responses_citing,
+        GROUP_CONCAT(DISTINCT m.model_name) AS citing_models,
+        AVG(mr.brand_visibility_score) AS avg_visibility_score,
+        AVG(mr.recommendation_quality_score) AS avg_recommendation_quality
+    FROM response_sources rs`
+    expect(getParsedSql(sql)).to.be.equal(`SELECT CASE WHEN "rs"."url" LIKE 'http://%' THEN SUBSTR("rs"."url", 8, INSTR(SUBSTR("rs"."url", 8), '/') - 1) WHEN "rs"."url" LIKE 'https://%' THEN SUBSTR("rs"."url", 9, INSTR(SUBSTR("rs"."url", 9), '/') - 1) ELSE SUBSTR("rs"."url", 1, INSTR("rs"."url", '/') - 1) END AS "domain", COUNT(*) AS "total_citations", COUNT(DISTINCT "mr"."model_id") AS "models_citing", COUNT(DISTINCT "mr"."response_id") AS "responses_citing", GROUP_CONCAT(DISTINCT "m"."model_name") AS "citing_models", AVG("mr"."brand_visibility_score") AS "avg_visibility_score", AVG("mr"."recommendation_quality_score") AS "avg_recommendation_quality" FROM "response_sources" AS "rs"`)
+  })
 })
diff --git a/test/trino.spec.js b/test/trino.spec.js
@@ -97,6 +97,13 @@ describe('trino', () => {
         'SELECT a[1][2], a[2] FROM t',
         'SELECT a[1][2], a[2] FROM "t"'
       ]
+    },
+    {
+      title: 'ROW expression',
+      sql: [
+        'SELECT ROW(12 AS x, 122 y) FROM t',
+        'SELECT ROW(12 AS "x", 122 AS "y") FROM "t"'
+      ]
     }
   ]
   SQL_LIST.forEach(sqlInfo => {

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,5 @@`
`13`	`13`	`"debug": false`
`14`	`14`	`}`
`15`	`15`	`]`
`16`		`- ],`
`17`		`- "plugins": [`
`18`		`- "@babel/plugin-proposal-object-rest-spread"`
`19`	`16`	`]`
`20`		`-}`
	`17`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@`
`82`	`82`	`],`
`83`	`83`	`"max-len": 0,`
`84`	`84`	`"prefer-arrow-callback": 2,`
	`85`	`+ "prefer-object-spread": "error",`
`85`	`86`	`"arrow-spacing": [`
`86`	`87`	`2,`
`87`	`88`	`{`
`@@ -138,4 +139,4 @@`
`138`	`139`	`"no-process-env": 0,`
`139`	`140`	`"default-case": 0`
`140`	`141`	`}`
`141`		`-}`
	`142`	`+}`