@dbml/core 2.3.1 → 2.4.0

package/lib/parse/postgresql/Base_rules.pegjs

@@ -1,8 +1,27 @@
 // Base rules:
 // collumn_name, table_name
 column_name "valid column name" = identifier
-table_name "valid table name"
-  = ((identifier _ "." _)*)? name:identifier { return name }
+
+path_name = names:(identifier _ "." _)* {
+  let dbName = null;
+  let schemaName = null;
+  if (names && names.length > 0) {
+    if (names.length === 1) schemaName = names[0][0];
+    else {
+      dbName = names[0][0];
+      schemaName = names[1][0];
+    }
+  }
+  return { dbName, schemaName }
+}
+
+table_name "valid table name" = pathName:path_name name:identifier {
+  return { ...pathName, name }
+}
+
+enum_name "valid enum name" = pathName:path_name? name:identifier {
+  return { ...pathName, name }
+}
 
 // string constant
 string_constant "string" = "'" c:char_inside_single_quote+ "'" {
@@ -58,6 +77,7 @@ data_type "VALID TYPE" = c1:"CHARACTER"i _ c2:"VARYING"i _ args:("("expression")
 	  const args = c.args;
     return {
       type_name: c.type_name + (dimensions ? dimensions.map((dimension) => '[' + dimension + ']').join('') : ''),
+      schemaName: c.schemaName,
       args
     };
 	}
@@ -67,7 +87,7 @@ data_type "VALID TYPE" = c1:"CHARACTER"i _ c2:"VARYING"i _ args:("("expression")
     args: null
   } 
 }
-type_name = c:(character)+ _ args:("(" expression ")")? {
+type_name = pathName:path_name? c:(character)+ _ args:("(" expression ")")? {
 	let type_name = c.join("");
 	args = args ? args[1] : null;
 	if (type_name.toLowerCase() !== 'enum') {
@@ -75,6 +95,7 @@ type_name = c:(character)+ _ args:("(" expression ")")? {
 	}
 
 	return {
+    ...pathName,
 		type_name,
 		args
 	}

package/lib/parse/postgresql/Commands/Alter_table/Alter_table.pegjs

@@ -11,7 +11,8 @@ alter_table_action = _ ALTER __ TABLE (__ IF_EXISTS)? (__ ONLY)? __ name:table_n
 			switch(type.toLowerCase()) {
 				case "fk":
 					t_value.forEach(({ endpoints }) => {
-						endpoints[0].tableName = name
+						endpoints[0].tableName = name.name;
+						endpoints[0].schemaName = name.schemaName;
 					})
 			}
 		})

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

@@ -7,7 +7,7 @@ create_table_normal =
 	(__ ON __ COMMIT __ (PRESERVE __ ROWS/ DELETE __ ROWS/ DROP))?
 	(__ TABLESPACE __ tablespace_name:identifier)?
 	_ semicolon _ {
-		const table = { name: table_name, fields: [], indexes: [] }
+		const table = { name: table_name.name, schemaName: table_name.schemaName, fields: [], indexes: [] }
 		// process table_properties
 		table_properties.forEach(({ table_property_name, value }) => {
 			switch(table_property_name.toLowerCase()) {
@@ -156,7 +156,8 @@ column_constraint = (CONSTRAINT __ constraint_name:identifier __)?
 				type: "fk",
 				value: {
 					endpoint: {
-						tableName: reftable,
+						tableName: reftable.name,
+            schemaName: reftable.schemaName,
 						fieldNames: refcolumn ? [refcolumn] : null,
 						relation: "1"
 					},
@@ -192,7 +193,8 @@ table_constraint = (CONSTRAINT __ constraint_name:identifier __)?
 						relation: "*",
 					},
 					{
-						tableName: reftable,
+						tableName: reftable.name,
+            schemaName: reftable.schemaName,
 						fieldNames: refcolumn,// ? refcolumn[key] : null,
 						relation: "1",
 					},

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

@@ -6,7 +6,7 @@ create_table_of =
 	(__ ON __ COMMIT __ (PRESERVE __ ROWS/ DELETE __ ROWS/ DROP))?
 	(__ TABLESPACE __ tablespace_name:identifier)?
 	_ semicolon _ {
-		const table = { name: table_name, type: type_name}
+		const table = { name: table_name.name, schemaName: table_name.schemaName, type: type_name}
 		return {
 			syntax_name: "create_table_of",
 			value: table

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

@@ -7,7 +7,7 @@ create_table_partition_of =
 	(__ ON __ COMMIT __ (PRESERVE __ ROWS/ DELETE __ ROWS/ DROP))?
 	(__ TABLESPACE __ tablespace_name:identifier)?
 	_ semicolon _ {
-		const table = { name: table_name, parent_table: parent_table}
+		const table = { name: table_name.name, schemaName: table_name.schemaName, parent_table: parent_table}
 		return {
 			syntax_name: "create_table_partition_of",
 			value: table

package/lib/parse/postgresql/Commands/Create_type/Create_type_enum.pegjs

@@ -1,12 +1,12 @@
 create_type_enum = 
-	_ CREATE __ TYPE __ name:identifier __ AS __ ENUM _
+	_ CREATE __ TYPE __ enumName:enum_name __ AS __ ENUM _
 	"(" _ labels:labels _ ")" 
 	_ semicolon _ {
 		const values = labels.map(name => ({ name }))
 		return {
 			syntax_name: "create_type_enum",
 			value: {
-				name,
+				...enumName,
 				values,
 			}
 		}

package/lib/parse/postgresql/InitializerUtils.pegjs

@@ -14,4 +14,14 @@
     });
     return arrAfterTrim.join(', ');
   }
+
+  // TODO: support configurable default schema name other than 'public'
+  const findTable = (schemaName, tableName) => {
+    const realSchemaName = schemaName || 'public';
+    const table = tables.find(table => {
+      const targetSchemaName = table.schemaName || 'public';
+      return targetSchemaName === realSchemaName && table.name === tableName;
+    });
+    return table;
+  };
 }

package/lib/parse/postgresql/parser.pegjs

@@ -23,6 +23,7 @@ parser = commands:command* {
 										endpoints: [
 											{
 												tableName: table.name,
+												schemaName: table.schemaName,
 												fieldNames: [field.name],
 												relation: "*",
 											},
@@ -70,7 +71,7 @@ parser = commands:command* {
 			case "create_index":
 				const { table_name } = value;
 				delete value.table_name; // remove table_name from column
-				const table_index = tables.find(table => table.name === table_name);
+        const table_index = findTable(table_name.schemaName, table_name.name);
 				if (table_index.indexes) {
 					table_index.indexes.push(value);
 				} else {

package/package.json

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