Merge pull request #2526 from taozhi8833998/refactor-column-accent

taozhi8833998 · web-flow · commit 95f3a673d395 · 2025-08-11T09:23:22.000+08:00
refactor: column name starts with an accent
diff --git a/pegjs/db2.pegjs b/pegjs/db2.pegjs
@@ -1967,7 +1967,7 @@ column_name
 ident_name
   =  start:ident_start parts:ident_part* { return start + parts.join(''); }
 
-ident_start = [A-Za-z_\u4e00-\u9fa5]
+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]
 
 ident_part  = [A-Za-z0-9_$\u4e00-\u9fa5\u00C0-\u017F]
 
diff --git a/pegjs/flinksql.pegjs b/pegjs/flinksql.pegjs
@@ -1745,7 +1745,7 @@ expr_item
     if (a) e.array_index = a
     return e
   }
-  
+
 column_list_item
   = e:binary_column_expr s:KW_DOUBLE_COLON t:data_type {
     // => { type: 'cast'; expr: expr; symbol: '::'; target: data_type;  as?: null; }
@@ -2831,7 +2831,7 @@ ident_name
       return start + parts.join('');
     }
 
-ident_start = [A-Za-z_\u4e00-\u9fa5]
+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]
 
 ident_part  = [A-Za-z0-9_\-$\u4e00-\u9fa5\u00C0-\u017F]
 
diff --git a/pegjs/hive.pegjs b/pegjs/hive.pegjs
@@ -1924,7 +1924,7 @@ column_name
 ident_name
   =  start:ident_start parts:ident_part* { return start + parts.join(''); }
 
-ident_start = [A-Za-z_\u4e00-\u9fa5]
+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]
 
 ident_part  = [A-Za-z0-9_$\u4e00-\u9fa5\u00C0-\u017F]
 
diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -3198,7 +3198,7 @@ column_name
 ident_name
   =  start:ident_start parts:ident_part* { return start + parts.join(''); }
 
-ident_start = [A-Za-z_\u4e00-\u9fa5]
+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]
 
 ident_part  = [A-Za-z0-9_$$\u4e00-\u9fa5\u00C0-\u017F]
 
diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -3478,7 +3478,7 @@ column_name
 ident_name
   =  start:ident_start parts:ident_part* { return start + parts.join(''); }
 
-ident_start = [A-Za-z_\u4e00-\u9fa5]
+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]
 
 ident_part  = [A-Za-z0-9_$\u0080-\uffff]
 
diff --git a/pegjs/noql.pegjs b/pegjs/noql.pegjs
@@ -4097,7 +4097,7 @@ ident_name
       return start + parts.join('');
     }
 
-ident_start = [A-Za-z_\u4e00-\u9fa5]
+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]
 
 ident_part  = [A-Za-z0-9_\-$\u4e00-\u9fa5\u00C0-\u017F]
 
diff --git a/pegjs/postgresql.pegjs b/pegjs/postgresql.pegjs
@@ -4838,7 +4838,7 @@ ident_name
       return start + parts.join('');
     }
 
-ident_start = [A-Za-z_\u4e00-\u9fa5]
+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]
 
 ident_part  = [A-Za-z0-9_\-$\u4e00-\u9fa5\u00C0-\u017F]
 
diff --git a/pegjs/redshift.pegjs b/pegjs/redshift.pegjs
@@ -4156,7 +4156,7 @@ ident_name
       return start + parts.join('');
     }
 
-ident_start = [A-Za-z_\u4e00-\u9fa5]
+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]
 
 ident_part  = [A-Za-z0-9_\-$\u4e00-\u9fa5\u00C0-\u017F]
 
@@ -4447,7 +4447,7 @@ position_func_clause
         ...getLocationObject(),
     };
   }
-  
+
 func_call
   = trim_func_clause / tablefunc_clause / position_func_clause
   / name:'now'i __ LPAREN __ l:expr_list? __ RPAREN __ 'at'i __ KW_TIME __ 'zone'i __ z:literal_string {
diff --git a/pegjs/trino.pegjs b/pegjs/trino.pegjs
@@ -3553,7 +3553,7 @@ ident_name
       return start + parts.join('');
     }
 
-ident_start = [A-Za-z_\u4e00-\u9fa5]
+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]
 
 ident_part  = [A-Za-z0-9_$\u0080-\uffff]
 
diff --git a/test/mysql-mariadb.spec.js b/test/mysql-mariadb.spec.js
@@ -1319,6 +1319,13 @@ describe('mysql', () => {
           "SELECT `crème` AS `brûlée` FROM `café` WHERE `théâtre` = 'Molière'"
         ]
       },
