Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #3019 Add word boundary to FK&PK. #3168

Merged
merged 1 commit into from Jun 23, 2022
Merged

fix #3019 Add word boundary to FK&PK. #3168

merged 1 commit into from Jun 23, 2022

Conversation

sidharthv96
Copy link
Member

@sidharthv96 sidharthv96 commented Jun 22, 2022

馃搼 Summary

Fix error when entities had fk/pk as prefix in ER Diagrams.

Resolves #3019
Resolves #3146

馃搹 Design Decisions

I feel like there is a more correct way to achive this with bison, but I don't have enough experience in bison to figure it out. This works and all the tests pass.

馃搵 Tasks

Make sure you

  • 馃摉 have read the contribution guidelines
  • 馃捇 have added unit/e2e tests (if appropriate)
  • 馃敄 targeted develop branch

@mmorel-35 mmorel-35 merged commit 0e47c0e into develop Jun 23, 2022
sidharthv96 added a commit that referenced this pull request Jun 28, 2022
* origin/develop: (24 commits)
  Updated the release version to 9.1.4
  Better balance check
  chore(deps-dev): bump @commitlint/config-conventional (#3179)
  chore(deps-dev): bump lint-staged from 13.0.2 to 13.0.3 (#3177)
  chore(deps-dev): bump cypress from 10.1.0 to 10.2.0 (#3178)
  chore(deps-dev): bump @commitlint/cli from 17.0.2 to 17.0.3 (#3180)
  chore: update browsers list
  fix: typo for source
  fix: typo in cypress
  Add dev install section in contributing.md
  update doc typos/clarity (#3145)
  Update links to `mermaid.live` (#3163)
  fix #3019 Add word boundary to FK&PK. (#3168)
  Run testomatio only for PRs within org. (#3165)
  chore(deps): bump got from 11.8.3 to 11.8.5 (#3172)
  fix: De-duplicates dependencies (#3167)
  Updated allowed characters to accomodate fonts and rgba colors
  fix: Typo for documents and comments
  Sanitizsation of incoming variables that are added to the userStyles
  Only allowing a subset of characters in themeVariables
  ...
sidharthv96 added a commit to sidharthv96/mermaid that referenced this pull request Jun 30, 2022
* origin/master: (789 commits)
  Updated the release version to 9.1.4
  Better balance check
  chore(deps-dev): bump @commitlint/config-conventional (mermaid-js#3179)
  chore(deps-dev): bump lint-staged from 13.0.2 to 13.0.3 (mermaid-js#3177)
  chore(deps-dev): bump cypress from 10.1.0 to 10.2.0 (mermaid-js#3178)
  chore(deps-dev): bump @commitlint/cli from 17.0.2 to 17.0.3 (mermaid-js#3180)
  chore: update browsers list
  fix: typo for source
  fix: typo in cypress
  Add dev install section in contributing.md
  update doc typos/clarity (mermaid-js#3145)
  Update links to `mermaid.live` (mermaid-js#3163)
  fix mermaid-js#3019 Add word boundary to FK&PK. (mermaid-js#3168)
  Run testomatio only for PRs within org. (mermaid-js#3165)
  chore(deps): bump got from 11.8.3 to 11.8.5 (mermaid-js#3172)
  fix: De-duplicates dependencies (mermaid-js#3167)
  Updated allowed characters to accomodate fonts and rgba colors
  fix: Typo for documents and comments
  Sanitizsation of incoming variables that are added to the userStyles
  Only allowing a subset of characters in themeVariables
  ...
@knsv knsv deleted the 3019_erDiagram branch August 23, 2022 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ERD diagram doesn't support fields with prefix FK. ER diagram fails when column name starts with fk
2 participants