@dbml/core 2.3.1 → 2.4.0

package/lib/export/DbmlExporter.js

@@ -9,6 +9,8 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _utils = require("./utils");
 
+var _config = require("../model_structure/config");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -55,7 +57,13 @@ var DbmlExporter = /*#__PURE__*/function () {
       var table = model.tables[tableId];
       var lines = table.fieldIds.map(function (fieldId) {
         var field = model.fields[fieldId];
-        var line = "\"".concat(field.name, "\" ").concat(DbmlExporter.hasWhiteSpace(field.type.type_name) || DbmlExporter.hasSquareBracket(field.type.type_name) ? "\"".concat(field.type.type_name, "\"") : field.type.type_name);
+        var schemaName = '';
+
+        if (field.type.schemaName && field.type.schemaName !== _config.DEFAULT_SCHEMA_NAME) {
+          schemaName = DbmlExporter.hasWhiteSpace(field.type.schemaName) ? "\"".concat(field.type.schemaName, "\".") : "".concat(field.type.schemaName, ".");
+        }
+
+        var line = "\"".concat(field.name, "\" ").concat(schemaName).concat(DbmlExporter.hasWhiteSpace(field.type.type_name) || DbmlExporter.hasSquareBracket(field.type.type_name) ? "\"".concat(field.type.type_name, "\"") : field.type.type_name);
         var constraints = [];
 
         if (field.unique) {

package/lib/export/MysqlExporter.js

@@ -144,7 +144,7 @@ var MySQLExporter = /*#__PURE__*/function () {
         }).join(',\n'), "\n);\n");
         return tableStr;
       });
-      return tableStrs.length ? tableStrs.join('\n') : '';
+      return tableStrs;
     }
   }, {
     key: "buildFieldName",
@@ -199,7 +199,7 @@ var MySQLExporter = /*#__PURE__*/function () {
         line += ';\n';
         return line;
       });
-      return strArr.length ? strArr.join('\n') : '';
+      return strArr;
     }
   }, {
     key: "exportIndexes",
@@ -241,7 +241,7 @@ var MySQLExporter = /*#__PURE__*/function () {
         line += ';\n';
         return line;
       });
-      return indexArr.length ? indexArr.join('\n') : '';
+      return indexArr;
     }
   }, {
     key: "exportComments",
@@ -257,62 +257,68 @@ var MySQLExporter = /*#__PURE__*/function () {
         line += ';\n';
         return line;
       });
