@dbml/core 2.4.2 → 2.4.4

package/lib/parse/postgresql/Base_rules.pegjs

@@ -59,6 +59,13 @@ data_type "VALID TYPE" = c1:"CHARACTER"i _ c2:"VARYING"i _ args:("("expression")
     args: args ? args[1] : null
   }
 }
+/ "timestamptz"i _ number:("(" _ numeric_constant _ ")" _)? dimensions:(array_extension)? {
+    const args = number ? number[2] : null;
+    return {
+      type_name: (args !== null ? `timestamptz(${args})`: `timestamptz`) + (dimensions ? dimensions.map((dimension) => '[' + dimension + ']').join('') : ''),
+      args
+    }
+  }
 / "timestamp"i _ number:("(" _ numeric_constant _ ")" _)? (("without"i/"with"i) _ "time"i _ "zone"i)? dimensions:(array_extension)? {
   const args = number ? number[2] : null;
   return {
@@ -66,6 +73,13 @@ data_type "VALID TYPE" = c1:"CHARACTER"i _ c2:"VARYING"i _ args:("("expression")
     args
   }
 }
+/ "timetz"i _ number:("(" _ numeric_constant _ ")" _)? dimensions:(array_extension)? {
+    const args = number ? number[2] : null;
+    return {
+      type_name: (args !== null ? `timetz(${args})`: `timetz`) + (dimensions ? dimensions.map((dimension) => '[' + dimension + ']').join('') : ''),
+      args
+    }
+  }
 / "time"i _ number:("(" _ numeric_constant _ ")" _)? (("without"i/"with"i) _ "time"i _ "zone"i)? dimensions:(array_extension)? {
   const args = number ? number[2] : null;
   return {
@@ -87,6 +101,7 @@ data_type "VALID TYPE" = c1:"CHARACTER"i _ c2:"VARYING"i _ args:("("expression")
     args: null
   } 
 }
+
 type_name = pathName:path_name? c:(character)+ _ args:("(" expression ")")? {
 	let type_name = c.join("");
 	args = args ? args[1] : null;

package/lib/parse/postgresql/Commands/Create_table/Create_table_normal.pegjs

@@ -1,4 +1,4 @@
-create_table_normal = 
+create_table_normal =
 	_ CREATE __ ( ( GLOBAL __ / LOCAL __ )? ( TEMPORARY / TEMP ) __ / UNLOGGED __)? TABLE (__ IF_NOT_EXISTS)? __ table_name:table_name _ "(" _
 	table_properties:table_properties _ ")"
 	(__ INHERITS _ "(" _ parent_tables:table_names _ ")")?
@@ -56,6 +56,7 @@ create_table_normal =
 									field.inline_refs = [];
 								}
 								field.inline_refs.push({
+									name: ref.name,
 									endpoint: ref.endpoints[1],
 									onDelete: ref.onDelete,
 									onUpdate: ref.onUpdate
@@ -78,7 +79,7 @@ table_properties = first:table_property rest: (_ comma _ table_property)* {
 	return [first, ...rest.map(r => r[3])];
 }
 
-table_property = 
+table_property =
 	table_constraint:table_constraint {
 		return {
 			table_property_name: "table_constraint",
@@ -93,13 +94,12 @@ table_property =
 	}
 	/ column_name:column_name __ data_type:data_type (__ COLLATE __ collation:identifier)? column_constraints:(_ column_constraint)* {
 		const column = { name: column_name , type: data_type};
-		
-		// process type (if type === "serial")
-		if (column.type.type_name.toLowerCase() === "serial") {
-			column.type.type_name = "int";
+		const columnTypeName = column.type.type_name.toLowerCase();
+		const serialIncrementType = new Set(['serial', 'smallserial', 'bigserial']);
+		// process type for increment
+		if (serialIncrementType.has(columnTypeName)) {
 			column.increment = true;
 		}
-
 		// map from grammar to right object
 		column_constraints = column_constraints.map(c => c[1]);
 		// process column_constraints
@@ -108,6 +108,9 @@ table_property =
 				case "not_null":
 					column.not_null = value;
 					break;
+				case "increment":
+					column.increment = true;
+					break;
 				case "dbdefault":
 					column.dbdefault = value;
 					break;
@@ -132,12 +135,12 @@ table_property =
 	}
 
 // return { type, value}
-column_constraint = (CONSTRAINT __ constraint_name:identifier __)? 
+column_constraint = constraint_name:(CONSTRAINT __ constraint_name:identifier __ { return constraint_name })?
 	column_constraint:( NOT __ NULL { return { type: "not_null" , value: true } }
 	/ NULL { return { type: "not_null" , value: false } }
 	/ CHECK _ "("_ expression _")" (__ NO __ INHERIT)? { return { type: "not_supported" } }
 	/ DEFAULT __ default_expr:default_expr { return { type: "dbdefault", value: default_expr } }
-	/ GENERATED __ (ALWAYS/ BY __ DEFAULT) __ AS __ IDENTITY { return { type: "not_supported" } } // (_ "("_ sequence_options _ ")")? { return { type: "not_supported" } }
+	/ GENERATED __ (ALWAYS/ BY __ DEFAULT) __ AS __ IDENTITY { return { type: "increment" } } // (_ "("_ sequence_options _ ")")? { return { type: "not_supported" } }
 	/ UNIQUE (__ index_parameters)? { return { type: "unique" } }
 	/ PRIMARY_KEY (__ index_parameters)? { return { type: "pk" } }
 	/ REFERENCES __ reftable:table_name refcolumn:(_ "(" _ refcolumn:column_name _ ")" {return refcolumn})? (__ MATCH __ FULL/__ MATCH __ PARTIAL/__ MATCH __ SIMPLE)?
@@ -155,6 +158,7 @@ column_constraint = (CONSTRAINT __ constraint_name:identifier __)?
 			return {
 				type: "fk",
 				value: {
+					name: constraint_name,
 					endpoint: {
 						tableName: reftable.name,
             schemaName: reftable.schemaName,
@@ -170,7 +174,7 @@ column_constraint = (CONSTRAINT __ constraint_name:identifier __)?
 	}
 
 // return { type, t_value }
-table_constraint = (CONSTRAINT __ constraint_name:identifier __)?
+table_constraint = constraint_name:(CONSTRAINT __ constraint_name:identifier __ { return constraint_name })?
 	table_constraint: ( CHECK _ "("_ expression _")" (__ NO __ INHERIT)? { return { type:"not_supported" } }
 	/ UNIQUE _ "(" _ column_names:column_names _ ")" (__ index_parameters)? { return { type: "unique", t_value: column_names } }
 	/ PRIMARY_KEY _ "("_ column_names:column_names _ ")" (__ index_parameters)? { return { type: "pk", t_value: column_names } }
@@ -186,6 +190,7 @@ table_constraint = (CONSTRAINT __ constraint_name:identifier __)?
 				//throw Error(`Line ${location().start.line}: ${column_name} do not have referenced column.`)
 			//}
 			const v = {
+				name: constraint_name,
 				endpoints: [
 					{
 						tableName: null,
@@ -210,7 +215,7 @@ table_constraint = (CONSTRAINT __ constraint_name:identifier __)?
 			value.push(v);
 			return {
 				type: "fk",
-				t_value: value 
+				t_value: value
 			}
 		}
 	) (__  DEFERRABLE /__ NOT __ DEFERRABLE)? (__ INITIALLY __ DEFERRED /__ INITIALLY __ IMMEDIATE)? {

package/lib/parse/postgresql/parser.pegjs

@@ -22,6 +22,7 @@ parser = commands:command* {
 							if (field.inline_refs) {
 								refs.push(...field.inline_refs.map(ref => {
 									return {
+										name: ref.name,
 										endpoints: [
 											{
 												tableName: table.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -56,5 +56,5 @@
       "\\.(?!json$)[^.]*$": "jest-raw-loader"
     }
   },
-  "gitHead": "2d33941ba6f0833254bfc434abed1dc59f8f2b87"
+  "gitHead": "39107aef57e41d29378ba15abe0c7057f7c5be00"
 }