@dbml/core 2.4.3 → 2.4.4

package/lib/parse/postgresql/Base_rules.pegjs

@@ -101,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

@@ -94,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
@@ -109,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;
@@ -138,7 +140,7 @@ column_constraint = constraint_name:(CONSTRAINT __ constraint_name:identifier __
 	/ 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)?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "2.4.3",
+  "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": "9cc6f3b75433df2cfc482d305de9f53587e9f22c"
+  "gitHead": "39107aef57e41d29378ba15abe0c7057f7c5be00"
 }