-      return commentArr.length ? commentArr.join('\n') : '';
+      return commentArr;
     }
   }, {
     key: "export",
     value: function _export(model) {
-      var res = '';
-      var hasBlockAbove = false;
       var database = model.database['1'];
-      var indexIds = [];
-      var comments = [];
-      database.schemaIds.forEach(function (schemaId) {
+      var statements = database.schemaIds.reduce(function (prevStatements, schemaId) {
         var schema = model.schemas[schemaId];
         var tableIds = schema.tableIds,
             refIds = schema.refIds;
 
         if ((0, _utils.shouldPrintSchema)(schema, model)) {
-          if (hasBlockAbove) res += '\n';
-          res += "CREATE DATABASE `".concat(schema.name, "`;\n");
-          hasBlockAbove = true;
+          prevStatements.schemas.push("CREATE SCHEMA `".concat(schema.name, "`;\n"));
         }
 
         if (!_lodash["default"].isEmpty(tableIds)) {
-          if (hasBlockAbove) res += '\n';
-          res += MySQLExporter.exportTables(tableIds, model);
-          hasBlockAbove = true;
-        }
+          var _prevStatements$table;
 
-        if (!_lodash["default"].isEmpty(refIds)) {
-          if (hasBlockAbove) res += '\n';
-          res += MySQLExporter.exportRefs(refIds, model);
-          hasBlockAbove = true;
+          (_prevStatements$table = prevStatements.tables).push.apply(_prevStatements$table, _toConsumableArray(MySQLExporter.exportTables(tableIds, model)));
         }
 
-        indexIds.push.apply(indexIds, _toConsumableArray(_lodash["default"].flatten(tableIds.map(function (tableId) {
+        var indexIds = _lodash["default"].flatten(tableIds.map(function (tableId) {
           return model.tables[tableId].indexIds;
-        }))));
-        comments.push.apply(comments, _toConsumableArray(_lodash["default"].flatten(tableIds.map(function (tableId) {
+        }));
+
+        if (!_lodash["default"].isEmpty(indexIds)) {
+          var _prevStatements$index;
+
+          (_prevStatements$index = prevStatements.indexes).push.apply(_prevStatements$index, _toConsumableArray(MySQLExporter.exportIndexes(indexIds, model)));
+        }
+
+        var commentNodes = _lodash["default"].flatten(tableIds.map(function (tableId) {
           var note = model.tables[tableId].note;
           return note ? [{
             type: 'table',
             tableId: tableId
           }] : [];
-        }))));
+        }));
+
+        if (!_lodash["default"].isEmpty(commentNodes)) {
+          var _prevStatements$comme;
+
+          (_prevStatements$comme = prevStatements.comments).push.apply(_prevStatements$comme, _toConsumableArray(MySQLExporter.exportComments(commentNodes, model)));
+        }
+
+        if (!_lodash["default"].isEmpty(refIds)) {
+          var _prevStatements$refs;
+
+          (_prevStatements$refs = prevStatements.refs).push.apply(_prevStatements$refs, _toConsumableArray(MySQLExporter.exportRefs(refIds, model)));
+        }
+
+        return prevStatements;
+      }, {
+        schemas: [],
+        enums: [],
+        tables: [],
+        indexes: [],
+        comments: [],
+        refs: []
       });
 
-      if (!_lodash["default"].isEmpty(indexIds)) {
-        if (hasBlockAbove) res += '\n';
-        res += MySQLExporter.exportIndexes(indexIds, model);
-        hasBlockAbove = true;
-      }
-
-      if (!_lodash["default"].isEmpty(comments)) {
-        if (hasBlockAbove) res += '\n';
-        res += MySQLExporter.exportComments(comments, model);
-        hasBlockAbove = true;
-      }
+      var res = _lodash["default"].concat(statements.schemas, statements.enums, statements.tables, statements.indexes, statements.comments, statements.refs).join('\n');
 
       return res;
     }

package/lib/export/PostgresExporter.js

@@ -9,6 +9,8 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _utils = require("./utils");
 
+var _config = require("../model_structure/config");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -50,7 +52,7 @@ var PostgresExporter = /*#__PURE__*/function () {
         var line = "CREATE TYPE ".concat((0, _utils.shouldPrintSchema)(schema, model) ? "\"".concat(schema.name, "\".") : '', "\"").concat(_enum.name, "\" AS ENUM (\n").concat(enumValueStr, "\n);\n");
         return line;
       });
-      return enumArr.length ? enumArr.join('\n') : '';
+      return enumArr;
     }
   }, {
     key: "getFieldLines",
@@ -63,10 +65,15 @@ var PostgresExporter = /*#__PURE__*/function () {
         if (field.increment) {
           var typeSerial = field.type.type_name === 'bigint' ? 'BIGSERIAL' : 'SERIAL';
           line = "\"".concat(field.name, "\" ").concat(typeSerial);
-        } else if ((0, _utils.hasWhiteSpace)(field.type.type_name)) {
-          line = "\"".concat(field.name, "\" \"").concat(field.type.type_name, "\"");
         } else {
-          line = "\"".concat(field.name, "\" ").concat(field.type.type_name);
+          var schemaName = '';
+
+          if (field.type.schemaName && field.type.schemaName !== _config.DEFAULT_SCHEMA_NAME) {
+            schemaName = (0, _utils.hasWhiteSpace)(field.type.schemaName) ? "\"".concat(field.type.schemaName, "\".") : "".concat(field.type.schemaName, ".");
+          }
+
+          var typeName = (0, _utils.hasWhiteSpace)(field.type.type_name) ? "\"".concat(field.type.type_name, "\"") : field.type.type_name;
+          line = "\"".concat(field.name, "\" ").concat(schemaName).concat(typeName);
         }
 
         if (field.unique) {
@@ -150,7 +157,7 @@ var PostgresExporter = /*#__PURE__*/function () {
         }).join(',\n'), "\n);\n");
         return tableStr;
       });
