Merge pull request #1602 from taozhi8833998/fix-missing-parentheses

fix: datatype length missing parentheses in all db
taozhi8833998 · Sep 29, 2023 · 077dadc · 077dadc
2 parents 2e2935f + b0e745f
commit 077dadc
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 10 deletions.
diff --git a/pegjs/bigquery.pegjs b/pegjs/bigquery.pegjs
@@ -2975,7 +2975,11 @@ data_type
   / bool_byte_geography_type
 
 character_string_type
-  = t:KW_STRING (__ LPAREN __ l:[0-9]+ __ RPAREN)* { return { dataType: t }; }
+  = t:KW_STRING s:(__ LPAREN __ l:[0-9]+ __ RPAREN)* {
+    const result = { dataType: t }
+    if (!s || s.length === 0) return result
+    return { ...result, length: parseInt(s[3].join(''), 10), parentheses: true  };
+  }
 
 numeric_type
   = t:(KW_NUMERIC / KW_INT_64 / KW_FLOAT_64 / KW_INTEGER) { return { dataType: t }; }

diff --git a/pegjs/db2.pegjs b/pegjs/db2.pegjs
@@ -2571,7 +2571,7 @@ data_type
 
 character_string_type
   = t:(KW_CHAR / KW_VARCHAR) __ LPAREN __ l:[0-9]+ __ RPAREN {
-    return { dataType: t, length: parseInt(l.join(''), 10) };
+    return { dataType: t, length: parseInt(l.join(''), 10), parentheses: true };
   }
   / t:KW_CHAR { return { dataType: t }; }
   / t:KW_VARCHAR { return { dataType: t }; }

diff --git a/pegjs/flinksql.pegjs b/pegjs/flinksql.pegjs
@@ -3696,7 +3696,7 @@ boolean_type
 character_string_type
   = t:(KW_CHAR / KW_VARCHAR) __ LPAREN __ l:[0-9]+ __ RPAREN {
     // => data_type
-    return { dataType: t, length: parseInt(l.join(''), 10) };
+    return { dataType: t, length: parseInt(l.join(''), 10), parentheses: true };
   }
   / t:KW_CHAR { /* =>  data_type */ return { dataType: t }; }
   / t:KW_VARCHAR { /* =>  data_type */  return { dataType: t }; }

diff --git a/pegjs/hive.pegjs b/pegjs/hive.pegjs
@@ -2562,7 +2562,7 @@ data_type
 
 character_string_type
   = t:(KW_CHAR / KW_VARCHAR) __ LPAREN __ l:[0-9]+ __ RPAREN {
-    return { dataType: t, length: parseInt(l.join(''), 10) };
+    return { dataType: t, length: parseInt(l.join(''), 10), parentheses: true };
   }
   / t:(KW_CHAR / KW_VARCHAR / KW_STRING) { return { dataType: t }; }
 

diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -3578,7 +3578,7 @@ binary_type
 
 character_string_type
   = t:(KW_CHAR / KW_VARCHAR) __ LPAREN __ l:[0-9]+ __ RPAREN {
-    return { dataType: t, length: parseInt(l.join(''), 10) };
+    return { dataType: t, length: parseInt(l.join(''), 10), parentheses: true };
   }
   / t:KW_CHAR { return { dataType: t }; }
   / t:KW_VARCHAR { return { dataType: t }; }

diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -3881,7 +3881,7 @@ binary_type
 
 character_string_type
   = t:(KW_CHAR / KW_VARCHAR) __ LPAREN __ l:[0-9]+ __ RPAREN {
-    return { dataType: t, length: parseInt(l.join(''), 10) };
+    return { dataType: t, length: parseInt(l.join(''), 10), parentheses: true };
   }
   / t:KW_CHAR { return { dataType: t }; }
   / t:KW_VARCHAR { return { dataType: t }; }

diff --git a/pegjs/postgresql.pegjs b/pegjs/postgresql.pegjs
@@ -5196,7 +5196,7 @@ character_varying
 character_string_type
   = t:(KW_CHAR / KW_VARCHAR / character_varying) __ LPAREN __ l:[0-9]+ __ RPAREN {
     // => data_type
-    return { dataType: t, length: parseInt(l.join(''), 10) };
+    return { dataType: t, length: parseInt(l.join(''), 10), parentheses: true };
   }
   / t:(KW_CHAR / character_varying / KW_VARCHAR) { /* =>  data_type */ return { dataType: t }; }
 

diff --git a/pegjs/snowflake.pegjs b/pegjs/snowflake.pegjs
@@ -4596,7 +4596,7 @@ binary_type
 character_string_type
   = t:(KW_CHAR / KW_VARCHAR) __ LPAREN __ l:[0-9]+ __ RPAREN {
     // => data_type
-    return { dataType: t, length: parseInt(l.join(''), 10) };
+    return { dataType: t, length: parseInt(l.join(''), 10), parentheses: true };
   }
   / t:(KW_CHAR / KW_CHARACTER) { /* =>  data_type */ return { dataType: t }; }
   / t:KW_VARCHAR { /* =>  data_type */  return { dataType: t }; }

diff --git a/pegjs/sqlite.pegjs b/pegjs/sqlite.pegjs
@@ -2756,7 +2756,7 @@ boolean_type
 
 character_string_type
   = t:(KW_CHAR / KW_VARCHAR) __ LPAREN __ l:[0-9]+ __ RPAREN {
-    return { dataType: t, length: parseInt(l.join(''), 10) };
+    return { dataType: t, length: parseInt(l.join(''), 10), parentheses: true };
   }
   / t:KW_CHAR { return { dataType: t }; }
   / t:KW_VARCHAR { return { dataType: t }; }

diff --git a/pegjs/transactsql.pegjs b/pegjs/transactsql.pegjs
@@ -3134,7 +3134,7 @@ data_type
 
 character_string_type
   = lb:LBRAKE? __ t:(KW_CHAR / KW_VARCHAR / KW_NCHAR / KW_NVARCHAR) __ rb:RBRAKE? !{ return (lb && !rb) || (!lb && rb) } __ LPAREN __ l:[0-9]+ __ RPAREN {
-    return { dataType: t, length: parseInt(l.join(''), 10) };
+    return { dataType: t, length: parseInt(l.join(''), 10), parentheses: true };
   }
   / lb:LBRAKE? __ t:(KW_CHAR / KW_VARCHAR) __ rb:RBRAKE? !{ return (lb && !rb) || (!lb && rb) } {
     return { dataType: t };

diff --git a/test/postgres.spec.js b/test/postgres.spec.js
@@ -1549,6 +1549,13 @@ describe('Postgres', () => {
           'SELECT "c"::REGTYPE FROM "pg_attribute"'
         ]
       },
+      {
+        title: 'cast varchar with length',
+        sql: [
+          'SELECT name::VARCHAR(200) FROM raw_hosts',
+          'SELECT "name"::VARCHAR(200) FROM "raw_hosts"'
+        ]
+      },
       {
         title: 'chinese oridinary identifier',
         sql: [