@dbml/core 5.2.0 → 5.3.0

package/lib/parse/ANTLR/ASTGeneration/oraclesql/OracleSQLASTGen.js

@@ -118,6 +118,11 @@ var createCompilerError = function createCompilerError(ctx, message) {
     }
   }]);
 };
+var unquoteString = function unquoteString(str) {
+  var quoteChar = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '"';
+  return !str.startsWith(quoteChar) ? str : str.slice(1, -1) // Strip off starting and ending quotes
+  .replaceAll("".concat(quoteChar).concat(quoteChar), quoteChar); // Unescape quotes, in Oracle, quotes are escaped by doubling it
+};
 
 // Only methods for rules representing whole statements can mutate `data`:
 //   * create_table
@@ -649,11 +654,7 @@ var OracleSqlASTGen = exports["default"] = /*#__PURE__*/function (_OracleSqlPars
     key: "visitIdentifier",
     value: function visitIdentifier(ctx) {
       var text = (0, _helpers.getOriginalText)(ctx);
-      if (text.startsWith('"')) {
-        return text.substring(1, text.length - 1);
-      }
-      text.replace('""', '"');
-      return text;
+      return unquoteString(text);
     }
   }, {
     key: "visitType_name",
@@ -674,7 +675,7 @@ var OracleSqlASTGen = exports["default"] = /*#__PURE__*/function (_OracleSqlPars
     value: function visitDatatype(ctx) {
       var typeName = (0, _helpers.getOriginalText)(ctx);
       return {
-        type_name: typeName
+        type_name: unquoteString(typeName)
       };
     }
 
@@ -958,7 +959,7 @@ var OracleSqlASTGen = exports["default"] = /*#__PURE__*/function (_OracleSqlPars
   }, {
     key: "visitConstraint_name",
     value: function visitConstraint_name(ctx) {
-      return (0, _helpers.getOriginalText)(ctx);
+      return unquoteString((0, _helpers.getOriginalText)(ctx));
     }
   }, {
     key: "visitIndex_name",
@@ -1085,7 +1086,8 @@ var OracleSqlASTGen = exports["default"] = /*#__PURE__*/function (_OracleSqlPars
   }, {
     key: "visitId_expression",
     value: function visitId_expression(ctx) {
-      return (0, _helpers.getOriginalText)(ctx);
+      var text = (0, _helpers.getOriginalText)(ctx);
+      return unquoteString(text);
     }
 
     // expression
@@ -1106,7 +1108,7 @@ var OracleSqlASTGen = exports["default"] = /*#__PURE__*/function (_OracleSqlPars
       if (ctx.CHAR_STRING()) {
         return {
           type: _constants.DATA_TYPE.STRING,
-          value: value.slice(1, -1)
+          value: unquoteString(value, "'") // string literals use single quotes
         };
       }
       if (ctx.TRUE()) {
@@ -1136,8 +1138,8 @@ var OracleSqlASTGen = exports["default"] = /*#__PURE__*/function (_OracleSqlPars
       if (ctx.column_name()) {
         return {
           type: _constants.CONSTRAINT_TYPE.COLUMN,
-          rawValue: value,
-          value: (0, _helpers.getOriginalText)(ctx.column_name())
+          rawValue: unquoteString(value),
+          value: unquoteString((0, _helpers.getOriginalText)(ctx.column_name()))
         };
       }
       return {
@@ -1148,7 +1150,12 @@ var OracleSqlASTGen = exports["default"] = /*#__PURE__*/function (_OracleSqlPars
   }, {
     key: "visitQuoted_string",
     value: function visitQuoted_string(ctx) {
-      return (0, _helpers.getOriginalText)(ctx).slice(1, -1).replaceAll("''", "'");
+      return unquoteString((0, _helpers.getOriginalText)(ctx), "'"); // string literals use single quotes
+    }
+  }, {
+    key: "visitRegular_id",
+    value: function visitRegular_id(ctx) {
+      return unquoteString((0, _helpers.getOriginalText)(ctx), '"');
     }
   }]);
 }(_OracleSqlParserVisitor["default"]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/core",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
     "lint:fix": "eslint --fix ."
   },
   "dependencies": {
-    "@dbml/parse": "^5.2.0",
+    "@dbml/parse": "^5.3.0",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "parsimmon": "^1.13.0",
@@ -73,7 +73,7 @@
       "^lodash-es$": "lodash"
     }
   },
-  "gitHead": "20d556a6e6baad8a989c730e2afd3b65dedcea89",
+  "gitHead": "c8e67b627584b81d18c16a6f2983a92d75a326d9",
   "engines": {
     "node": ">=16"
   }