-      return tableStrs.length ? tableStrs.join('\n') : '';
+      return tableStrs;
     }
   }, {
     key: "buildFieldName",
@@ -205,7 +212,7 @@ var PostgresExporter = /*#__PURE__*/function () {
         line += ';\n';
         return line;
       });
-      return strArr.length ? strArr.join('\n') : '';
+      return strArr;
     }
   }, {
     key: "exportIndexes",
@@ -253,7 +260,7 @@ var PostgresExporter = /*#__PURE__*/function () {
         line += ';\n';
         return line;
       });
-      return indexArr.length ? indexArr.join('\n') : '';
+      return indexArr;
     }
   }, {
     key: "exportComments",
@@ -284,50 +291,45 @@ var PostgresExporter = /*#__PURE__*/function () {
         line += ';\n';
         return line;
       });
-      return commentArr.length ? commentArr.join('\n') : '';
+      return commentArr;
     }
   }, {
     key: "export",
     value: function _export(model) {
-      var res = '';
-      var hasBlockAbove = false;
       var database = model.database['1'];
-      var indexIds = [];
-      var comments = [];
-      database.schemaIds.forEach(function (schemaId) {
+      var statements = database.schemaIds.reduce(function (prevStatements, schemaId) {
         var schema = model.schemas[schemaId];
         var tableIds = schema.tableIds,
             enumIds = schema.enumIds,
             refIds = schema.refIds;
 
         if ((0, _utils.shouldPrintSchema)(schema, model)) {
-          if (hasBlockAbove) res += '\n';
-          res += "CREATE SCHEMA \"".concat(schema.name, "\";\n");
-          hasBlockAbove = true;
+          prevStatements.schemas.push("CREATE SCHEMA \"".concat(schema.name, "\";\n"));
         }
 
         if (!_lodash["default"].isEmpty(enumIds)) {
-          if (hasBlockAbove) res += '\n';
-          res += PostgresExporter.exportEnums(enumIds, model);
-          hasBlockAbove = true;
+          var _prevStatements$enums;
+
+          (_prevStatements$enums = prevStatements.enums).push.apply(_prevStatements$enums, _toConsumableArray(PostgresExporter.exportEnums(enumIds, model)));
         }
 
         if (!_lodash["default"].isEmpty(tableIds)) {
-          if (hasBlockAbove) res += '\n';
-          res += PostgresExporter.exportTables(tableIds, model);
-          hasBlockAbove = true;
-        }
+          var _prevStatements$table;
 
-        if (!_lodash["default"].isEmpty(refIds)) {
-          if (hasBlockAbove) res += '\n';
-          res += PostgresExporter.exportRefs(refIds, model);
-          hasBlockAbove = true;
+          (_prevStatements$table = prevStatements.tables).push.apply(_prevStatements$table, _toConsumableArray(PostgresExporter.exportTables(tableIds, model)));
         }
 
-        indexIds.push.apply(indexIds, _toConsumableArray(_lodash["default"].flatten(tableIds.map(function (tableId) {
+        var indexIds = _lodash["default"].flatten(tableIds.map(function (tableId) {
           return model.tables[tableId].indexIds;
-        }))));
-        comments.push.apply(comments, _toConsumableArray(_lodash["default"].flatten(tableIds.map(function (tableId) {
+        }));
+
+        if (!_lodash["default"].isEmpty(indexIds)) {
+          var _prevStatements$index;
+
+          (_prevStatements$index = prevStatements.indexes).push.apply(_prevStatements$index, _toConsumableArray(PostgresExporter.exportIndexes(indexIds, model)));
+        }
+
+        var commentNodes = _lodash["default"].flatten(tableIds.map(function (tableId) {
           var _model$tables$tableId = model.tables[tableId],
               fieldIds = _model$tables$tableId.fieldIds,
               note = _model$tables$tableId.note;
@@ -344,20 +346,31 @@ var PostgresExporter = /*#__PURE__*/function () {
             type: 'table',
             tableId: tableId
           }].concat(fieldObjects) : fieldObjects;
-        }))));
+        }));
+
+        if (!_lodash["default"].isEmpty(commentNodes)) {
+          var _prevStatements$comme;
+
+          (_prevStatements$comme = prevStatements.comments).push.apply(_prevStatements$comme, _toConsumableArray(PostgresExporter.exportComments(commentNodes, model)));
+        }
+
+        if (!_lodash["default"].isEmpty(refIds)) {
+          var _prevStatements$refs;
+
+          (_prevStatements$refs = prevStatements.refs).push.apply(_prevStatements$refs, _toConsumableArray(PostgresExporter.exportRefs(refIds, model)));
+        }
+
+        return prevStatements;
+      }, {
+        schemas: [],
+        enums: [],
+        tables: [],
+        indexes: [],
+        comments: [],
+        refs: []
       });
 
-      if (!_lodash["default"].isEmpty(indexIds)) {
-        if (hasBlockAbove) res += '\n';
-        res += PostgresExporter.exportIndexes(indexIds, model);
-        hasBlockAbove = true;
-      }
-
-      if (!_lodash["default"].isEmpty(comments)) {
-        if (hasBlockAbove) res += '\n';
-        res += PostgresExporter.exportComments(comments, model);
-        hasBlockAbove = true;
-      }
+      var res = _lodash["default"].concat(statements.schemas, statements.enums, statements.tables, statements.indexes, statements.comments, statements.refs).join('\n');
 
       return res;
     }

package/lib/export/SqlServerExporter.js

@@ -141,7 +141,7 @@ var SqlServerExporter = /*#__PURE__*/function () {
         }).join(',\n'), "\n)\nGO\n");
         return tableStr;
       });
