@dbml/core 3.1.1 → 3.1.2

package/lib/export/DbmlExporter.js

@@ -33,6 +33,11 @@ var DbmlExporter = /*#__PURE__*/function () {
     value: function isExpression(str) {
       return /\s*(\*|\+|-|\([A-Za-z0-9_]+\)|\(\))/g.test(str);
     }
+  }, {
+    key: "escapeNote",
+    value: function escapeNote(str) {
+      return str.replaceAll("'", "\\'");
+    }
   }, {
     key: "exportEnums",
     value: function exportEnums(enumIds, model) {
@@ -40,7 +45,7 @@ var DbmlExporter = /*#__PURE__*/function () {
         var _enum = model.enums[enumId];
         var schema = model.schemas[_enum.schemaId];
         return "Enum ".concat((0, _utils.shouldPrintSchema)(schema, model) ? "\"".concat(schema.name, "\".") : '', "\"").concat(_enum.name, "\" {\n").concat(_enum.valueIds.map(function (valueId) {
-          return "  \"".concat(model.enumValues[valueId].name, "\"").concat(model.enumValues[valueId].note ? " [note: '".concat(model.enumValues[valueId].note, "']") : '');
+          return "  \"".concat(model.enumValues[valueId].name, "\"").concat(model.enumValues[valueId].note ? " [note: '".concat(DbmlExporter.escapeNote(model.enumValues[valueId].note), "']") : '');
         }).join('\n'), "\n}\n");
       });
       return enumStrs.length ? enumStrs.join('\n') : '';
@@ -88,7 +93,7 @@ var DbmlExporter = /*#__PURE__*/function () {
           constraints.push(value);
         }
         if (field.note) {
-          constraints.push("note: '".concat(field.note, "'"));
+          constraints.push("note: '".concat(DbmlExporter.escapeNote(field.note), "'"));
         }
         if (constraints.length > 0) {
           line += " [".concat(constraints.join(', '), "]");
@@ -180,7 +185,7 @@ var DbmlExporter = /*#__PURE__*/function () {
             return "  ".concat(indexLine);
           }).join('\n'), "\n}");
         }
-        var tableNote = table.note ? "  Note: '".concat(table.note, "'\n") : '';
+        var tableNote = table.note ? "  Note: '".concat(DbmlExporter.escapeNote(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") : '').concat(tableNote, "}\n");

package/lib/parse/ANTLR/ASTGeneration/postgres/PostgresASTGen.js

@@ -49,6 +49,12 @@ var findTable = function findTable(tables, schemaName, tableName) {
   });
   return table;
 };
+var escapeStr = function escapeStr(str) {
+  if (str) {
+    return str.replaceAll("''", "'");
+  }
+  return str;
+};
 var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
   _inherits(PostgresASTGen, _PostgreSQLParserVisi);
   var _super = _createSuper(PostgresASTGen);
@@ -991,7 +997,7 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
           if (!table) return;
           var _note = ctx.comment_text().accept(this);
           table.note = {
-            value: _note
+            value: escapeStr(_note)
           };
         }
       }
@@ -1007,7 +1013,7 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
         if (!field) return;
         var _note2 = ctx.comment_text().accept(this);
         field.note = {
-          value: _note2
+          value: escapeStr(_note2)
         };
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "3.1.1",
+  "version": "3.1.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.1.1",
+    "@dbml/parse": "^3.1.2",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "parsimmon": "^1.13.0",
@@ -59,5 +59,5 @@
       "\\.(?!json$)[^.]*$": "@glen/jest-raw-loader"
     }
   },
-  "gitHead": "16ea54e5e369de55554da73e25e7f87d56199399"
+  "gitHead": "25628d4ad260b497fb2d1d03bafb2aa253b56978"
 }