marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-03 07:36:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adding support for parentheses

Browse Source
This commit is contained in:
Maho Pacheco
2022-12-06 10:38:21 -08:00
parent fdf261bda3
commit 4dadf8a72d
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cypress/integration/rendering/erDiagram.spec.js
View File

@@ -182,6 +182,20 @@ describe('Entity Relationship Diagram', () => {
cy.get('svg'); cy.get('svg');
}); });
it('should render entities with length in attributes type', () => {
renderGraph(
`
erDiagram
CLUSTER {
varchar(99) name
string(255) description
}
`,
{ logLevel: 1 }
);
cy.get('svg');
});
it('should render entities and attributes with big and small entity names', () => { it('should render entities and attributes with big and small entity names', () => {
renderGraph( renderGraph(
` `

8
docs/syntax/entityRelationshipDiagram.md
View File

@@ -230,7 +230,7 @@ erDiagram
} }
``` ```
The `type` and `name` values must begin with an alphabetic character and may contain digits, hyphens or underscores. Other than that, there are no restrictions, and there is no implicit set of valid data types. The `type` and `name` values must begin with an alphabetic character and may contain digits, hyphens, underscores, parentheses and square brackets. Other than that, there are no restrictions, and there is no implicit set of valid data types.
#### Attribute Keys and Comments #### Attribute Keys and Comments
@@ -244,11 +244,12 @@ erDiagram
string registrationNumber string registrationNumber
string make string make
string model string model
string[] parts
} }
PERSON ||--o{ NAMED-DRIVER : is PERSON ||--o{ NAMED-DRIVER : is
PERSON { PERSON {
string driversLicense PK "The license #" string driversLicense PK "The license #"
string firstName string(99) firstName "Only 99 characters are allowed"
string lastName string lastName
int age int age
} }
@@ -263,11 +264,12 @@ erDiagram
string registrationNumber string registrationNumber
string make string make
string model string model
string[] parts
} }
PERSON ||--o{ NAMED-DRIVER : is PERSON ||--o{ NAMED-DRIVER : is
PERSON { PERSON {
string driversLicense PK "The license #" string driversLicense PK "The license #"
string firstName string(99) firstName "Only 99 characters are allowed"
string lastName string lastName
int age int age
} }

2
packages/mermaid/src/diagrams/er/parser/erDiagram.jison
View File

@@ -31,7 +31,7 @@ accDescr\s*"{"\s* { this.begin("acc_descr_multili
<block>\s+ /* skip whitespace in block */ <block>\s+ /* skip whitespace in block */
<block>\b((?:PK)|(?:FK))\b return 'ATTRIBUTE_KEY' <block>\b((?:PK)|(?:FK))\b return 'ATTRIBUTE_KEY'
<block>(.*?)[~](.*?)*[~] return 'ATTRIBUTE_WORD'; <block>(.*?)[~](.*?)*[~] return 'ATTRIBUTE_WORD';
<block>[A-Za-z][A-Za-z0-9\-_\[\]]* return 'ATTRIBUTE_WORD' <block>[A-Za-z][A-Za-z0-9\-_\[\]\(\)]* return 'ATTRIBUTE_WORD'
<block>\"[^"]*\" return 'COMMENT'; <block>\"[^"]*\" return 'COMMENT';
<block>[\n]+ /* nothing */ <block>[\n]+ /* nothing */
<block>"}" { this.popState(); return 'BLOCK_STOP'; } <block>"}" { this.popState(); return 'BLOCK_STOP'; }

5
packages/mermaid/src/docs/syntax/entityRelationshipDiagram.md
View File

@@ -160,7 +160,7 @@ erDiagram
} }
``` ```
The `type` and `name` values must begin with an alphabetic character and may contain digits, hyphens or underscores. Other than that, there are no restrictions, and there is no implicit set of valid data types. The `type` and `name` values must begin with an alphabetic character and may contain digits, hyphens, underscores, parentheses and square brackets. Other than that, there are no restrictions, and there is no implicit set of valid data types.
#### Attribute Keys and Comments #### Attribute Keys and Comments
@@ -174,11 +174,12 @@ erDiagram
string registrationNumber string registrationNumber
string make string make
string model string model
string[] parts
} }
PERSON ||--o{ NAMED-DRIVER : is PERSON ||--o{ NAMED-DRIVER : is
PERSON { PERSON {
string driversLicense PK "The license #" string driversLicense PK "The license #"
string firstName string(99) firstName "Only 99 characters are allowed"
string lastName string lastName
int age int age
} }