@dbml/core 2.2.0 → 2.4.0

package/lib/parse/mssql/constraint_definition/actions.js

@@ -2,7 +2,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; }
 
@@ -55,7 +55,7 @@ function makeTableConstraint(constraintName, option) {
   if (!option) return null;
   return {
     type: option.type,
-    value: _objectSpread({}, option.value, {
+    value: _objectSpread(_objectSpread({}, option.value), {}, {
       name: option.type === 'indexes' && option.value.pk ? null : constraintName
     })
   };

package/lib/parse/mssql/fk_definition/actions.js

@@ -2,9 +2,13 @@
 
 var _ = require('lodash');
 
+var _require = require('../utils'),
+    getFullTableName = _require.getFullTableName;
+
 function makeEndPoint(tableName, columnName, relation) {
   return {
-    tableName: tableName[tableName.length - 1],
+    tableName: tableName.name,
+    schemaName: tableName.schemaName,
     fieldNames: columnName,
     relation: relation
   };
@@ -24,7 +28,8 @@ function setOption(value, fkOptions) {
 
 function makeColumnConstraintFK(_unused, tableName, columnName, fkOptions) {
   var value = {};
-  value.endpoint = makeEndPoint(tableName, columnName, '1');
+  var fullTableName = getFullTableName(tableName);
+  value.endpoint = makeEndPoint(fullTableName, columnName, '1');
   setOption(value, fkOptions);
   return {
     type: 'inline_refs',
@@ -43,6 +48,7 @@ function makeTableEndpoint(columnNames) {
 
 function makeTableConstraintFK(_keyword1, endpoint1, _keyword2, tableName, endpoint2, fkOptions) {
   var value = {};
+  var fullTableName = getFullTableName(tableName);
 
   if (!endpoint2) {
     // eslint-disable-next-line no-param-reassign
@@ -55,7 +61,8 @@ function makeTableConstraintFK(_keyword1, endpoint1, _keyword2, tableName, endpo
 
   endpoint1.value.relation = '*';
   endpoint2.value.relation = '1';
-  endpoint2.value.tableName = _.last(tableName);
+  endpoint2.value.tableName = fullTableName.name;
+  endpoint2.value.schemaName = fullTableName.schemaName;
   value.endpoints = [endpoint1.value, endpoint2.value];
   setOption(value, fkOptions);
   return {

package/lib/parse/mssql/keyword_parsers.js

@@ -72,7 +72,6 @@ exports.KeywordNoCheck = keyword(/NOCHECK/i);
 exports.KeywordDrop = keyword(/DROP/i);
 exports.KeywordAlterColumn = keyword(/ALTER COLUMN/i);
 exports.KeywordGo = keyword(/GO/i);
-exports.KeywordDrop = keyword(/DROP/i);
 exports.KeywordBulkInsert = keyword(/BULK INSERT/i);
 exports.KeywordInsert = keyword(/INSERT/i);
 exports.KeywordUpdate = keyword(/UPDATE/i);

package/lib/parse/mssql/statements/actions.js

@@ -2,10 +2,13 @@
 
 var _ = require('lodash');
 
-function findTable(ast, tableName) {
-  return ast.tables.find(function (_table) {
-    return _table.name === tableName;
+function findTable(ast, tableName, schemaName) {
+  var realSchemaName = schemaName || 'public';
+  var table = ast.tables.find(function (t) {
+    var targetSchemaName = t.schemaName || 'public';
+    return targetSchemaName === realSchemaName && t.name === tableName;
   });
+  return table;
 }
 
 function findField(table, fieldName) {
@@ -15,7 +18,7 @@ function findField(table, fieldName) {
 }
 
 function handleIndexes(index, ast) {
-  var table = findTable(ast, index.tableName);
+  var table = findTable(ast, index.tableName, index.schemaName);
   table.indexes.push(index);
   index.tableName = null;
 }
@@ -37,7 +40,7 @@ function handleTable(table, ast) {
 }
 
 function handleDefaults(dbdefault, ast) {
-  var table = findTable(ast, dbdefault.tableName);
+  var table = findTable(ast, dbdefault.tableName, dbdefault.schemaName);
   var field = findField(table, dbdefault.fieldName);
   dbdefault.fieldName = null;
   dbdefault.tableName = null;
@@ -45,7 +48,7 @@ function handleDefaults(dbdefault, ast) {
 }
 
 function handleEnums(_enum, ast) {
-  var table = findTable(ast, _enum.tableName);
+  var table = findTable(ast, _enum.tableName, _enum.schemaName);
   var field = findField(table, _enum.fieldName);
   _enum.name = "".concat(_enum.tableName, "_").concat(_enum.fieldName, "_enum");
   _enum.fieldName = null;

package/lib/parse/mssql/statements/statement_types/alter_table/actions.js

@@ -2,31 +2,37 @@
 
 var _ = require('lodash');
 
+var _require = require('../../../utils'),
+    getFullTableName = _require.getFullTableName;
+
 function handleRef(tableName, result) {
   var endpointWithNoTableName = result.value.endpoints.find(function (ele) {
     return !ele.tableName;
   });
-  endpointWithNoTableName.tableName = _.last(tableName);
+  endpointWithNoTableName.tableName = tableName.name;
+  endpointWithNoTableName.schemaName = tableName.schemaName;
 }
 
 function addTableName(tableName, result) {
-  result.value.tableName = _.last(tableName);
+  result.value.tableName = tableName.name;
+  result.value.schemaName = tableName.schemaName;
 }
 
 function handleAlterTableResult(_keyword, tableName, results) {
-  if (!results) return null; // eslint-disable-next-line consistent-return
+  if (!results) return null;
+  var fullName = getFullTableName(tableName); // eslint-disable-next-line consistent-return
 
   results.forEach(function (result) {
     if (result) {
       switch (result.type) {
         case 'refs':
-          handleRef(tableName, result);
+          handleRef(fullName, result);
           break;
 
         case 'indexes':
         case 'dbdefault':
         case 'enums':
-          addTableName(tableName, result);
+          addTableName(fullName, result);
           break;
 
         default:

package/lib/parse/mssql/statements/statement_types/create_index/actions.js

@@ -1,6 +1,10 @@
 "use strict";
 
+var _require = require('../../../utils'),
+    getFullTableName = _require.getFullTableName;
+
 function makeIndex(_create, isUnique, _clustered, _index, indexName, _on, tableName, columnNames) {
+  var fullTableName = getFullTableName(tableName);
   var columns = [];
   columnNames.forEach(function (columnName) {
     columns.push({
@@ -13,7 +17,8 @@ function makeIndex(_create, isUnique, _clustered, _index, indexName, _on, tableN
     value: {
       name: indexName,
       unique: isUnique ? true : null,
-      tableName: tableName[tableName.length - 1],
+      tableName: fullTableName.name,
+      schemaName: fullTableName.schemaName,
       columns: columns
     }
   };

package/lib/parse/mssql/statements/statement_types/create_table/actions.js

@@ -2,12 +2,15 @@
 
 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; }
 
 var _ = require('lodash');
 
+var _require = require('../../../utils'),
+    getFullTableName = _require.getFullTableName;
+
 function createRefFromInlineRef(linesRefs, inlineRefs, fieldName, tableName) {
   if (!inlineRefs || inlineRefs.length === 0) return;
   var newRef = {};
@@ -16,7 +19,8 @@ function createRefFromInlineRef(linesRefs, inlineRefs, fieldName, tableName) {
   newRef.onDelete = inlineRef.onDelete;
   newRef.endpoints = [];
   newRef.endpoints.push({
-    tableName: tableName,
+    tableName: tableName.name,
+    schemaName: tableName.schemaName,
     fieldNames: [fieldName],
     relation: '*'
   });
@@ -33,7 +37,7 @@ function pushOutEnum(linesEnums, fieldValue, tableName) {
   if (fieldValue.enums) {
     var _enum = fieldValue.enums;
     var fieldType = fieldValue.type;
-    _enum.name = "".concat(tableName, "_").concat(fieldValue.enums.name);
+    _enum.name = "".concat(tableName.schemaName ? "".concat(tableName.schemaName, "_") : '').concat(tableName.name, "_").concat(fieldValue.enums.name);
     fieldType.type_name = _enum.name;
     fieldType.args = _enum.values.map(function (value) {
       return "'".concat(value.name, "'");
@@ -71,7 +75,8 @@ function getLinesValue(lines, tableName) {
 
       if (line.type === 'refs') {
         var ref = line.value;
-        ref.endpoints[0].tableName = tableName;
+        ref.endpoints[0].tableName = tableName.name;
+        ref.endpoints[0].schemaName = tableName.schemaName;
       }
 
       value[line.type].push(line.value);
@@ -84,14 +89,11 @@ function getLinesValue(lines, tableName) {
 }
 
 function makeTable(_keyword, tableName, _keyword2, lines) {
-  var linesValue = getLinesValue(lines, _.last(tableName));
+  var fullName = getFullTableName(tableName);
+  var linesValue = getLinesValue(lines, fullName);
   return {
     type: 'tables',
-    value: _objectSpread({
-      name: _.last(tableName)
-    }, linesValue.value, {
-      schemaName: tableName.length > 1 ? tableName[tableName.length - 2] : null
-    })
+    value: _objectSpread(_objectSpread({}, fullName), linesValue.value)
   };
 }
 

package/lib/parse/mssql/utils.js

@@ -1,9 +1,11 @@
 "use strict";
 
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 var P = require('parsimmon');
 
+var _ = require('lodash');
+
 var _require = require('./keyword_parsers'),
     LParen = _require.LParen,
     RParen = _require.RParen,
@@ -47,4 +49,17 @@ exports.streamline = function (type) {
       };
     });
   };
+};
+
+exports.getFullTableName = function (nameList) {
+  var schemaName = null;
+
+  if (nameList.length > 1) {
+    schemaName = nameList[nameList.length - 2];
+  }
+
+  return {
+    name: _.last(nameList),
+    schemaName: schemaName
+  };
 };

package/lib/parse/mysql/parser.pegjs

@@ -4,6 +4,15 @@
 	const refs = [];
 	const enums = [];
 
+  // 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;
+  };
   // intput:
   // ` 
   //      'created'
@@ -35,31 +44,16 @@ Expr =
 // 				TableSyntax: support "CREATE TABLE" syntax.
 // Try to support as mush as possible syntax in MySQL offical documents.
 // https://dev.mysql.com/doc/refman/8.0/en/create-table.html
-// Return: table object: {name, fields, [,indexes]}
+// Return: table object: {name, schemaName, fields, [,indexes]}
 TableSyntax 
-	= create_table (__ if_not_exist)? __ name:table_name _ 
+	= create_table (__ if_not_exist)? __ table_name:table_name _ 
     "(" _ body:TableBody _ ")" _ TableOptions? _ semicolon endline?
 {
 	const fields = body.fields;
 	const indexes = body.indexes;
-	// push inline_ref to refs
+	const bodyRefs = body.refs;
+
 	fields.forEach((field)=>{
-		(field.inline_ref || []).forEach(ref => {
-			const endpoints = [
-				{
-					tableName: name,
-					fieldNames: [field.name],
-					relation: "*", //set by default
-				},
-				ref.endpoint,
-			]
-			refs.push({
-				endpoints,
-				onUpdate: ref.onUpdate,
-				onDelete: ref.onDelete,
-			});
-		})
-		
 		// process enum: rename enum and push to array `enums`
 		if (field.type.type_name.toLowerCase() === 'enum') {
 			let enumValuesArr = field.type.args.split(/[\s\r\n\n]*,[\s\r\n\n]*/);
@@ -74,18 +68,26 @@ TableSyntax
 			});
 
 			const _enum = {
-				name: `${name}_${field.name}_enum`,
+				name: `${table_name.schemaName 
+				? `${table_name.schemaName}_` : ''}${table_name.name}_${field.name}_enum`,
 				values
 			};
 			enums.push(_enum);
 			field.type.type_name = _enum.name;
 		}
+    });
+
+	bodyRefs.forEach(ref => {
+		ref.endpoints[0].tableName = table_name.name;
+		ref.endpoints[0].schemaName = table_name.schemaName;
+		ref.endpoints[0].relation = '*';
+		refs.push(ref);
+	});
 
-    })
     // return statement
     return indexes ? 
-    	{name, fields, indexes} 
-      : {name, fields}
+    	{...table_name, fields, indexes} 
+      : {...table_name, fields}
 }
 
 // TableBody: this is the part between parenthesis.
@@ -124,9 +126,9 @@ TableBody = _ lines:Line* _ {
 			onUpdate: key.onUpdate,
 			onDelete: key.onDelete,
 		});
-	})
+	});
 	
-	return {fields, indexes}
+	return {fields, indexes, refs: fks}
 }
 
 // Line: is create_definition in MySQL documents.
@@ -158,7 +160,8 @@ FKSyntax = _ constraint:("CONSTRAINT"i _ name)? _ foreign_key _
 				relation: "*",
 			},
 			{
-				tableName: table2,
+				tableName: table2.name,
+				schemaName: table2.schemaName,
 				fieldNames: fields2,
 				relation: "1",
 			}
@@ -184,7 +187,7 @@ UniqueSyntax
 // IndexInLineSyntax: Support "[UNIQUE] (INDEX/KEY) `indexName`(`field` (ASC/DESC)?)"
 // "KEY is normally a synonym for INDEX".
 IndexInLineSyntax = _ unique:index_in_line
-	_ name:name? _ type1:index_type?
+	_ name:name? _ type1:index_type? _
 	"(" _ columns:IndexColumnValues _")" IndexOption? type2:index_type?
 {
 	const index = { columns };
@@ -304,16 +307,19 @@ CheckConstraintSyntax = _ ("CONSTRAINT"i name _)? "CHECK"i _ expression _ ("NOT"
 // 			AlterSyntax: support "ALTER TABLE" syntax
 // We will support ADD_COLUMN, ADD_FOREIGN_KEY, ADD_INDEX
 // https://dev.mysql.com/doc/refman/8.0/en/alter-table.html
-AlterSyntax = alter_table _ table:name _ 
+AlterSyntax = alter_table _ table:table_name _ 
 	options:(AddOptions/ChangeOptions/DropOptions) _
   semicolon
 {
 	const fks = _.flatten(options.filter(o => o.type === "add_fk").map(o => o.fks));
-	fks.forEach(fk => {fk.endpoints[0].tableName = table});
+	fks.forEach(fk => {
+		fk.endpoints[0].tableName = table.name;
+		fk.endpoints[0].schemaName = table.schemaName;
+	});
 	refs.push(...fks)
 
 	const pks = _.flatten(options.filter(o => o.type === "add_pk").map(o => o.pks));
-	const tableAlter = tables.find((t) => t.name === table);
+	const tableAlter = findTable(table.schemaName, table.name);
 	
 	const index = {
 		columns: pks.map(field => ({
@@ -350,7 +356,7 @@ DropOptions = "DROP"i [^;]
 
 // 			IndexSyntax: support "CREATE INDEX" syntax
 IndexSyntax = constraint:create_index _ indexName:name _
-	"ON"i _ tableName:name _ indexType:index_type? _
+	"ON"i _ tableName:table_name _ indexType:index_type? _
 	columns: IndexColumn _
 	option:IndexOption? semicolon
 {
@@ -367,7 +373,8 @@ IndexSyntax = constraint:create_index _ indexName:name _
 	if(type) 
 		index.type = type;
 
-	const table = tables.find(table => table.name === tableName);
+	const table = findTable(tableName.schemaName, tableName.name);
+
 	if(table.indexes) {
 		table.indexes.push(index);
 	} else {
@@ -467,8 +474,24 @@ index_type "index type" = "USING"i _ type:("BTREE"i/"HASH"i) { return type.toUpp
 name "valid name"
   = c:(character)+ { return c.join("") }
   / quote c:[^`]+ quote { return c.join("") }
-table_name "valid table name"
-  = (name _ "." _)* name:name { return name }
+
+path_name = names:(name _ "." _)* {
+  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:name {
+  return { ...pathName, name }
+}
+
 type "type" = c:type_name { return c }
 	/  c:name { return { type_name: c } }
 type_name = type_name:name _ args:("(" _ expression _ ")")? {