+      {
+        title: 'support accentuated identifiers',
+        sql: [
+          "SELECT crème AS brûlée FROM café WHERE âtre = 'Molière'",
+          "SELECT `crème` AS `brûlée` FROM `café` WHERE `âtre` = 'Molière'"
+        ]
+      },
     ]
     SQL_LIST.forEach(sqlInfo => {
       const { title, sql } = sqlInfo
diff --git a/test/postgres.spec.js b/test/postgres.spec.js
@@ -2390,7 +2390,7 @@ describe('Postgres', () => {
     it('should throw error', () => {
       const sql = "select 1 as 'one'"
       const fun = parser.astify.bind(parser, sql, opt)
-      expect(fun).to.throw(`Expected "--", "/*", "\\"", [ \\t\\n\\r], or [A-Za-z_一-龥] but "'" found.`)
+      expect(fun).to.throw(`Expected "--", "/*", "\\"", [ \\t\\n\\r], or [A-Za-z_一-龥À-ſ] but "'" found.`)
     })
   })
   describe('pg parse speed', function () {

Original file line number	Diff line number	Diff line change
`@@ -1745,7 +1745,7 @@ expr_item`
`1745`	`1745`	`if (a) e.array_index = a`
`1746`	`1746`	`return e`
`1747`	`1747`	`}`
`1748`		`-`
	`1748`	`+`
`1749`	`1749`	`column_list_item`
`1750`	`1750`	`= e:binary_column_expr s:KW_DOUBLE_COLON t:data_type {`
`1751`	`1751`	`// => { type: 'cast'; expr: expr; symbol: '::'; target: data_type; as?: null; }`
`@@ -2831,7 +2831,7 @@ ident_name`
`2831`	`2831`	`return start + parts.join('');`
`2832`	`2832`	`}`
`2833`	`2833`
`2834`		`-ident_start = [A-Za-z_\u4e00-\u9fa5]`
	`2834`	`+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]`
`2835`	`2835`
`2836`	`2836`	`ident_part = [A-Za-z0-9_\-$\u4e00-\u9fa5\u00C0-\u017F]`
`2837`	`2837`
Original file line number	Diff line number	Diff line change
`@@ -4097,7 +4097,7 @@ ident_name`
`4097`	`4097`	`return start + parts.join('');`
`4098`	`4098`	`}`
`4099`	`4099`
`4100`		`-ident_start = [A-Za-z_\u4e00-\u9fa5]`
	`4100`	`+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]`
`4101`	`4101`
`4102`	`4102`	`ident_part = [A-Za-z0-9_\-$\u4e00-\u9fa5\u00C0-\u017F]`
`4103`	`4103`
Original file line number	Diff line number	Diff line change
`@@ -4838,7 +4838,7 @@ ident_name`
`4838`	`4838`	`return start + parts.join('');`
`4839`	`4839`	`}`
`4840`	`4840`
`4841`		`-ident_start = [A-Za-z_\u4e00-\u9fa5]`
	`4841`	`+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]`
`4842`	`4842`
`4843`	`4843`	`ident_part = [A-Za-z0-9_\-$\u4e00-\u9fa5\u00C0-\u017F]`
`4844`	`4844`
Original file line number	Diff line number	Diff line change
`@@ -4156,7 +4156,7 @@ ident_name`
`4156`	`4156`	`return start + parts.join('');`
`4157`	`4157`	`}`
`4158`	`4158`
`4159`		`-ident_start = [A-Za-z_\u4e00-\u9fa5]`
	`4159`	`+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]`
`4160`	`4160`
`4161`	`4161`	`ident_part = [A-Za-z0-9_\-$\u4e00-\u9fa5\u00C0-\u017F]`
`4162`	`4162`
`@@ -4447,7 +4447,7 @@ position_func_clause`
`4447`	`4447`	`...getLocationObject(),`
`4448`	`4448`	`};`
`4449`	`4449`	`}`
`4450`		`-`
	`4450`	`+`
`4451`	`4451`	`func_call`
`4452`	`4452`	`= trim_func_clause / tablefunc_clause / position_func_clause`
`4453`	`4453`	`/ name:'now'i __ LPAREN __ l:expr_list? __ RPAREN __ 'at'i __ KW_TIME __ 'zone'i __ z:literal_string {`
Original file line number	Diff line number	Diff line change
`@@ -3553,7 +3553,7 @@ ident_name`
`3553`	`3553`	`return start + parts.join('');`
`3554`	`3554`	`}`
`3555`	`3555`
`3556`		`-ident_start = [A-Za-z_\u4e00-\u9fa5]`
	`3556`	`+ident_start = [A-Za-z_\u4e00-\u9fa5\u00C0-\u017F]`
`3557`	`3557`
`3558`	`3558`	`ident_part = [A-Za-z0-9_$\u0080-\uffff]`
`3559`	`3559`
Original file line number	Diff line number	Diff line change
`@@ -1319,6 +1319,13 @@ describe('mysql', () => {`
`1319`	`1319`	"SELECT `crème` AS `brûlée` FROM `café` WHERE `théâtre` = 'Molière'"
`1320`	`1320`	`]`
`1321`	`1321`	`},`
	`1322`	`+ {`
	`1323`	`+ title: 'support accentuated identifiers',`
	`1324`	`+ sql: [`
	`1325`	`+ "SELECT crème AS brûlée FROM café WHERE âtre = 'Molière'",`
	`1326`	+ "SELECT `crème` AS `brûlée` FROM `café` WHERE `âtre` = 'Molière'"
	`1327`	`+ ]`
	`1328`	`+ },`
`1322`	`1329`	`]`
`1323`	`1330`	`SQL_LIST.forEach(sqlInfo => {`
`1324`	`1331`	`const { title, sql } = sqlInfo`