@dbml/core 3.13.0 → 3.13.2

package/lib/parse/ANTLR/ASTGeneration/mssql/MssqlASTGen.js

@@ -505,10 +505,22 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitData_type",
     value: function visitData_type(ctx) {
-      var id = ctx.id_().accept(this);
       if (ctx.MAX()) {
-        return "".concat(id, "(MAX)");
+        var type = '';
+        if (ctx.SQUARE_BRACKET_ID()) {
+          type = ctx.SQUARE_BRACKET_ID().getText().slice(1, -1);
+        } else {
+          var typeNode = ctx.VARCHAR() || ctx.NVARCHAR() || ctx.BINARY_KEYWORD() || ctx.VARBINARY_KEYWORD() || ctx.SQUARE_BRACKET_ID();
+          type = typeNode.getText();
+        }
+        return "".concat(type, "(MAX)");
+      }
+      if (ctx.DOUBLE()) {
+        var _double = ctx.DOUBLE().getText();
+        var precision = ctx.PRECISION() ? " ".concat(ctx.PRECISION().getText()) : '';
+        return "".concat(_double).concat(precision);
       }
+      var id = ctx.id_().accept(this);
       if (ctx.IDENTITY()) {
         if (ctx.DECIMAL().length) {
           var seedAndInc = ctx.DECIMAL().map(function (decimal) {
@@ -518,12 +530,6 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
         }
         return "".concat(id, " IDENTITY");
       }
-      if (ctx.DOUBLE()) {
-        if (ctx.PRECISION()) {
-          return "".concat(id, "(").concat(ctx.PRECISION().getText(), ")");
-        }
-        return id;
-      }
       if (ctx.DECIMAL().length) {
         var scaleAndPrec = ctx.DECIMAL().map(function (decimal) {
           return decimal.getText();
@@ -607,11 +613,10 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
       })));
 
       // these check constraints represent enums
-      var enums = [];
       var checkConstraints = columnCheckConstraints.concat(tableCheckConstraints);
       checkConstraints.forEach(function (checkConstraint) {
-        var field = fields.find(function (field) {
-          return field.name === checkConstraint.column;
+        var field = fields.find(function (fieldItem) {
+          return fieldItem.name === checkConstraint.column;
         });
         if (!field) return;
         var enumObject = new _AST.Enum({
@@ -750,11 +755,11 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
           case _constants.COLUMN_CONSTRAINT_KIND.CHECK:
             {
               var _columnDef$value = columnDef.value,
-                _type = _columnDef$value.type,
+                columnDefType = _columnDef$value.type,
                 value = _columnDef$value.value;
 
               // we keep the current behavior: when a field has a check constraints cannot be converted to enum, we will ignore it
-              if (_type !== CHECK_CONSTRAINT_CONDITION_TYPE.ENUM) return;
+              if (columnDefType !== CHECK_CONSTRAINT_CONDITION_TYPE.ENUM) return;
               definition.value.checkConstraints.push(value);
               break;
             }
@@ -1217,8 +1222,8 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
         field.dbdefault = columnDefault.defaultValue;
       });
       checkConstraints.forEach(function (checkConstraint) {
-        var field = table.fields.find(function (field) {
-          return field.name === checkConstraint.column;
+        var field = table.fields.find(function (fieldItem) {
+          return fieldItem.name === checkConstraint.column;
         });
         if (!field) return;
         var enumObject = new _AST.Enum({
@@ -1338,28 +1343,28 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
           acc[name] = arg.value;
           return acc;
         }, {});
-        if (!argsObj['name'].includes('Description')) {
+        if (!argsObj.name.includes('Description')) {
           return;
         }
 
         // https://learn.microsoft.com/en-us/sql/relational-databases/system-stored-procedures/sp-addextendedproperty-transact-sql?view=sql-server-ver16#----level0type
-        var level0Type = argsObj['level0type'].toLowerCase();
+        var level0Type = argsObj.level0type.toLowerCase();
         if (!level0Type.includes('schema')) return;
-        var schemaName = argsObj['level0name'] !== 'dbo' ? argsObj['level0name'] : undefined;
-        var level1Type = argsObj['level1type'].toLowerCase();
-        var tableName = level1Type.includes('table') ? argsObj['level1name'] : null;
+        var schemaName = argsObj.level0name !== 'dbo' ? argsObj.level0name : undefined;
+        var level1Type = argsObj.level1type.toLowerCase();
+        var tableName = level1Type.includes('table') ? argsObj.level1name : null;
         var table = this.data.tables.find(function (t) {
           return t.name === tableName && t.schemaName === schemaName;
         });
         if (!table) return;
-        if (!argsObj['level2type']) {
+        if (!argsObj.level2type) {
           table.note = {
             value: argsObj.value
           };
           return;
         }
-        var level2Type = argsObj['level2type'].toLowerCase();
-        var columnName = level2Type.includes('column') ? argsObj['level2name'] : null;
+        var level2Type = argsObj.level2type.toLowerCase();
+        var columnName = level2Type.includes('column') ? argsObj.level2name : null;
         var field = table.fields.find(function (f) {
           return f.name === columnName;
         });
@@ -1380,11 +1385,10 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
       var _this19 = this;
       if (ctx.func_proc_name_database_schema()) {
         return ctx.func_proc_name_database_schema().accept(this);
-      } else {
-        return ctx.id_().map(function (id) {
-          return id.accept(_this19);
-        });
       }
+      return ctx.id_().map(function (id) {
+        return id.accept(_this19);
+      });
     }
 
     // func_proc_name_database_schema
@@ -1397,11 +1401,10 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
       var _this20 = this;
       if (ctx.func_proc_name_schema()) {
         return ctx.func_proc_name_schema().accept(this);
-      } else {
-        return ctx.id_().map(function (id) {
-          return id.accept(_this20);
-        });
       }
+      return ctx.id_().map(function (id) {
+        return id.accept(_this20);
+      });
     }
 
     // func_proc_name_schema

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "3.13.0",
+  "version": "3.13.2",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -32,7 +32,7 @@
     "prepublish": "npm run build"
   },
   "dependencies": {
-    "@dbml/parse": "^3.13.0",
+    "@dbml/parse": "^3.13.2",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "parsimmon": "^1.13.0",
@@ -59,7 +59,7 @@
       "\\.(?!json$)[^.]*$": "@glen/jest-raw-loader"
     }
   },
-  "gitHead": "4b705ec829db097bbeb21cf06b2b989cd16173b4",
+  "gitHead": "f9be31a9b9b3b509183637dc2527f1be8c260add",
   "engines": {
     "node": ">=16"
   }