@dbml/core 2.3.0 → 2.4.1

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+ "'" {
@@ -32,36 +51,43 @@ digits = d:digit+ { return d.join('') }
 digit = [0-9]
 
 // type
-data_type "VALID TYPE" = c1:"CHARACTER"i _ c2:"VARYING"i _ args:("("expression")")? {
+data_type "VALID TYPE" = c1:"CHARACTER"i _ c2:"VARYING"i _ args:("("expression")")? dimensions:(array_extension)? {
   let c = `${c1} ${c2}`;
   c = args ? c + '(' + args[1] + ')' : c;
   return {
-    type_name: c,
+    type_name: c + (dimensions ? dimensions.map((dimension) => '[' + dimension + ']').join('') : ''),
     args: args ? args[1] : null
   }
 }
-/ "timestamp"i _ number:("(" _ numeric_constant _ ")" _)? (("without"i/"with"i) _ "time"i _ "zone"i)? {
+/ "timestamp"i _ number:("(" _ numeric_constant _ ")" _)? (("without"i/"with"i) _ "time"i _ "zone"i)? dimensions:(array_extension)? {
   const args = number ? number[2] : null;
   return {
-    type_name: args !== null ? `timestamp(${args})`: `timestamp`,
+    type_name: (args !== null ? `timestamp(${args})`: `timestamp`) + (dimensions ? dimensions.map((dimension) => '[' + dimension + ']').join('') : ''),
     args
   }
 }
-/ "time"i _ number:("(" _ numeric_constant _ ")" _)? (("without"i/"with"i) _ "time"i _ "zone"i)? {
+/ "time"i _ number:("(" _ numeric_constant _ ")" _)? (("without"i/"with"i) _ "time"i _ "zone"i)? dimensions:(array_extension)? {
   const args = number ? number[2] : null;
   return {
-    type_name: args !== null ? `time(${args})`: `time`,
+    type_name: (args !== null ? `time(${args})`: `time`) + (dimensions ? dimensions.map((dimension) => '[' + dimension + ']').join('') : ''),
     args
   }
 }
-/ c:type_name { return c }
+/ c:type_name dimensions:(array_extension)? {
+	  const args = c.args;
+    return {
+      type_name: c.type_name + (dimensions ? dimensions.map((dimension) => '[' + dimension + ']').join('') : ''),
+      schemaName: c.schemaName,
+      args
+    };
+	}
 / double_quote c:[^\"\n]+ double_quote { 
   return { 
     type_name: c.join(""),
     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') {
@@ -69,10 +95,19 @@ type_name = c:(character)+ _ args:("(" expression ")")? {
 	}
 
 	return {
+    ...pathName,
 		type_name,
 		args
 	}
 }
+//https://www.postgresql.org/docs/13/arrays.html
+array_extension = _ "array"i  singledimenson:(_ "[" _ expression _ "]")? {
+    return [singledimenson ? singledimenson[3] : ''];
+	} 
+	/ _ multidimenson:("[" _ expression _ "]")+ {
+    // this will parse into Array(Array('[', _ , expression , _ ']'))
+    return multidimenson.map((dimension) => dimension[2]);
+  }
 
 // Default
 default_expr = val:string_constant { return { value: val, type: 'string' }}

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

@@ -1,17 +1,57 @@
-alter_table = alter_table_action:alter_table_action {
+alter_table = alter_sub_syntax:(
+	alter_table_action /
+	alter_table_rename /
+	alter_table_set_schema /
+	alter_table_set_tablespace /
+	alter_table_attach /
+	alter_table_detach 
+) {
 	return {
 		command_name: "alter_table",
-		value: alter_table_action
+		value: alter_sub_syntax
 	}
 }
 
-alter_table_action = _ ALTER __ TABLE (__ IF_EXISTS)? (__ ONLY)? __ name:table_name __
+alter_table_rename = _ ALTER __ TABLE (__ IF_EXISTS)? (__ ONLY)? __ table_name (_ "*")? __ RENAME (cmt / !semicolon .)* _ semicolon _ {
+	return {
+		syntax_name: "alter_table_rename",
+	}
+}
+
+alter_table_set_schema = _ ALTER __ TABLE (__ IF_EXISTS)? __ table_name __ SET __ SCHEMA (cmt / !semicolon .)* _ semicolon _ {
+	return {
+		syntax_name: "alter_table_set_schema",
+	}
+}
+
+alter_table_set_tablespace = _ ALTER __ TABLE __ ALL __ IN __ TABLESPACE __ table_name
+	(__ OWNED __ BY __ identifier (_ comma _ identifier)*)? __ SET __ TABLESPACE
+	(cmt / !semicolon .)* _ semicolon _ {
+	return {
+		syntax_name: "alter_set_tablespace",
+	}
+}
+
+alter_table_attach = _ ALTER __ TABLE (__ IF_EXISTS)? __ table_name __ ATTACH __ PARTITION (cmt / !semicolon .)* _ semicolon _ {
+	return {
+		syntax_name: "alter_table_attach",
+	}
+}
+
+alter_table_detach = _ ALTER __ TABLE (__ IF_EXISTS)? __ table_name __ DETACH __ PARTITION (cmt / !semicolon .)* _ semicolon _ {
+	return {
+		syntax_name: "alter_table_detach",
+	}
+}
+
+alter_table_action = _ ALTER __ TABLE (__ IF_EXISTS)? (__ ONLY)? __ name:table_name (_ "*")? __
 	actions:actions _ semicolon _ {
 		actions.forEach(({ type, t_value}) => {
 			switch(type.toLowerCase()) {
 				case "fk":
 					t_value.forEach(({ endpoints }) => {
-						endpoints[0].tableName = name
+						endpoints[0].tableName = name.name;
+						endpoints[0].schemaName = name.schemaName;
 					})
 			}
 		})
@@ -78,6 +118,11 @@ action = ADD __ table_constraint:table_constraint (__ NOT __ VALID)? { // reuse
 			value: value.toLowerCase()
 		}
 	}
+	/ (cmt / !semicolon .)* {
+		return {
+			type: "unknown",
+		}
+	}
 
 
 set_attribute_options = first:set_attribute_option rest:(_ comma _ set_attribute_option)* {

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

@@ -2,9 +2,7 @@ comment = _ COMMENT __ ON __ comment_option:comment_option __ IS __ text:(string
   _ semicolon _ {
   if (text.toLowerCase() !== "null") {
     comment_option.value.text = text;
-  } else {
-    comment_option.value.syntax_name = "remove_comment";
-  }
+  } else comment_option.value.text = null;
 
   return {
     command_name: "comment",
@@ -13,12 +11,26 @@ comment = _ COMMENT __ ON __ comment_option:comment_option __ IS __ text:(string
 }
 
 comment_option = (
-  COLUMN __ relation_name:identifier "." column_name:column_name {
+  COLUMN __ path:(identifier '.')+ column_name:column_name {
+    let dbName = null, schemaName = null, tableName;
+    if (path.length === 1) {
+      tableName = path[0][0];
+    } else if (path.length === 2) {
+      schemaName = path[0][0];
+      tableName = path[1][0];
+    }
+    else {
+      dbName = path[0][0];
+      schemaName = path[1][0];
+      tableName = path[2][0];
+    }
     return {
       syntax_name: "column",
       value: {
-        relation_name: relation_name,
-        column_name
+        dbName,
+        schemaName,
+        tableName,
+        columnName: column_name
       }
     }
   }

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/Commands/Ignore_syntax.pegjs

@@ -8,10 +8,19 @@ ignore_syntax = _ value:(
   / CREATE __ SEQUENCE [^;]* { return { syntax_name: "create_sequence" } }
   / CREATE __ SCHEMA [^;]* { return { syntax_name: "create_schema" } }
   / CREATE __ VIEW [^;]* { return { syntax_name: "create_view" } }
+  / ALTER __ (cmt / !(semicolon) .)* { return { syntax_name: "alter_not_table" } }
   / __ { return { syntax_name: "comment_and_space" } }
 ) semicolon _ {
+  const loc = location();
+  const t = text();
   return {
     command_name: "ignore_syntax",
-    value
+    value,
+    warning: {
+      type: 'ignore',
+      location: loc,
+      text: t,
+      message: `ignoring "${t}" at line: ${loc.start.line}`,
+    },
   }
 }

package/lib/parse/postgresql/InitializerUtils.pegjs

@@ -1,8 +1,8 @@
 {
   // intput:
-  // ` 
+  // `
   //      'created'
-  //                   ,            
+  //                   ,
   //         'pending',          'done'
   //  `
   //  => `'created', 'pending', 'done'`
@@ -14,4 +14,16 @@
     });
     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;
+  };
+
+  const findField = (table, fieldName) => table.fields.find(field => field.name === fieldName);
 }

package/lib/parse/postgresql/Keywords.pegjs

@@ -110,4 +110,8 @@ SELECT = "SELECT"i
 USE = "USE"i
 SEQUENCE = "SEQUENCE"i
 SCHEMA = "SCHEMA"i
-VIEW = "VIEW"i
+VIEW = "VIEW"i
+RENAME = "RENAME"i
+OWNED = "OWNED"i
+ATTACH = "ATTACH"i
+DETACH = "DETACH"i

package/lib/parse/postgresql/parser.pegjs

@@ -2,10 +2,12 @@
 	const tables = [];
 	const refs = [];
 	const enums = [];
+	const warnings = [];
 }
 
 parser = commands:command* {
-	commands.forEach(({ command_name, value: { syntax_name, value } }) => {
+	commands.forEach((cmd) => {
+		const { command_name, value: { syntax_name, value }, warning } = cmd;
 		switch(command_name.toLowerCase()){
 			case "create_table":
 				const table = value;
@@ -23,6 +25,7 @@ parser = commands:command* {
 										endpoints: [
 											{
 												tableName: table.name,
+												schemaName: table.schemaName,
 												fieldNames: [field.name],
 												relation: "*",
 											},
@@ -70,7 +73,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 {
@@ -103,18 +106,29 @@ parser = commands:command* {
 				break;
 			case "comment":
 				switch(syntax_name.toLowerCase()) {
-					case "column":
-						const table_comment = tables.find(table => table.name === value.relation_name);
-						const field_comment = table_comment.fields.find(field => field.name === value.column_name);
-						field_comment.note = value.text;
+					case "column": {
+						const { schemaName, tableName, columnName } = value;
+						const foundTable = findTable(schemaName, tableName);
+						if (foundTable) {
+							const foundField = findField(foundTable, columnName);
+							if (foundField) foundField.note = value.text;
+						}
+						break;
+					}
+					case "table":	{
+						const { schemaName, name: tableName } = value.table_name;
+						const foundTable = findTable(schemaName, tableName);
+						if (foundTable) foundTable.note = value.text;
 						break;
+					}
 				}
 				break;
-			case "ignore_commands":
+			case "ignore_syntax":
+				// warnings.push(warning);
 				break;
 		}
 	})
-	// console.log({tables, refs, enums, indexes});
+
 	return {tables, refs, enums};
 }
 

package/lib/parse/schemarbParser.js

@@ -7,7 +7,7 @@
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -2738,13 +2738,13 @@ function peg$parse(input, options) {
       }
 
       if (currentProp.onDelete) {
-        refProp = _objectSpread({}, refProp, {
+        refProp = _objectSpread(_objectSpread({}, refProp), {}, {
           onDelete: currentProp.onDelete
         });
       }
 
       if (currentProp.onUpdate) {
-        refProp = _objectSpread({}, refProp, {
+        refProp = _objectSpread(_objectSpread({}, refProp), {}, {
           onUpdate: currentProp.onUpdate
         });
       }

package/package.json

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