@dbml/core 2.3.1 → 2.4.0

package/lib/model_structure/schema.js

@@ -88,10 +88,10 @@ var Schema = /*#__PURE__*/function (_Element) {
 
     _this.generateId();
 
-    _this.processTables(tables);
-
     _this.processEnums(enums);
 
+    _this.processTables(tables);
+
     _this.processRefs(refs);
 
     _this.processTableGroups(tableGroups);
@@ -134,7 +134,7 @@ var Schema = /*#__PURE__*/function (_Element) {
     key: "findTable",
     value: function findTable(tableName) {
       return this.tables.find(function (t) {
-        return t.name === tableName || t.alias === tableName;
+        return t.name === tableName;
       });
     }
   }, {
@@ -153,7 +153,6 @@ var Schema = /*#__PURE__*/function (_Element) {
     value: function pushEnum(_enum) {
       this.checkEnum(_enum);
       this.enums.push(_enum);
-      this.bindEnumToField(_enum);
     }
   }, {
     key: "checkEnum",
@@ -164,21 +163,6 @@ var Schema = /*#__PURE__*/function (_Element) {
         _enum.error("Enum ".concat((0, _utils.shouldPrintSchema)(this) ? "\"".concat(this.name, "\".") : '', "\"").concat(_enum.name, "\" existed"));
       }
     }
-  }, {
-    key: "bindEnumToField",
-    value: function bindEnumToField(_enum) {
-      this.database.schemas.forEach(function (schema) {
-        schema.tables.forEach(function (table) {
-          table.fields.forEach(function (field) {
-            if (_enum.name === field.type.type_name && (field.type.schemaName || _config.DEFAULT_SCHEMA_NAME) === schema.name) {
-              field._enum = _enum;
-
-              _enum.pushField(field);
-            }
-          });
-        });
-      });
-    }
   }, {
     key: "processRefs",
     value: function processRefs(rawRefs) {

package/lib/model_structure/tableGroup.js

@@ -80,7 +80,7 @@ var TableGroup = /*#__PURE__*/function (_Element) {
       var _this2 = this;
 
       rawTables.forEach(function (rawTable) {
-        var table = _this2.schema.database.findTable(rawTable);
+        var table = _this2.schema.database.findTable(rawTable.schemaName, rawTable.name);
 
         if (!table) {
           _this2.error("Table ".concat(rawTable.schemaName ? "\"".concat(rawTable.schemaName, "\".") : '').concat(rawTable.name, " don't exist"));

package/lib/model_structure/utils.js

@@ -4,9 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.shouldPrintSchema = shouldPrintSchema;
+exports.shouldPrintSchemaName = shouldPrintSchemaName;
 
 var _config = require("./config");
 
 function shouldPrintSchema(schema) {
   return schema.name !== _config.DEFAULT_SCHEMA_NAME || schema.name === _config.DEFAULT_SCHEMA_NAME && schema.database.hasDefaultSchema;
+}
+
+function shouldPrintSchemaName(schemaName) {
+  return schemaName !== _config.DEFAULT_SCHEMA_NAME;
 }

package/lib/parse/dbml/parser.pegjs

@@ -5,6 +5,7 @@
     refs: [],
     enums: [],
     tableGroups: [],
+    aliases: [],
     project: {},
   };
   let projectCnt = 0;
@@ -122,23 +123,31 @@ ProjectField
     }
   }
 
-TableGroupSyntax = table_group sp+ name:name _ "{" _ body:table_group_body _ "}" {
+TableGroupSyntax = table_group sp+ schemaName:schema_name? name:name _ "{" _ body:table_group_body _ "}" {
   return {
     name: name,
+    schemaName,
     tables: body,
     token: location()
   }
 }
 
-table_group_body = tables:(name __)* {
+table_group_body = tables:(schema_name? name __)* {
   return tables.map(t => ({
-    name: t[0]
+    name: t[1],
+    schemaName: t[0]
   }));
 }
 
 // References
 RefSyntax
-  = r: (ref_long / ref_short) { return r; }
+  = r: (ref_long / ref_short) {
+    const schemaName = r.endpoints[0].schemaName;
+    return {
+      ...r,
+      schemaName,
+    }; 
+  }
 
 ref_long
   = ref name:(__ name)? _ "{" _ body:ref_body _ "}" {
@@ -163,17 +172,19 @@ ref_short
     }
 
 ref_body
-  = table1:name "." field1:RefField sp+ relation:relation sp+ table2:name "." field2:RefField sp* ref_settings:RefSettings? {
+  = field1:field_identifier sp+ relation:relation sp+ field2:field_identifier sp* ref_settings:RefSettings? {
     const endpoints = [
       {
-        tableName: table1,
-        fieldNames: field1,
+        schemaName: field1.schemaName,
+        tableName: field1.tableName,
+        fieldNames: field1.fieldNames,
         relation: relation === ">" ? "*" : "1",
         token: location()
       },
       {
-        tableName: table2,
-        fieldNames: field2,
+        schemaName: field2.schemaName,
+        tableName: field2.tableName,
+        fieldNames: field2.fieldNames,
         relation: relation === "<" ? "*" : "1",
         token: location()
       }
@@ -224,7 +235,7 @@ OnDelete
 
 // Tables
 TableSyntax
-  = table sp+ name:name alias:alias_def? sp* table_settings:TableSettings? _ "{" body:TableBody "}" {
+  = table sp+ schemaName:schema_name? name:name alias:alias_def? sp* table_settings:TableSettings? _ "{" body:TableBody "}" {
       let fields = body.fields || [];
       let indexes = body.indexes || [];
       // Handle list of partial inline_refs
@@ -234,12 +245,14 @@ TableSyntax
         (field.inline_refs || []).forEach((iref) => {
           const endpoints = [
           {
+            schemaName: iref.schemaName,
             tableName: iref.tableName,
             fieldNames: iref.fieldNames,
             relation: iref.relation === "<" ? "*" : "1",
             token: iref.token
           },
           {
+            schemaName: schemaName,
             tableName: name,
             fieldNames: [field.name],
             relation: iref.relation === ">" ? "*" : "1",
@@ -247,6 +260,7 @@ TableSyntax
           }];
 
           let ref = {
+            schemaName,
             name: null, // no name
             endpoints: endpoints,
             token: iref.token
@@ -255,8 +269,21 @@ TableSyntax
         })
       });
 
+      if (alias) {
+        if (data.aliases.find(a => a.name === alias)) error(`Alias "${alias}" is already defined`);
+        data.aliases.push({
+          name: alias,
+          kind: 'table',
+          value: {
+            tableName: name,
+            schemaName: schemaName,
+          }
+        })
+      }
+
       let res = {
         name: name,
+        schemaName,
         alias: alias,
         fields: fields,
         token: location(),
@@ -323,10 +350,13 @@ TableElement
   }
 
 Field
-  = _ name:name sp+ type:type constrains:(sp+ constrain)* field_settings:(sp+ FieldSettings)? sp* comment? newline {
+  = _ name:name sp+ typeSchemaName:schema_name? type:type constrains:(sp+ constrain)* field_settings:(sp+ FieldSettings)? sp* comment? newline {
     const field = {
       name: name,
-      type: type,
+      type:  {
+        schemaName: typeSchemaName,
+        ...type,
+      },
       token: location(),
       inline_refs: []
     }
@@ -338,9 +368,10 @@ Field
   }
 
 EnumSyntax
-  = enum sp+ name:name _ "{" body: EnumBody "}" {
+  = enum sp+ schemaName:schema_name? name:name _ "{" body: EnumBody "}" {
     return {
       name: name,
+      schemaName,
       token: location(),
       values: body.enum_values
     };
@@ -437,7 +468,7 @@ FieldSetting
   / _ a:"unique"i _ { return a }
   / _ a:"increment" _ { return a }
   / _ v:ObjectNote _ { return { type: 'note', value: v } }
-  / _ v:RefInline { return { type: 'ref_inline', value: v } }
+  / _ v:RefInline _ { return { type: 'ref_inline', value: v } }
   / _ v:Default _ {return {type: 'default', value: v} }
 
 Indexes
@@ -523,10 +554,11 @@ ObjectNote
 IndexType
   = "type:"i _ val:(btree/hash) { return val }
 RefInline
-  = "ref:" sp* relation:relation sp+ table2:name "." field2:name {
+  = "ref:" sp* relation:relation sp+ field:inline_field_identifier{
       return {
-        tableName: table2,
-        fieldNames: [field2],
+        schemaName: field.schemaName,
+        tableName: field.tableName,
+        fieldNames: [field.fieldName],
         relation: relation,
         token: location(),
       }
@@ -584,6 +616,16 @@ name "valid name"
   = c:(character+) { return c.join("") }
   / quote c:[^\"\n]+ quote { return c.join("") }
 
+schema_name "schema name" = name:name "." { return name }
+
+field_identifier = 
+  schemaName:name "." tableName:name "." fieldNames:RefField { return { schemaName, tableName, fieldNames } } /
+  tableName:name "." fieldNames:RefField { return { schemaName: null, tableName, fieldNames } }
+
+inline_field_identifier = 
+  schemaName:name "." tableName:name "." fieldName:name { return { schemaName, tableName, fieldName } } /
+  tableName:name "." fieldName:name { return { schemaName: null, tableName, fieldName } }
+
 type_name "valid name"
   = c:(type_character+) { return c.join("") }
   / quote c:[^\"\n]+ quote { return c.join("") }
@@ -707,10 +749,10 @@ BooleanLiteral = boolean: ('true'i/'false'i/'null'i) {
     value: boolean
   };
 }
-NumberLiteral = number:(float / integer) {
+NumberLiteral = minus:"-"? number:(float / integer) {
   return {
     type: 'number',
-    value: number
+    value: minus ? -number : number
   };
 }
 float