feat: support trim expr in all db

taozhi8833998 · Dec 29, 2024 · 05e3546 · 05e3546
1 parent 0c9cda4
commit 05e3546
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 9 deletions.
diff --git a/pegjs/athena.pegjs b/pegjs/athena.pegjs
@@ -2141,7 +2141,7 @@ trim_position
   = 'BOTH'i / 'LEADING'i / 'TRAILING'i
 
 trim_rem
-  = p:trim_position? __ rm:literal_string? __ k:KW_FROM {
+  = p:trim_position? __ rm:expr? __ k:KW_FROM {
     let value = []
     if (p) value.push({type: 'origin', value: p })
     if (rm) value.push(rm)

diff --git a/pegjs/flinksql.pegjs b/pegjs/flinksql.pegjs
@@ -2968,7 +2968,7 @@ trim_position
   = 'BOTH'i / 'LEADING'i / 'TRAILING'i
 
 trim_rem
-  = p:trim_position? __ rm:literal_string? __ k:KW_FROM {
+  = p:trim_position? __ rm:expr? __ k:KW_FROM {
     // => expr_list
     let value = []
     if (p) value.push({type: 'origin', value: p })

diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -3246,7 +3246,7 @@ trim_position
   = 'BOTH'i / 'LEADING'i / 'TRAILING'i
 
 trim_rem
-  = p:trim_position? __ rm:literal_string? __ k:KW_FROM {
+  = p:trim_position? __ rm:expr? __ k:KW_FROM {
     let value = []
     if (p) value.push({type: 'origin', value: p })
     if (rm) value.push(rm)

diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -3535,7 +3535,7 @@ trim_position
   = 'BOTH'i / 'LEADING'i / 'TRAILING'i
 
 trim_rem
-  = p:trim_position? __ rm:literal_string? __ k:KW_FROM {
+  = p:trim_position? __ rm:expr? __ k:KW_FROM {
     let value = []
     if (p) value.push({type: 'origin', value: p })
     if (rm) value.push(rm)

diff --git a/pegjs/noql.pegjs b/pegjs/noql.pegjs
@@ -4312,7 +4312,7 @@ trim_position
   = 'BOTH'i / 'LEADING'i / 'TRAILING'i
 
 trim_rem
-  = p:trim_position? __ rm:literal_string? __ k:KW_FROM {
+  = p:trim_position? __ rm:expr? __ k:KW_FROM {
     // => expr_list
     let value = []
     if (p) value.push({type: 'origin', value: p })

diff --git a/pegjs/postgresql.pegjs b/pegjs/postgresql.pegjs
@@ -4897,7 +4897,7 @@ trim_position
   = 'BOTH'i / 'LEADING'i / 'TRAILING'i
 
 trim_rem
-  = p:trim_position? __ rm:literal_string? __ k:KW_FROM {
+  = p:trim_position? __ rm:expr? __ k:KW_FROM {
     // => expr_list
     let value = []
     if (p) value.push({type: 'origin', value: p })

diff --git a/pegjs/redshift.pegjs b/pegjs/redshift.pegjs
@@ -4371,7 +4371,7 @@ trim_position
   = 'BOTH'i / 'LEADING'i / 'TRAILING'i
 
 trim_rem
-  = p:trim_position? __ rm:literal_string? __ k:KW_FROM {
+  = p:trim_position? __ rm:expr? __ k:KW_FROM {
     // => expr_list
     let value = []
     if (p) value.push({type: 'origin', value: p })

diff --git a/pegjs/snowflake.pegjs b/pegjs/snowflake.pegjs
@@ -3806,7 +3806,7 @@ trim_position
   = 'BOTH'i / 'LEADING'i / 'TRAILING'i
 
 trim_rem
-  = p:trim_position? __ rm:literal_string? __ k:KW_FROM {
+  = p:trim_position? __ rm:expr? __ k:KW_FROM {
     // => expr_list
     let value = []
     if (p) value.push({type: 'origin', value: p })

diff --git a/pegjs/trino.pegjs b/pegjs/trino.pegjs
@@ -3785,7 +3785,7 @@ trim_position
   = 'BOTH'i / 'LEADING'i / 'TRAILING'i
 
 trim_rem
-  = p:trim_position? __ rm:literal_string? __ k:KW_FROM {
+  = p:trim_position? __ rm:expr? __ k:KW_FROM {
     // => expr_list
     let value = []
     if (p) value.push({type: 'origin', value: p })

diff --git a/test/mysql-mariadb.spec.js b/test/mysql-mariadb.spec.js
@@ -1182,6 +1182,23 @@ describe('mysql', () => {
           'SELECT `users`.`id` FROM `users` LEFT JOIN `orders` ON `users`.`id` COLLATE utf8mb4_general_ci = `orders`.`user_id`',
         ]
       },
+      {
+        title: 'trim expr from',
+        sql: [
+          `create table \`table1\` (
+              \`id\` int primary key not null,
+              \`data\` varchar(255) not null,
+              \`removed_id\` varchar(55) GENERATED ALWAYS AS (
+                    trim(
+                        trailing concat('.',substring_index(\`data\`,'.',-(3)))
+                        from
+                        trim(leading concat(substring_index(\`data\`,'.',3),'.') from \`data\`)
+                    )
+                ) STORED
+          );`,
+          "CREATE TABLE `table1` (`id` INT NOT NULL PRIMARY KEY, `data` VARCHAR(255) NOT NULL, `removed_id` VARCHAR(55) GENERATED ALWAYS AS (TRIM(TRAILING concat('.', substring_index(`data`, '.', -(3))) FROM TRIM(LEADING concat(substring_index(`data`, '.', 3), '.') FROM `data`))) STORED)"
+        ]
+      },
     ]
     SQL_LIST.forEach(sqlInfo => {
       const { title, sql } = sqlInfo