@dbml/core 2.3.1 → 2.4.2

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) {
@@ -185,10 +193,6 @@ var DbmlExporter = /*#__PURE__*/function () {
         settingStr += "headerColor: ".concat(table.headerColor).concat(settingSep);
       }
 
-      if (table.note) {
-        settingStr += "note: '".concat(table.note, "'").concat(settingSep);
-      }
-
       if (settingStr.endsWith(', ')) {
         settingStr = settingStr.replace(/,\s$/, '');
       }
@@ -215,9 +219,10 @@ var DbmlExporter = /*#__PURE__*/function () {
           }).join('\n'), "\n}");
         }
 
+        var tableNote = table.note ? "  Note: '".concat(table.note, "'\n") : '';
         var tableStr = "Table ".concat((0, _utils.shouldPrintSchema)(schema, model) ? "\"".concat(schema.name, "\".") : '', "\"").concat(table.name, "\"").concat(tableSettingStr, " {\n").concat(tableContent.fieldContents.map(function (line) {
           return "  ".concat(line);
-        }).join('\n'), "\n").concat(indexStr ? "".concat(indexStr, "\n") : '', "}\n");
+        }).join('\n'), "\n").concat(indexStr ? "".concat(indexStr, "\n") : '').concat(tableNote, "}\n");
         return tableStr;
       });
       return tableStrs.length ? tableStrs.join('\n') : '';

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",
@@ -154,16 +154,64 @@ var MySQLExporter = /*#__PURE__*/function () {
       }).join(', ');
       return "(".concat(fieldNames, ")");
     }
