fix: add literal string column to columnList in all db

taozhi8833998 · taozhi8833998 · commit 52b388d1dae7 · 2025-07-08T08:49:21.000+08:00
diff --git a/pegjs/athena.pegjs b/pegjs/athena.pegjs
@@ -1089,6 +1089,9 @@ column_list_item
       };
     }
   / e:expr_item __ alias:alias_clause? {
+      if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+        columnList.add(`select::null::${e.value}`)
+      }
       return { type: 'expr', expr: e, as: alias };
     }
 
diff --git a/pegjs/bigquery.pegjs b/pegjs/bigquery.pegjs
@@ -1806,7 +1806,12 @@ column_list_item
         ...getLocationObject()
       }
   }
-  / expr_alias
+  / e:expr_alias {
+    if (e.expr.type === 'double_quote_string' || e.expr.type === 'single_quote_string') {
+      columnList.add(`select::null::${e.expr.value}`)
+    }
+    return e
+  }
 
 alias_clause
   = KW_AS __ i:alias_ident { return i; }
diff --git a/pegjs/db2.pegjs b/pegjs/db2.pegjs
@@ -1117,6 +1117,9 @@ column_list_item
       };
     }
   / e:binary_column_expr __ alias:alias_clause? {
+      if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+        columnList.add(`select::null::${e.value}`)
+      }
       return { expr: e, as: alias };
     }
 
diff --git a/pegjs/flinksql.pegjs b/pegjs/flinksql.pegjs
@@ -1771,6 +1771,9 @@ column_list_item
     }
   / e:binary_column_expr __ alias:alias_clause? {
     // => { type: 'expr'; expr: expr; as?: alias_clause; }
+      if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+        columnList.add(`select::null::${e.value}`)
+      }
       return { type: 'expr', expr: e, as: alias };
     }
 
diff --git a/pegjs/hive.pegjs b/pegjs/hive.pegjs
@@ -1072,6 +1072,9 @@ column_list_item
       };
     }
   / e:expr_item __ alias:alias_clause? {
+      if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+        columnList.add(`select::null::${e.value}`)
+      }
       return { type: 'expr', expr: e, as: alias };
     }
 
diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -2235,6 +2235,9 @@ column_list_item
     return { expr: a, as: alias }
   }
   / e:binary_column_expr __ alias:alias_clause? {
+      if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+        columnList.add(`select::null::${e.value}`)
+      }
       return { expr: e, as: alias };
     }
 
diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -2498,6 +2498,9 @@ column_list_item
     return { expr: a, as: alias }
   }
   / e:binary_column_expr __ alias:alias_clause? {
+    if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+      columnList.add(`select::null::${e.value}`)
+    }
     return { expr: e, as: alias };
   }
 
diff --git a/pegjs/noql.pegjs b/pegjs/noql.pegjs
@@ -2874,6 +2874,9 @@ column_list_item
   }
   / e:expr_item  __ alias:alias_clause? {
     // => { type: 'expr'; expr: expr; as?: alias_clause; }
+      if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+        columnList.add(`select::null::${e.value}`)
+      }
       return { type: 'expr', expr: e, as: alias };
     }
 
diff --git a/pegjs/postgresql.pegjs b/pegjs/postgresql.pegjs
@@ -3521,6 +3521,9 @@ column_list_item
     }
   / e:expr_item __ alias:alias_clause? {
     // => { type: 'expr'; expr: expr; as?: alias_clause; }
+      if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+        columnList.add(`select::null::${e.value}`)
+      }
       return { type: 'expr', expr: e, as: alias };
     }
 
diff --git a/pegjs/redshift.pegjs b/pegjs/redshift.pegjs
@@ -2900,6 +2900,9 @@ column_list_item
     }
   / e:expr_item  __ alias:alias_clause? {
     // => { type: 'expr'; expr: expr; as?: alias_clause; }
+      if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+        columnList.add(`select::null::${e.value}`)
+      }
       return { type: 'expr', expr: e, as: alias };
     }
 
diff --git a/pegjs/snowflake.pegjs b/pegjs/snowflake.pegjs
@@ -2245,6 +2245,9 @@ column_list_item
     }
   / e:expr_item  __ alias:alias_clause? {
     // => { type: 'expr'; expr: expr; as?: alias_clause; }
+      if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+        columnList.add(`select::null::${e.value}`)
+      }
       return { type: 'expr', expr: e, as: alias, ...getLocationObject(), };
     }
 
