Merge pull request #1763 from taozhi8833998/fix-check-constraint-mysql

fix: check constraint support and expr in mysql
taozhi8833998 · Jan 23, 2024 · b8e918a · b8e918a
2 parents d2a31a8 + 835d45f
commit b8e918a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "ast",
     "sql-ast"
   ],
-  "author": "taozhi8833998 <taozhi8833998@163.com>",
+  "author": "taozhi8833998 <taozhi8833998@gmail.com>",
   "files": [
     "ast/",
     "build",

diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -1295,7 +1295,7 @@ create_constraint_foreign
   }
 
 check_constraint_definition
-  = kc:constraint_name? __ u:'CHECK'i __ LPAREN __ c:expr __ RPAREN __ ne:(KW_NOT? __ 'ENFORCED'i)?  {
+  = kc:constraint_name? __ u:'CHECK'i __ LPAREN __ c:or_and_expr __ RPAREN __ ne:(KW_NOT? __ 'ENFORCED'i)?  {
     const enforced = []
     if (ne) enforced.push(ne[0], ne[2])
     return {

diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -1530,7 +1530,7 @@ create_constraint_foreign
   }
 
 check_constraint_definition
-  = kc:constraint_name? __ u:'CHECK'i __ LPAREN __ c:expr __ RPAREN __ ne:(KW_NOT? __ 'ENFORCED'i)?  {
+  = kc:constraint_name? __ u:'CHECK'i __ LPAREN __ c:or_and_expr __ RPAREN __ ne:(KW_NOT? __ 'ENFORCED'i)?  {
     const enforced = []
     if (ne) enforced.push(ne[0], ne[2])
     return {

diff --git a/test/mysql-mariadb.spec.js b/test/mysql-mariadb.spec.js
@@ -927,6 +927,15 @@ describe('mysql', () => {
           `CREATE USER 'jeffrey'@'localhost' IDENTIFIED WITH caching_sha2_password BY 'new_password' DEFAULT ROLE 'administrator', 'developer' REQUIRE SSL AND X509 WITH MAX_QUERIES_PER_HOUR 100 PASSWORD EXPIRE INTERVAL 180 DAY FAILED_LOGIN_ATTEMPTS 3 PASSWORD_LOCK_TIME 2 ACCOUNT LOCK COMMENT 'test comment' ATTRIBUTE '{"fname": "James", "lname": "Scott", "phone": "123-456-7890"}'`
         ]
       },
+      {
+        title: 'check constraint',
+        sql: [
+          'CREATE TABLE `table` (\n' +
+          '`name` VARCHAR(255) CHECK(`name` LIKE \'ABC%\' AND LENGTH(`name`) >= 5)\n' +
+          ');',
+          "CREATE TABLE `table` (`name` VARCHAR(255) CHECK (`name` LIKE 'ABC%' AND LENGTH(`name`) >= 5))"
+        ]
+      }
     ]
     SQL_LIST.forEach(sqlInfo => {
       const { title, sql } = sqlInfo