-      return tableStrs.length ? tableStrs.join('\n') : '';
+      return tableStrs;
     }
   }, {
     key: "buildFieldName",
@@ -196,7 +196,7 @@ var SqlServerExporter = /*#__PURE__*/function () {
         line += '\nGO\n';
         return line;
       });
-      return strArr.length ? strArr.join('\n') : '';
+      return strArr;
     }
   }, {
     key: "exportIndexes",
@@ -233,7 +233,7 @@ var SqlServerExporter = /*#__PURE__*/function () {
         line += '\nGO\n';
         return line;
       });
-      return indexArr.length ? indexArr.join('\n') : '';
+      return indexArr;
     }
   }, {
     key: "exportComments",
@@ -272,49 +272,42 @@ var SqlServerExporter = /*#__PURE__*/function () {
         line += 'GO\n';
         return line;
       });
-      return commentArr.length ? commentArr.join('\n') : '';
+      return commentArr;
     }
   }, {
     key: "export",
     value: function _export(model) {
-      var res = '';
-      var hasBlockAbove = false;
       var database = model.database['1'];
-      var indexIds = [];
-      var comments = [];
-      database.schemaIds.forEach(function (schemaId) {
+      var statements = database.schemaIds.reduce(function (prevStatements, schemaId) {
         var schema = model.schemas[schemaId];
         var tableIds = schema.tableIds,
             refIds = schema.refIds;
 
         if ((0, _utils.shouldPrintSchema)(schema, model)) {
-          if (hasBlockAbove) res += '\n';
-          res += "CREATE SCHEMA [".concat(schema.name, "];\nGO\n");
-          hasBlockAbove = true;
+          prevStatements.schemas.push("CREATE SCHEMA [".concat(schema.name, "]\nGO\n"));
         }
 
         if (!_lodash["default"].isEmpty(tableIds)) {
-          if (hasBlockAbove) res += '\n';
-          res += SqlServerExporter.exportTables(tableIds, model);
-          hasBlockAbove = true;
+          var _prevStatements$table;
+
+          (_prevStatements$table = prevStatements.tables).push.apply(_prevStatements$table, _toConsumableArray(SqlServerExporter.exportTables(tableIds, model)));
         }
 
-        if (!_lodash["default"].isEmpty(refIds)) {
-          if (hasBlockAbove) res += '\n';
-          res += SqlServerExporter.exportRefs(refIds, model);
-          hasBlockAbove = true;
-        } /////////PUSH COMMENTS OF TABLE & COLUMN/////////
-        // console.log(JSON.stringify(tableIds, null, 2));
+        var indexIds = _lodash["default"].flatten(tableIds.map(function (tableId) {
+          return model.tables[tableId].indexIds;
+        }));
 
+        if (!_lodash["default"].isEmpty(indexIds)) {
+          var _prevStatements$index;
 
-        indexIds.push.apply(indexIds, _toConsumableArray(_lodash["default"].flatten(tableIds.map(function (tableId) {
-          return model.tables[tableId].indexIds;
-        }))));
-        comments.push.apply(comments, _toConsumableArray(_lodash["default"].flatten(tableIds.map(function (tableId) {
+          (_prevStatements$index = prevStatements.indexes).push.apply(_prevStatements$index, _toConsumableArray(SqlServerExporter.exportIndexes(indexIds, model)));
+        }
+
+        var commentNodes = _lodash["default"].flatten(tableIds.map(function (tableId) {
           var _model$tables$tableId = model.tables[tableId],
               fieldIds = _model$tables$tableId.fieldIds,
               note = _model$tables$tableId.note;
-          var fieldObject = fieldIds.filter(function (fieldId) {
+          var fieldObjects = fieldIds.filter(function (fieldId) {
             return model.fields[fieldId].note;
           }).map(function (fieldId) {
             return {
@@ -326,21 +319,32 @@ var SqlServerExporter = /*#__PURE__*/function () {
           return note ? [{
             type: 'table',
             tableId: tableId
-          }].concat(fieldObject) : fieldObject;
-        }))));
+          }].concat(fieldObjects) : fieldObjects;
+        }));
+
+        if (!_lodash["default"].isEmpty(commentNodes)) {
+          var _prevStatements$comme;
+
+          (_prevStatements$comme = prevStatements.comments).push.apply(_prevStatements$comme, _toConsumableArray(SqlServerExporter.exportComments(commentNodes, model)));
+        }
+
+        if (!_lodash["default"].isEmpty(refIds)) {
+          var _prevStatements$refs;
+
+          (_prevStatements$refs = prevStatements.refs).push.apply(_prevStatements$refs, _toConsumableArray(SqlServerExporter.exportRefs(refIds, model)));
+        }
+
+        return prevStatements;
+      }, {
+        schemas: [],
+        enums: [],
+        tables: [],
+        indexes: [],
+        comments: [],
+        refs: []
       });
 
-      if (!_lodash["default"].isEmpty(indexIds)) {
-        if (hasBlockAbove) res += '\n';
-        res += SqlServerExporter.exportIndexes(indexIds, model);
-        hasBlockAbove = true;
-      }
-
-      if (!_lodash["default"].isEmpty(comments)) {
-        if (hasBlockAbove) res += '\n';
-        res += SqlServerExporter.exportComments(comments, model);
-        hasBlockAbove = true;
-      }
+      var res = _lodash["default"].concat(statements.schemas, statements.enums, statements.tables, statements.indexes, statements.comments, statements.refs).join('\n');
 
       return res;
     }

package/lib/model_structure/database.js

@@ -11,7 +11,7 @@ var _schema = _interopRequireDefault(require("./schema"));
 
 var _ref2 = _interopRequireDefault(require("./ref"));
 
-var _enum = _interopRequireDefault(require("./enum"));
+var _enum2 = _interopRequireDefault(require("./enum"));
 
 var _tableGroup = _interopRequireDefault(require("./tableGroup"));
 
@@ -72,7 +72,9 @@ var Database = /*#__PURE__*/function (_Element) {
         _ref$tableGroups = _ref.tableGroups,
         tableGroups = _ref$tableGroups === void 0 ? [] : _ref$tableGroups,
         _ref$project = _ref.project,
-        project = _ref$project === void 0 ? {} : _ref$project;
+        project = _ref$project === void 0 ? {} : _ref$project,
+        _ref$aliases = _ref.aliases,
+        aliases = _ref$aliases === void 0 ? [] : _ref$aliases;
 
     _classCallCheck(this, Database);
 
@@ -85,16 +87,17 @@ var Database = /*#__PURE__*/function (_Element) {
     _this.schemas = [];
     _this.note = project.note;
     _this.databaseType = project.database_type;
-    _this.name = project.name; // The process order is important. Do not change !
+    _this.name = project.name;
+    _this.aliases = aliases; // The process order is important. Do not change !
 
     _this.processSchemas(schemas);
 
+    _this.processSchemaElements(enums, _config.ENUM);
+
     _this.processSchemaElements(tables, _config.TABLE);
 
     _this.processSchemaElements(refs, _config.REF);
 
-    _this.processSchemaElements(enums, _config.ENUM);
-
     _this.processSchemaElements(tableGroups, _config.TABLE_GROUP);
 
     return _this;
@@ -141,8 +144,7 @@ var Database = /*#__PURE__*/function (_Element) {
         if (element.schemaName) {
           schema = _this3.findOrCreateSchema(element.schemaName);
 
-          if (element.schemaName === _config.DEFAULT_SCHEMA_NAME) {
-            _this3.hasDefaultSchema = true;
+          if (element.schemaName === _config.DEFAULT_SCHEMA_NAME) {// this.hasDefaultSchema = true;
           }
         } else {
           schema = _this3.findOrCreateSchema(_config.DEFAULT_SCHEMA_NAME);
@@ -156,7 +158,7 @@ var Database = /*#__PURE__*/function (_Element) {
             break;
 
           case _config.ENUM:
-            schema.pushEnum(new _enum["default"](_objectSpread(_objectSpread({}, element), {}, {
+            schema.pushEnum(new _enum2["default"](_objectSpread(_objectSpread({}, element), {}, {
               schema: schema
             })));
             break;
@@ -196,16 +198,55 @@ var Database = /*#__PURE__*/function (_Element) {
 
       return schema;
     }
+  }, {
+    key: "findTableAlias",
+    value: function findTableAlias(alias) {
+      var sym = this.aliases.find(function (a) {
+        return a.name === alias;
+      });
+      if (!sym || sym.kind !== 'table') return null;
+      var schemaName = sym.value.schemaName || _config.DEFAULT_SCHEMA_NAME;
+      var schema = this.schemas.find(function (s) {
+        return s.name === schemaName;
+      });
+      if (!schema) return null;
+      var tableName = sym.value.tableName;
+      var table = schema.tables.find(function (t) {
+        return t.name === tableName;
+      });
+      return table;
+    }
   }, {
     key: "findTable",
-    value: function findTable(rawTable) {
-      var schema = this.findOrCreateSchema(rawTable.schemaName || _config.DEFAULT_SCHEMA_NAME);
+    value: function findTable(schemaName, tableName) {
+      var table = null;
+
+      if (!schemaName) {
+        table = this.findTableAlias(tableName);
+        if (table) return table;
+      }
+
+      var schema = this.findOrCreateSchema(schemaName || _config.DEFAULT_SCHEMA_NAME);
 
       if (!schema) {
-        this.error("Schema ".concat(rawTable.schemaName || _config.DEFAULT_SCHEMA_NAME, " don't exist"));
+        this.error("Schema ".concat(schemaName || _config.DEFAULT_SCHEMA_NAME, " don't exist"));
       }
 
-      return schema.findTable(rawTable.name);
+      return schema.findTable(tableName);
+    }
+  }, {
+    key: "findEnum",
+    value: function findEnum(schemaName, name) {
+      var schema = this.schemas.find(function (s) {
+        return s.name === schemaName || s.alias === schemaName;
+      });
+      if (!schema) return null;
+
+      var _enum = schema.enums.find(function (e) {
+        return e.name === name;
+      });
+
+      return _enum;
     }
   }, {
     key: "export",

package/lib/model_structure/endpoint.js

@@ -72,10 +72,10 @@ var Endpoint = /*#__PURE__*/function (_Element) {
 
 
     var schema = ref.schema.database.findOrCreateSchema(schemaName || _config.DEFAULT_SCHEMA_NAME);
-    var table = schema.findTable(tableName);
+    var table = schema.database.findTable(schemaName, tableName);
 
     if (!table) {
-      _this.error("Can't find table ".concat((0, _utils.shouldPrintSchema)(schema) ? "\"".concat(schema.name, "\".") : '', "\"").concat(tableName, "\""));
+      _this.error("Can't find table ".concat((0, _utils.shouldPrintSchemaName)(schemaName) ? "\"".concat(schemaName, "\".") : '', "\"").concat(tableName, "\""));
     }
 
     _this.setFields(fieldNames, table);

package/lib/model_structure/field.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _element = _interopRequireDefault(require("./element"));
 
+var _config = require("./config");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": 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); }
@@ -70,7 +72,7 @@ var Field = /*#__PURE__*/function (_Element) {
       _this.error('Field must have a type');
     }
 
-    _this.name = name; // type : { type_name, value }
+    _this.name = name; // type : { type_name, value, schemaName }
 
     _this.type = type;
     _this.unique = unique;
@@ -85,6 +87,8 @@ var Field = /*#__PURE__*/function (_Element) {
 
     _this.generateId();
 
+    _this.bindType();
+
     return _this;
   }
 
@@ -93,6 +97,32 @@ var Field = /*#__PURE__*/function (_Element) {
     value: function generateId() {
       this.id = this.dbState.generateId('fieldId');
     }
+  }, {
+    key: "bindType",
+    value: function bindType() {
+      var typeName = this.type.type_name;
+      var typeSchemaName = this.type.schemaName || _config.DEFAULT_SCHEMA_NAME;
+
+      if (this.type.schemaName) {
+        var _enum = this.table.schema.database.findEnum(typeSchemaName, typeName);
+
+        if (!_enum) {
+          this.error("Cannot find type ".concat(typeSchemaName, " in schema ").concat(typeSchemaName));
+          return;
+        }
+
+        this._enum = _enum;
+
+        _enum.pushField(this);
+      } else {
+        var _enum2 = this.table.schema.database.findEnum(typeSchemaName, typeName);
+
+        if (!_enum2) return;
+        this._enum = _enum2;
+
+        _enum2.pushField(this);
+      }
+    }
   }, {
     key: "pushEndpoint",
     value: function pushEndpoint(endpoint) {

package/lib/model_structure/ref.js

@@ -100,8 +100,7 @@ var Ref = /*#__PURE__*/function (_Element) {
           ref: _this2
         })));
 
-        if (endpoint.schemaName === _config.DEFAULT_SCHEMA_NAME) {
-          _this2.database.hasDefaultSchema = true;
+        if (endpoint.schemaName === _config.DEFAULT_SCHEMA_NAME) {// this.schema.database.hasDefaultSchema = true;
         }
       });