Merge pull request taozhi8833998#2019 from taozhi8833998/feat-create-type-pg

taozhi8833998 · web-flow · commit 645713b87bfa · 2024-07-24T08:29:31.000+08:00
refactor: support create type range and columns in pg
diff --git a/pegjs/postgresql.pegjs b/pegjs/postgresql.pegjs
@@ -732,20 +732,36 @@ create_function_stmt
       }
   }
 
+create_type_stmt_option
+  = KW_AS __ r:(KW_ENUM / 'RANGE'i) __ LPAREN __ e:expr_list? __ RPAREN {
+    e.parentheses = true
+    return {
+      as: 'as',
+      resource: r.toLowerCase(),
+      create_definitions: e,
+    }
+  }
+  / KW_AS __ LPAREN __ e:create_column_definition_list? __ RPAREN {
+    return {
+      as: 'as',
+      create_definitions: e,
+    }
+  }
+
 create_type_stmt
-  = a:KW_CREATE __ k:'TYPE'i __ s:table_name __ as:KW_AS __ r:KW_ENUM __ LPAREN __ e:expr_list? __ RPAREN {
+  = a:KW_CREATE __ k:'TYPE'i __ s:table_name __ e:create_type_stmt_option? {
       /*
       export type create_type_stmt_t = {
         type: 'create',
         keyword: 'type',
         name: { schema: string; name: string },
         as?: string,
         resource?: string,
-        create_definitions?: any
+        create_definitions?: expr_list | create_column_definition_list;
       }
       => AstStatement<create_type_stmt_t>
       */
-      e.parentheses = true
+
       customTypes.add([s.db, s.table].filter(v => v).join('.'))
       return {
         tableList: Array.from(tableList),
@@ -754,25 +770,11 @@ create_type_stmt
           type: a[0].toLowerCase(),
           keyword: k.toLowerCase(),
           name: { schema: s.db, name: s.table },
-          as: as && as[0] && as[0].toLowerCase(),
-          resource: r.toLowerCase(),
-          create_definitions: e,
+          ...e,
         }
       }
     }
-  / a:KW_CREATE __ k:'TYPE'i __ s:table_name {
-    // => AstStatement<create_type_stmt_t>
-    customTypes.add([s.db, s.table].filter(v => v).join('.'))
-    return {
-        tableList: Array.from(tableList),
-        columnList: columnListTableAlias(columnList),
-        ast: {
-          type: a[0].toLowerCase(),
-          keyword: k.toLowerCase(),
-          name: { schema: s.db, name: s.table },
-        }
-      }
-  }
+
 create_domain_stmt
   = a:KW_CREATE __ k:'DOMAIN'i __ s:table_name __ as:KW_AS? __ d:data_type __ ce:collate_expr? __ de:default_expr? __ ccc: create_constraint_check? {
       /*
@@ -1303,6 +1305,12 @@ column_definition_opt_list
     return opt
   }
 
+create_column_definition_list
+  = head:create_column_definition tail:(__ COMMA __ create_column_definition)* {
+      // => create_column_definition[]
+      return createList(head, tail)
+    }
+
 create_column_definition
   = c:column_ref __
     d:data_type __
diff --git a/src/create.js b/src/create.js
@@ -298,8 +298,12 @@ function createTypeToSQL(stmt) {
     const definitionSQL = []
     switch (resource) {
       case 'enum':
+      case 'range':
         definitionSQL.push(exprToSQL(createDefinition))
         break
+      default:
+        definitionSQL.push(`(${createDefinition.map(createDefinitionToSQL).join(', ')})`)
+        break
     }
     sql.push(definitionSQL.filter(hasVal).join(' '))
   }
diff --git a/test/postgres.spec.js b/test/postgres.spec.js
@@ -1569,6 +1569,25 @@ describe('Postgres', () => {
         `SELECT id, collection::JSONB ?| ARRAY['val1','val2'] FROM "instances"`
       ]
     },
+    {
+      title: 'create type',
+      sql: [
+        `CREATE TYPE address AS (
+            street VARCHAR(255),
+            city VARCHAR(100),
+            state VARCHAR(100),
+            zip_code VARCHAR(10)
+        );`,
+        'CREATE TYPE "address" AS (street VARCHAR(255), city VARCHAR(100), state VARCHAR(100), zip_code VARCHAR(10))'
+      ]
+    },
+    {
+      title: 'create type as range',
+      sql: [
+        'CREATE TYPE float8_range AS RANGE (subtype = float8, subtype_diff = float8mi);',
+        'CREATE TYPE "float8_range" AS RANGE (subtype = float8, subtype_diff = float8mi)'
+      ]
+    },
   ]
   function neatlyNestTestedSQL(sqlList){
     sqlList.forEach(sqlInfo => {

Original file line number	Diff line number	Diff line change
`@@ -298,8 +298,12 @@ function createTypeToSQL(stmt) {`
`298`	`298`	`const definitionSQL = []`
`299`	`299`	`switch (resource) {`
`300`	`300`	`case 'enum':`
	`301`	`+ case 'range':`
`301`	`302`	`definitionSQL.push(exprToSQL(createDefinition))`
`302`	`303`	`break`
	`304`	`+ default:`
	`305`	+ definitionSQL.push(`(${createDefinition.map(createDefinitionToSQL).join(', ')})`)
	`306`	`+ break`
`303`	`307`	`}`
`304`	`308`	`sql.push(definitionSQL.filter(hasVal).join(' '))`
`305`	`309`	`}`