+  }, {
+    key: "buildTableManyToMany",
+    value: function buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, tableName) {
+      var line = "CREATE TABLE `".concat(tableName, "` (\n");
+
+      var key1s = _toConsumableArray(firstTableFieldsMap.keys()).join('`, `');
+
+      var key2s = _toConsumableArray(secondTableFieldsMap.keys()).join('`, `');
+
+      firstTableFieldsMap.forEach(function (fieldType, fieldName) {
+        line += "  `".concat(fieldName, "` ").concat(fieldType, " NOT NULL,\n");
+      });
+      secondTableFieldsMap.forEach(function (fieldType, fieldName) {
+        line += "  `".concat(fieldName, "` ").concat(fieldType, " NOT NULL,\n");
+      });
+      line += "  PRIMARY KEY (`".concat(key1s, "`, `").concat(key2s, "`)\n");
+      line += ');\n\n';
+      return line;
+    }
+  }, {
+    key: "buildForeignKeyManyToMany",
+    value: function buildForeignKeyManyToMany(fieldsMap, foreignEndpointFields, refEndpointTableName, foreignEndpointTableName, schema, model) {
+      var refEndpointFields = _toConsumableArray(fieldsMap.keys()).join('`, `');
+
+      var line = "ALTER TABLE `".concat(refEndpointTableName, "` ADD FOREIGN KEY (`").concat(refEndpointFields, "`) REFERENCES ").concat((0, _utils.shouldPrintSchema)(schema, model) ? "`".concat(schema.name, "`.") : '', "`").concat(foreignEndpointTableName, "` ").concat(foreignEndpointFields, ";\n\n");
+      return line;
+    }
+  }, {
+    key: "buildIndexManytoMany",
+    value: function buildIndexManytoMany(fieldsMap, newTableName, tableRefName, usedIndexNames) {
+      var newIndexName = "".concat(newTableName, "_").concat(tableRefName);
+      var count = 1;
+
+      while (usedIndexNames.has(newIndexName)) {
+        newIndexName = "".concat(newTableName, "_").concat(tableRefName, "(").concat(count, ")");
+        count += 1;
+      }
+
+      usedIndexNames.add(newIndexName);
+
+      var indexFields = _toConsumableArray(fieldsMap.keys()).join('`, `');
+
+      var line = "CREATE INDEX `idx_".concat(newIndexName, "` ON `").concat(newTableName, "` (");
+      line += "`".concat(indexFields, "`);\n\n");
+      return line;
+    }
   }, {
     key: "exportRefs",
-    value: function exportRefs(refIds, model) {
+    value: function exportRefs(refIds, model, usedTableNames, usedIndexNames) {
       var _this = this;
 
       var strArr = refIds.map(function (refId) {
+        var line = '';
         var ref = model.refs[refId];
-        var refEndpointIndex = ref.endpointIds.findIndex(function (endpointId) {
+        var refOneIndex = ref.endpointIds.findIndex(function (endpointId) {
           return model.endpoints[endpointId].relation === '1';
         });
+        var refEndpointIndex = refOneIndex === -1 ? 0 : refOneIndex;
         var foreignEndpointId = ref.endpointIds[1 - refEndpointIndex];
         var refEndpointId = ref.endpointIds[refEndpointIndex];
         var foreignEndpoint = model.endpoints[foreignEndpointId];
@@ -180,26 +228,45 @@ var MySQLExporter = /*#__PURE__*/function () {
 
         var foreignEndpointFieldName = _this.buildFieldName(foreignEndpoint.fieldIds, model, 'mysql');
 
-        var line = "ALTER TABLE ".concat((0, _utils.shouldPrintSchema)(foreignEndpointSchema, model) ? "`".concat(foreignEndpointSchema.name, "`.") : '', "`").concat(foreignEndpointTable.name, "` ADD ");
+        if (refOneIndex === -1) {
+          var firstTableFieldsMap = (0, _utils.buildJunctionFields1)(refEndpoint.fieldIds, model);
+          var secondTableFieldsMap = (0, _utils.buildJunctionFields2)(foreignEndpoint.fieldIds, model, firstTableFieldsMap);
+          var newTableName = (0, _utils.buildNewTableName)(refEndpointTable.name, foreignEndpointTable.name, usedTableNames);
+          line += _this.buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, newTableName);
 
-        if (ref.name) {
-          line += "CONSTRAINT `".concat(ref.name, "` ");
-        }
+          if (firstTableFieldsMap.size > 1) {
+            line += _this.buildIndexManytoMany(firstTableFieldsMap, newTableName, refEndpointTable.name, usedIndexNames);
+          }
 
-        line += "FOREIGN KEY ".concat(foreignEndpointFieldName, " REFERENCES ").concat((0, _utils.shouldPrintSchema)(refEndpointSchema, model) ? "`".concat(refEndpointSchema.name, "`.") : '', "`").concat(refEndpointTable.name, "` ").concat(refEndpointFieldName);
+          if (secondTableFieldsMap.size > 1) {
+            line += _this.buildIndexManytoMany(secondTableFieldsMap, newTableName, foreignEndpointTable.name, usedIndexNames);
+          }
 
-        if (ref.onDelete) {
-          line += " ON DELETE ".concat(ref.onDelete.toUpperCase());
-        }
+          line += _this.buildForeignKeyManyToMany(firstTableFieldsMap, refEndpointFieldName, newTableName, refEndpointTable.name, refEndpointSchema, model);
+          line += _this.buildForeignKeyManyToMany(secondTableFieldsMap, foreignEndpointFieldName, newTableName, foreignEndpointTable.name, foreignEndpointSchema, model);
+        } else {
+          line = "ALTER TABLE ".concat((0, _utils.shouldPrintSchema)(foreignEndpointSchema, model) ? "`".concat(foreignEndpointSchema.name, "`.") : '', "`").concat(foreignEndpointTable.name, "` ADD ");
+
+          if (ref.name) {
+            line += "CONSTRAINT `".concat(ref.name, "` ");
+          }
 
-        if (ref.onUpdate) {
-          line += " ON UPDATE ".concat(ref.onUpdate.toUpperCase());
+          line += "FOREIGN KEY ".concat(foreignEndpointFieldName, " REFERENCES ").concat((0, _utils.shouldPrintSchema)(refEndpointSchema, model) ? "`".concat(refEndpointSchema.name, "`.") : '', "`").concat(refEndpointTable.name, "` ").concat(refEndpointFieldName);
+
+          if (ref.onDelete) {
+            line += " ON DELETE ".concat(ref.onDelete.toUpperCase());
+          }
+
+          if (ref.onUpdate) {
+            line += " ON UPDATE ".concat(ref.onUpdate.toUpperCase());
+          }
+
+          line += ';\n';
         }
 
-        line += ';\n';
         return line;
       });
-      return strArr.length ? strArr.join('\n') : '';
+      return strArr;
     }
   }, {
     key: "exportIndexes",
@@ -241,7 +308,7 @@ var MySQLExporter = /*#__PURE__*/function () {
         line += ';\n';
         return line;
       });
-      return indexArr.length ? indexArr.join('\n') : '';
+      return indexArr;
     }
   }, {
     key: "exportComments",
@@ -257,62 +324,74 @@ 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 usedTableNames = new Set(Object.values(model.tables).map(function (table) {
+        return table.name;
+      }));
+      var usedIndexNames = new Set(Object.values(model.indexes).map(function (index) {
+        return index.name;
+      }));
+      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(indexIds)) {
-        if (hasBlockAbove) res += '\n';
-        res += MySQLExporter.exportIndexes(indexIds, model);
-        hasBlockAbove = true;
-      }
+        if (!_lodash["default"].isEmpty(commentNodes)) {
+          var _prevStatements$comme;
 
-      if (!_lodash["default"].isEmpty(comments)) {
-        if (hasBlockAbove) res += '\n';
-        res += MySQLExporter.exportComments(comments, model);
-        hasBlockAbove = true;
-      }
+          (_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, usedTableNames, usedIndexNames)));
+        }
+
+        return prevStatements;
+      }, {
+        schemas: [],
+        enums: [],
+        tables: [],
+        indexes: [],
+        comments: [],
+        refs: []
+      });
+
+      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",
@@ -160,16 +167,64 @@ var PostgresExporter = /*#__PURE__*/function () {
       }).join(', ');
       return "(".concat(fieldNames, ")");
     }