diff --git a/pegjs/sqlite.pegjs b/pegjs/sqlite.pegjs
@@ -1487,6 +1487,9 @@ column_list_item
       };
     }
   / e:binary_column_expr __ alias:alias_clause? {
+      if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+        columnList.add(`select::null::${e.value}`)
+      }
       return { expr: e, as: alias };
     }
 
diff --git a/pegjs/transactsql.pegjs b/pegjs/transactsql.pegjs
@@ -1529,6 +1529,9 @@ column_list_item
       };
     }
   / e:binary_column_expr __ alias:alias_clause? {
+      if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+        columnList.add(`select::null::${e.value}`)
+      }
       return { expr: e, as: alias };
     }
 value_alias_clause
diff --git a/pegjs/trino.pegjs b/pegjs/trino.pegjs
@@ -2260,6 +2260,9 @@ column_list_item
   }
   / e:expr_item  __ alias:alias_clause? {
     // => { type: 'expr'; expr: expr; as?: alias_clause; }
+      if (e.type === 'double_quote_string' || e.type === 'single_quote_string') {
+        columnList.add(`select::null::${e.value}`)
+      }
       return { type: 'expr', expr: e, as: alias, ...getLocationObject() };
     }
 
diff --git a/test/snowflake.spec.js b/test/snowflake.spec.js
@@ -567,4 +567,13 @@ describe('snowflake', () => {
       expect(() => parser.whiteListCheck(sql, ['select::foo:baz'], opt)).to.throw("authority = 'select::foo.bar::baz' is required in table whiteList to execute SQL = 'SELECT * from foo.bar.baz'")
     })
   })
+
+  describe('columnList contains literal string', () => {
+    it('should contain literal string', () => {
+      const sql = 'SELECT "abcdefg" FROM DUAL'
+      const ast = parser.parse(sql, opt)
+      expect(ast.columnList).to.be.eql(['select::null::abcdefg'])
+      expect(getParsedSql(sql, opt)).to.equal('SELECT "abcdefg" FROM DUAL')
+    })
+  })
 })

Original file line number	Diff line number	Diff line change
`@@ -1089,6 +1089,9 @@ column_list_item`
`1089`	`1089`	`};`
`1090`	`1090`	`}`
`1091`	`1091`	`/ e:expr_item __ alias:alias_clause? {`
	`1092`	`+ if (e.type === 'double_quote_string' \|\| e.type === 'single_quote_string') {`
	`1093`	+ columnList.add(`select::null::${e.value}`)
	`1094`	`+ }`
`1092`	`1095`	`return { type: 'expr', expr: e, as: alias };`
`1093`	`1096`	`}`
`1094`	`1097`
Original file line number	Diff line number	Diff line change
`@@ -1806,7 +1806,12 @@ column_list_item`
`1806`	`1806`	`...getLocationObject()`
`1807`	`1807`	`}`
`1808`	`1808`	`}`
`1809`		`- / expr_alias`
	`1809`	`+ / e:expr_alias {`
	`1810`	`+ if (e.expr.type === 'double_quote_string' \|\| e.expr.type === 'single_quote_string') {`
	`1811`	+ columnList.add(`select::null::${e.expr.value}`)
	`1812`	`+ }`
	`1813`	`+ return e`
	`1814`	`+ }`
`1810`	`1815`
`1811`	`1816`	`alias_clause`
`1812`	`1817`	`= KW_AS __ i:alias_ident { return i; }`
Original file line number	Diff line number	Diff line change
`@@ -1117,6 +1117,9 @@ column_list_item`
`1117`	`1117`	`};`
`1118`	`1118`	`}`
`1119`	`1119`	`/ e:binary_column_expr __ alias:alias_clause? {`
	`1120`	`+ if (e.type === 'double_quote_string' \|\| e.type === 'single_quote_string') {`
	`1121`	+ columnList.add(`select::null::${e.value}`)
	`1122`	`+ }`
`1120`	`1123`	`return { expr: e, as: alias };`
`1121`	`1124`	`}`
`1122`	`1125`
Original file line number	Diff line number	Diff line change
`@@ -1771,6 +1771,9 @@ column_list_item`
`1771`	`1771`	`}`
`1772`	`1772`	`/ e:binary_column_expr __ alias:alias_clause? {`
`1773`	`1773`	`// => { type: 'expr'; expr: expr; as?: alias_clause; }`
	`1774`	`+ if (e.type === 'double_quote_string' \|\| e.type === 'single_quote_string') {`
	`1775`	+ columnList.add(`select::null::${e.value}`)
	`1776`	`+ }`
