fix: assign stmt with alias in mysql

taozhi8833998 · Jan 22, 2025 · 1242851 · 1242851
1 parent 1cab221
commit 1242851
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -2039,8 +2039,8 @@ column_list_item
         as: null
       };
     }
-  / a:select_assign_stmt {
-    return { expr: a, as: null }
+  / a:select_assign_stmt __ alias:alias_clause? {
+    return { expr: a, as: alias }
   }
   / e:binary_column_expr __ alias:alias_clause? {
       return { expr: e, as: alias };

diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -2295,8 +2295,8 @@ column_list_item
         ...getLocationObject(),
       };
     }
-  / a:select_assign_stmt {
-    return { expr: a, as: null }
+  / a:select_assign_stmt __ alias:alias_clause? {
+    return { expr: a, as: alias }
   }
   / e:binary_column_expr __ alias:alias_clause? {
     return { expr: e, as: alias };

diff --git a/test/mysql-mariadb.spec.js b/test/mysql-mariadb.spec.js
@@ -1199,6 +1199,13 @@ describe('mysql', () => {
           "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)"
         ]
       },
+      {
+        title: 'assign with alias',
+        sql: [
+          'SELECT T2.id FROM ( SELECT @r AS _id, (SELECT @r := parent_id FROM product_category WHERE id = _id AND is_active = 1) AS parent_id, @l := @l + 1 AS lvl FROM (SELECT @r := :catId, @l := 0) vars, product_category h WHERE @r <> 0) T1 JOIN product_category T2 ON T1._id = T2.id ORDER BY T1.lvl DESC;',
+          'SELECT `T2`.`id` FROM (SELECT @r AS `_id`, (SELECT @r := `parent_id` FROM `product_category` WHERE `id` = `_id` AND `is_active` = 1) AS `parent_id`, @l := @l + 1 AS `lvl` FROM (SELECT @r := :catId, @l := 0) AS `vars`, `product_category` AS `h` WHERE @r <> 0) AS `T1` INNER JOIN `product_category` AS `T2` ON `T1`.`_id` = `T2`.`id` ORDER BY `T1`.`lvl` DESC',
+        ]
+      },
     ]
     SQL_LIST.forEach(sqlInfo => {
       const { title, sql } = sqlInfo