+  }, {
+    key: "buildTableManyToMany",
+    value: function buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, tableName) {
+      var line = "CREATE TABLE \"".concat(tableName, "\" (\n");
+
+      var key1s = _toConsumableArray(firstTableFieldsMap.keys()).join('", "');
+
+      var key2s = _toConsumableArray(secondTableFieldsMap.keys()).join('", "');
+
+      firstTableFieldsMap.forEach(function (fieldType, fieldName) {
+        line += "  \"".concat(fieldName, "\" ").concat(fieldType, " NOT NULL,\n");
+      });
+      secondTableFieldsMap.forEach(function (fieldType, fieldName) {
+        line += "  \"".concat(fieldName, "\" ").concat(fieldType, " NOT NULL,\n");
+      });
+      line += "  PRIMARY KEY (\"".concat(key1s, "\", \"").concat(key2s, "\")\n");
+      line += ');\n\n';
+      return line;
+    }
+  }, {
+    key: "buildForeignKeyManyToMany",
+    value: function buildForeignKeyManyToMany(fieldsMap, foreignEndpointFields, refEndpointTableName, foreignEndpointTableName, schema, model) {
+      var refEndpointFields = _toConsumableArray(fieldsMap.keys()).join('", "');
+
+      var line = "ALTER TABLE \"".concat(refEndpointTableName, "\" ADD FOREIGN KEY (\"").concat(refEndpointFields, "\") REFERENCES ").concat((0, _utils.shouldPrintSchema)(schema, model) ? "\"".concat(schema.name, "\".") : '', "\"").concat(foreignEndpointTableName, "\" ").concat(foreignEndpointFields, ";\n\n");
+      return line;
+    }
+  }, {
+    key: "buildIndexManytoMany",
+    value: function buildIndexManytoMany(fieldsMap, newTableName, tableRefName, usedIndexNames) {
+      var newIndexName = "".concat(newTableName, "_").concat(tableRefName);
+      var count = 1;
+
+      while (usedIndexNames.has(newIndexName)) {
+        newIndexName = "".concat(newTableName, "_").concat(tableRefName, "(").concat(count, ")");
+        count += 1;
+      }
+
+      usedIndexNames.add(newIndexName);
+
+      var indexFields = _toConsumableArray(fieldsMap.keys()).join('", "');
+
+      var line = "CREATE INDEX \"idx_".concat(newIndexName, "\" ON \"").concat(newTableName, "\" (");
+      line += "\"".concat(indexFields, "\");\n\n");
+      return line;
+    }
   }, {
     key: "exportRefs",
-    value: function exportRefs(refIds, model) {
+    value: function exportRefs(refIds, model, usedTableNames, usedIndexNames) {
       var _this = this;
 
       var strArr = refIds.map(function (refId) {
+        var line = '';
         var ref = model.refs[refId];
-        var refEndpointIndex = ref.endpointIds.findIndex(function (endpointId) {
+        var refOneIndex = ref.endpointIds.findIndex(function (endpointId) {
           return model.endpoints[endpointId].relation === '1';
         });
+        var refEndpointIndex = refOneIndex === -1 ? 0 : refOneIndex;
         var foreignEndpointId = ref.endpointIds[1 - refEndpointIndex];
         var refEndpointId = ref.endpointIds[refEndpointIndex];
         var foreignEndpoint = model.endpoints[foreignEndpointId];
@@ -186,26 +241,46 @@ var PostgresExporter = /*#__PURE__*/function () {
 
         var foreignEndpointFieldName = _this.buildFieldName(foreignEndpoint.fieldIds, model, 'postgres');
 
-        var line = "ALTER TABLE ".concat((0, _utils.shouldPrintSchema)(foreignEndpointSchema, model) ? "\"".concat(foreignEndpointSchema.name, "\".") : '', "\"").concat(foreignEndpointTable.name, "\" ADD ");
+        if (refOneIndex === -1) {
+          // many to many relationship
+          var firstTableFieldsMap = (0, _utils.buildJunctionFields1)(refEndpoint.fieldIds, model);
+          var secondTableFieldsMap = (0, _utils.buildJunctionFields2)(foreignEndpoint.fieldIds, model, firstTableFieldsMap);
+          var newTableName = (0, _utils.buildNewTableName)(refEndpointTable.name, foreignEndpointTable.name, usedTableNames);
+          line += _this.buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, newTableName);
 
-        if (ref.name) {
-          line += "CONSTRAINT \"".concat(ref.name, "\" ");
-        }
+          if (firstTableFieldsMap.size > 1) {
+            line += _this.buildIndexManytoMany(firstTableFieldsMap, newTableName, refEndpointTable.name, usedIndexNames);
+          }
 
-        line += "FOREIGN KEY ".concat(foreignEndpointFieldName, " REFERENCES ").concat((0, _utils.shouldPrintSchema)(refEndpointSchema, model) ? "\"".concat(refEndpointSchema.name, "\".") : '', "\"").concat(refEndpointTable.name, "\" ").concat(refEndpointFieldName);
+          if (secondTableFieldsMap.size > 1) {
+            line += _this.buildIndexManytoMany(secondTableFieldsMap, newTableName, foreignEndpointTable.name, usedIndexNames);
+          }
 
-        if (ref.onDelete) {
-          line += " ON DELETE ".concat(ref.onDelete.toUpperCase());
-        }
+          line += _this.buildForeignKeyManyToMany(firstTableFieldsMap, refEndpointFieldName, newTableName, refEndpointTable.name, refEndpointSchema, model);
+          line += _this.buildForeignKeyManyToMany(secondTableFieldsMap, foreignEndpointFieldName, newTableName, foreignEndpointTable.name, foreignEndpointSchema, model);
+        } else {
+          line = "ALTER TABLE ".concat((0, _utils.shouldPrintSchema)(foreignEndpointSchema, model) ? "\"".concat(foreignEndpointSchema.name, "\".") : '', "\"").concat(foreignEndpointTable.name, "\" ADD ");
 
-        if (ref.onUpdate) {
-          line += " ON UPDATE ".concat(ref.onUpdate.toUpperCase());
+          if (ref.name) {
+            line += "CONSTRAINT \"".concat(ref.name, "\" ");
+          }
+
+          line += "FOREIGN KEY ".concat(foreignEndpointFieldName, " REFERENCES ").concat((0, _utils.shouldPrintSchema)(refEndpointSchema, model) ? "\"".concat(refEndpointSchema.name, "\".") : '', "\"").concat(refEndpointTable.name, "\" ").concat(refEndpointFieldName);
+
+          if (ref.onDelete) {
+            line += " ON DELETE ".concat(ref.onDelete.toUpperCase());
+          }
+
+          if (ref.onUpdate) {
+            line += " ON UPDATE ".concat(ref.onUpdate.toUpperCase());
+          }
+
+          line += ';\n';
         }
 
-        line += ';\n';
         return line;
       });
-      return strArr.length ? strArr.join('\n') : '';
+      return strArr;
     }
   }, {
     key: "exportIndexes",
@@ -253,7 +328,7 @@ var PostgresExporter = /*#__PURE__*/function () {
         line += ';\n';
         return line;
       });
-      return indexArr.length ? indexArr.join('\n') : '';
+      return indexArr;
     }
   }, {
     key: "exportComments",
@@ -284,50 +359,51 @@ 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 usedTableNames = new Set(Object.values(model.tables).map(function (table) {
+        return table.name;
+      }));
+      var usedIndexNames = new Set(Object.values(model.indexes).map(function (index) {
+        return index.name;
+      }));
+      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 +420,31 @@ var PostgresExporter = /*#__PURE__*/function () {
             type: 'table',
             tableId: tableId
           }].concat(fieldObjects) : fieldObjects;
-        }))));
-      });
+        }));
 
-      if (!_lodash["default"].isEmpty(indexIds)) {
-        if (hasBlockAbove) res += '\n';
-        res += PostgresExporter.exportIndexes(indexIds, model);
-        hasBlockAbove = true;
-      }
+        if (!_lodash["default"].isEmpty(commentNodes)) {
+          var _prevStatements$comme;
 
-      if (!_lodash["default"].isEmpty(comments)) {
-        if (hasBlockAbove) res += '\n';
-        res += PostgresExporter.exportComments(comments, model);
-        hasBlockAbove = true;
-      }
+          (_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, usedTableNames, usedIndexNames)));
+        }
+
+        return prevStatements;
+      }, {
+        schemas: [],
+        enums: [],
+        tables: [],
+        indexes: [],
+        comments: [],
+        refs: []
+      });
+
+      var res = _lodash["default"].concat(statements.schemas, statements.enums, statements.tables, statements.indexes, statements.comments, statements.refs).join('\n');
 
       return res;
     }