`1774`	`1777`	`return { type: 'expr', expr: e, as: alias };`
`1775`	`1778`	`}`
`1776`	`1779`
Original file line number	Diff line number	Diff line change
`@@ -1072,6 +1072,9 @@ column_list_item`
`1072`	`1072`	`};`
`1073`	`1073`	`}`
`1074`	`1074`	`/ e:expr_item __ alias:alias_clause? {`
	`1075`	`+ if (e.type === 'double_quote_string' \|\| e.type === 'single_quote_string') {`
	`1076`	+ columnList.add(`select::null::${e.value}`)
	`1077`	`+ }`
`1075`	`1078`	`return { type: 'expr', expr: e, as: alias };`
`1076`	`1079`	`}`
`1077`	`1080`
Original file line number	Diff line number	Diff line change
`@@ -2235,6 +2235,9 @@ column_list_item`
`2235`	`2235`	`return { expr: a, as: alias }`
`2236`	`2236`	`}`
`2237`	`2237`	`/ e:binary_column_expr __ alias:alias_clause? {`
	`2238`	`+ if (e.type === 'double_quote_string' \|\| e.type === 'single_quote_string') {`
	`2239`	+ columnList.add(`select::null::${e.value}`)
	`2240`	`+ }`
`2238`	`2241`	`return { expr: e, as: alias };`
`2239`	`2242`	`}`
`2240`	`2243`
Original file line number	Diff line number	Diff line change
`@@ -2498,6 +2498,9 @@ column_list_item`
`2498`	`2498`	`return { expr: a, as: alias }`
`2499`	`2499`	`}`
`2500`	`2500`	`/ e:binary_column_expr __ alias:alias_clause? {`
	`2501`	`+ if (e.type === 'double_quote_string' \|\| e.type === 'single_quote_string') {`
	`2502`	+ columnList.add(`select::null::${e.value}`)
	`2503`	`+ }`
`2501`	`2504`	`return { expr: e, as: alias };`
`2502`	`2505`	`}`
`2503`	`2506`
Original file line number	Diff line number	Diff line change
`@@ -2874,6 +2874,9 @@ column_list_item`
`2874`	`2874`	`}`
`2875`	`2875`	`/ e:expr_item __ alias:alias_clause? {`
`2876`	`2876`	`// => { type: 'expr'; expr: expr; as?: alias_clause; }`
	`2877`	`+ if (e.type === 'double_quote_string' \|\| e.type === 'single_quote_string') {`
	`2878`	+ columnList.add(`select::null::${e.value}`)
	`2879`	`+ }`
`2877`	`2880`	`return { type: 'expr', expr: e, as: alias };`
`2878`	`2881`	`}`
`2879`	`2882`
Original file line number	Diff line number	Diff line change
`@@ -3521,6 +3521,9 @@ column_list_item`
`3521`	`3521`	`}`
`3522`	`3522`	`/ e:expr_item __ alias:alias_clause? {`
`3523`	`3523`	`// => { type: 'expr'; expr: expr; as?: alias_clause; }`
	`3524`	`+ if (e.type === 'double_quote_string' \|\| e.type === 'single_quote_string') {`
	`3525`	+ columnList.add(`select::null::${e.value}`)
	`3526`	`+ }`
`3524`	`3527`	`return { type: 'expr', expr: e, as: alias };`
`3525`	`3528`	`}`
`3526`	`3529`
Original file line number	Diff line number	Diff line change
`@@ -2900,6 +2900,9 @@ column_list_item`
`2900`	`2900`	`}`
`2901`	`2901`	`/ e:expr_item __ alias:alias_clause? {`
`2902`	`2902`	`// => { type: 'expr'; expr: expr; as?: alias_clause; }`
	`2903`	`+ if (e.type === 'double_quote_string' \|\| e.type === 'single_quote_string') {`
	`2904`	+ columnList.add(`select::null::${e.value}`)
	`2905`	`+ }`
`2903`	`2906`	`return { type: 'expr', expr: e, as: alias };`
`2904`	`2907`	`}`
`2905`	`2908`