From bf457b37ee3b0fb07c36096d99d0f0b8c6eb0efe Mon Sep 17 00:00:00 2001
From: Elliot Scribner <elliot.scribner@couchbase.com>
Date: Tue, 12 Dec 2023 11:53:11 -0800
Subject: [PATCH 1/5] Allow special chars in attributeName using backticks

---
 packages/mermaid/src/diagrams/er/parser/erDiagram.jison | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/mermaid/src/diagrams/er/parser/erDiagram.jison b/packages/mermaid/src/diagrams/er/parser/erDiagram.jison
index 135efc7846..6a71793024 100644
--- a/packages/mermaid/src/diagrams/er/parser/erDiagram.jison
+++ b/packages/mermaid/src/diagrams/er/parser/erDiagram.jison
@@ -26,6 +26,7 @@ accDescr\s*"{"\s*                                { this.begin("acc_descr_multili
 <block>\b((?:PK)|(?:FK)|(?:UK))\b      return 'ATTRIBUTE_KEY'
 <block>(.*?)[~](.*?)*[~]        return 'ATTRIBUTE_WORD';
 <block>[\*A-Za-z_][A-Za-z0-9\-_\[\]\(\)]*  return 'ATTRIBUTE_WORD'
+<block>\`[^`\n]*\`              return 'BACKTICK_STRING';
 <block>\"[^"]*\"                return 'COMMENT';
 <block>[\n]+                    /* nothing */
 <block>"}"                      { this.popState(); return 'BLOCK_STOP'; }
@@ -138,6 +139,7 @@ attributeType
 
 attributeName
     : ATTRIBUTE_WORD { $$=$1; }
+    | 'BACKTICK_STRING' { $$=$1.replace(/\`/g, ''); }
     ;
 
 attributeKeyTypeList

From f09c1e0a0c237be6ce74c23a233857b417147261 Mon Sep 17 00:00:00 2001
From: Elliot Scribner <elliot.scribner@couchbase.com>
Date: Tue, 12 Dec 2023 11:54:15 -0800
Subject: [PATCH 2/5] Add an example of special characters in demos/er.html

---
 demos/er.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/demos/er.html b/demos/er.html
index 027c2e2772..e39e97aa95 100644
--- a/demos/er.html
+++ b/demos/er.html
@@ -140,6 +140,18 @@
     </pre>
     <hr />
 
+    <pre class="mermaid">
+    erDiagram
+      hotel {
+          String address
+          String `city, state`
+          String `alias?`
+          String `"checkin"`
+          String `geo.accuracy`
+      }
+    </pre>
+    <hr />
+
     <script type="module">
       import mermaid from './mermaid.esm.mjs';
       mermaid.initialize({

From 119b9ef04cd9dc8186c30584ad32b51be3f5f323 Mon Sep 17 00:00:00 2001
From: Elliot Scribner <elliot.scribner@couchbase.com>
Date: Tue, 12 Dec 2023 12:27:00 -0800
Subject: [PATCH 3/5] Test to cover backticked attributeNames

---
 .../mermaid/src/diagrams/er/parser/erDiagram.spec.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js b/packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js
index ba29ff04b9..8f164c9971 100644
--- a/packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js
+++ b/packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js
@@ -228,6 +228,18 @@ describe('when parsing ER diagram it...', function () {
         }).toThrow();
       });
     });
+
+    it('should allow special characters inside of backticks', () => {
+      const entity = 'BOOK';
+      const specialChars = '.?",';
+      [...specialChars].forEach((specialChar, i) => {
+        const attribute = `String \`author${specialChar}firstname\``;
+        erDiagram.parser.parse(`erDiagram\n${entity} {\n${attribute}}`);
+        const entities = erDb.getEntities();
+        expect(Object.keys(entities).length).toBe(1);
+        expect(entities[entity].attributes.length).toBe(i + 1);
+      });
+    });
   });
 
   it('should allow an entity with a single attribute to be defined', function () {

From 96c3fea7a9b669862118fa920f7c5055abd6c38b Mon Sep 17 00:00:00 2001
From: Elliot Scribner <elliot.scribner@couchbase.com>
Date: Mon, 22 Jan 2024 12:02:56 -0800
Subject: [PATCH 4/5] Remove quotation marks from BACKTICK_STRING

---
 packages/mermaid/src/diagrams/er/parser/erDiagram.jison | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mermaid/src/diagrams/er/parser/erDiagram.jison b/packages/mermaid/src/diagrams/er/parser/erDiagram.jison
index 6a71793024..45ac3b5c12 100644
--- a/packages/mermaid/src/diagrams/er/parser/erDiagram.jison
+++ b/packages/mermaid/src/diagrams/er/parser/erDiagram.jison
@@ -139,7 +139,7 @@ attributeType
 
 attributeName
     : ATTRIBUTE_WORD { $$=$1; }
-    | 'BACKTICK_STRING' { $$=$1.replace(/\`/g, ''); }
+    | BACKTICK_STRING { $$=$1.replace(/\`/g, ''); }
     ;
 
 attributeKeyTypeList

From bc5517ab75b8fe90b154452e7666963f991e8ce0 Mon Sep 17 00:00:00 2001
From: Elliot Scribner <elliot.scribner@couchbase.com>
Date: Mon, 22 Jan 2024 12:03:31 -0800
Subject: [PATCH 5/5] Test More Special Characters

---
 packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js b/packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js
index 8f164c9971..ac6175cd4e 100644
--- a/packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js
+++ b/packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js
@@ -231,7 +231,7 @@ describe('when parsing ER diagram it...', function () {
 
     it('should allow special characters inside of backticks', () => {
       const entity = 'BOOK';
-      const specialChars = '.?",';
+      const specialChars = '?!@#$%^&*".,{}[]()';
       [...specialChars].forEach((specialChar, i) => {
         const attribute = `String \`author${specialChar}firstname\``;
         erDiagram.parser.parse(`erDiagram\n${entity} {\n${attribute}}`);