refactor: support more geometry type in pg

Author: taozhi8833998

pegjs/postgresql.pegjs

@@ -1721,7 +1721,7 @@ alter_schema_stmt
 
 alter_table_stmt
   = KW_ALTER  __
-    KW_TABLE __
+    KW_TABLE? __
     ife:if_exists? __
     o:'only'i? __
     t:table_ref_list __
@@ -6050,8 +6050,15 @@ enum_type
 json_type
   = t:(KW_JSON / KW_JSONB) { /* =>  data_type */  return { dataType: t }; }
 
+geometry_type_args
+  = t:('POINT'i / 'LINESTRING'i / 'POLYGON'i / 'MULTIPOINT'i / 'MULTILINESTRING'i / 'MULTIPOLYGON'i / 'GEOMETRYCOLLECTION'i) __ srid:(COMMA __ [0-9]+)? {
+    return {
+      length: t,
+      scale: srid && srid[2] && parseInt(srid[2].join(''), 10)
+    }
+  }
 geometry_type
-  = t:KW_GEOMETRY {/* =>  data_type */  return { dataType: t }; }
+  = t:KW_GEOMETRY geo:(__ LPAREN __ geometry_type_args __ RPAREN )? {/* =>  data_type */  return { dataType: t, ...(geo && geo[3] || {}), parentheses: geo ? true : false }; }
 
 serial_interval_type
   = t:(KW_SERIAL / KW_INTERVAL) { /* =>  data_type */  return { dataType: t }; }

src/column.js

@@ -9,6 +9,7 @@ import {
   commonOptionConnector,
   commonTypeValue,
   commentToSQL,
+  dataTypeToSQL,
   getParserOpt,
   hasVal,
   identifierToSql,
@@ -65,9 +66,7 @@ function columnRefToSQL(expr) {
 function columnDataType(definition) {
   if (!definition) return
   const { dataType, length, suffix, scale, expr } = definition
-  let result = dataType
-  if (length != null) result += `(${[length, scale].filter(val => val != null).join(', ')})`
-  if (suffix && suffix.length) result += ` ${suffix.join(' ')}`
+  let result = dataTypeToSQL({ dataType, length, suffix, scale, parentheses: length != null ? true : false })
   if (expr) result += exprToSQL(expr)
   if (definition.array) {
     const arrayExpr = arrayDimensionToSymbol(definition)

test/postgres.spec.js

@@ -1761,6 +1761,13 @@ describe('Postgres', () => {
         `SELECT gid, '2020-01-01 00:00:00'::TIMESTAMP WITH TIME ZONE + MAKE_INTERVAL(secs => ((gid - (SELECT MIN(gid) FROM "nyct20"))::FLOAT / (SELECT MAX(gid) - MIN(gid) FROM "nyct20")) * 31536000) AS "generated_timestamp" FROM "nyct20"`
       ]
     },
+    {
+      title: 'geometry type',
+      sql: [
+        'ALTER table my_table ADD COLUMN geom geometry(Point, 4326);',
+        'ALTER TABLE "my_table" ADD COLUMN geom GEOMETRY(Point, 4326)'
+      ]
+    },
   ]
   function neatlyNestTestedSQL(sqlList){
     sqlList.forEach(sqlInfo => {