@dbml/core 2.2.0 → 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"); } }
@@ -17,9 +19,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-var DbmlExporter =
-/*#__PURE__*/
-function () {
+var DbmlExporter = /*#__PURE__*/function () {
   function DbmlExporter() {
     _classCallCheck(this, DbmlExporter);
   }
@@ -29,6 +29,11 @@ function () {
     value: function hasWhiteSpace(str) {
       return /\s/g.test(str);
     }
+  }, {
+    key: "hasSquareBracket",
+    value: function hasSquareBracket(str) {
+      return /\[|\]/.test(str);
+    }
   }, {
     key: "isExpression",
     value: function isExpression(str) {
@@ -52,7 +57,13 @@ 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) ? "\"".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/JsonExporter.js

@@ -11,9 +11,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-var JsonExporter =
-/*#__PURE__*/
-function () {
+var JsonExporter = /*#__PURE__*/function () {
   function JsonExporter() {
     _classCallCheck(this, JsonExporter);
   }

package/lib/export/ModelExporter.js

@@ -23,9 +23,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-var ModelExporter =
-/*#__PURE__*/
-function () {
+var ModelExporter = /*#__PURE__*/function () {
   function ModelExporter() {
     _classCallCheck(this, ModelExporter);
   }

package/lib/export/MysqlExporter.js

@@ -11,13 +11,17 @@ var _utils = require("./utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -25,9 +29,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-var MySQLExporter =
-/*#__PURE__*/
-function () {
+var MySQLExporter = /*#__PURE__*/function () {
   function MySQLExporter() {
     _classCallCheck(this, MySQLExporter);
   }
@@ -142,7 +144,7 @@ function () {
         }).join(',\n'), "\n);\n");
         return tableStr;
       });
-      return tableStrs.length ? tableStrs.join('\n') : '';
+      return tableStrs;
     }
   }, {
     key: "buildFieldName",
@@ -197,7 +199,7 @@ function () {
         line += ';\n';
         return line;
       });
-      return strArr.length ? strArr.join('\n') : '';
+      return strArr;
     }
   }, {
     key: "exportIndexes",
@@ -239,7 +241,7 @@ function () {
         line += ';\n';
         return line;
       });
-      return indexArr.length ? indexArr.join('\n') : '';
+      return indexArr;
     }
   }, {
     key: "exportComments",
@@ -255,62 +257,68 @@ 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,15 +9,21 @@ 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) || _nonIterableSpread(); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
 
-function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -25,9 +31,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-var PostgresExporter =
-/*#__PURE__*/
-function () {
+var PostgresExporter = /*#__PURE__*/function () {
   function PostgresExporter() {
     _classCallCheck(this, PostgresExporter);
   }
@@ -48,7 +52,7 @@ 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",
@@ -61,10 +65,15 @@ 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) {
@@ -148,7 +157,7 @@ function () {
         }).join(',\n'), "\n);\n");
         return tableStr;
       });
-      return tableStrs.length ? tableStrs.join('\n') : '';
+      return tableStrs;
     }
   }, {
     key: "buildFieldName",
@@ -203,7 +212,7 @@ function () {
         line += ';\n';
         return line;
       });
-      return strArr.length ? strArr.join('\n') : '';
+      return strArr;
     }
   }, {
     key: "exportIndexes",
@@ -251,7 +260,7 @@ function () {
         line += ';\n';
         return line;
       });
-      return indexArr.length ? indexArr.join('\n') : '';
+      return indexArr;
     }
   }, {
     key: "exportComments",
@@ -282,50 +291,45 @@ 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;
@@ -342,20 +346,31 @@ 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

@@ -11,13 +11,17 @@ var _utils = require("./utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -25,9 +29,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-var SqlServerExporter =
-/*#__PURE__*/
-function () {
+var SqlServerExporter = /*#__PURE__*/function () {
   function SqlServerExporter() {
     _classCallCheck(this, SqlServerExporter);
   }
@@ -139,7 +141,7 @@ function () {
         }).join(',\n'), "\n)\nGO\n");
         return tableStr;
       });
-      return tableStrs.length ? tableStrs.join('\n') : '';
+      return tableStrs;
     }
   }, {
     key: "buildFieldName",
@@ -194,7 +196,7 @@ function () {
         line += '\nGO\n';
         return line;
       });
-      return strArr.length ? strArr.join('\n') : '';
+      return strArr;
     }
   }, {
     key: "exportIndexes",
@@ -231,7 +233,7 @@ function () {
         line += '\nGO\n';
         return line;
       });
-      return indexArr.length ? indexArr.join('\n') : '';
+      return indexArr;
     }
   }, {
     key: "exportComments",
@@ -270,49 +272,42 @@ 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 {
@@ -324,21 +319,32 @@ 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;
     }