Skip to content

Commit cc6054a

Browse files
vadim-tropashkovadim-tropashko
authored
Merge pull request #60 from zahariev-oracle/new_diagram_layout
fix: changed auto layout using rappid's DirectedGraph layout, Resolves #41
2 parents efff461 + a984062 commit cc6054a

14 files changed

+243
-1513
lines changed

‎dist/quick-erd.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/quick-erd.js

+179-553
Large diffs are not rendered by default.

‎dist/quick-erd.umd.cjs

+1-1
Large diffs are not rendered by default.

‎dist/quick-sql.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9259,7 +9259,7 @@ function Ee(h, d) {
92599259
return new Y(h, d).getErrors();
92609260
}
92619261
function le() {
9262-
return "1.2.9";
9262+
return "1.2.10";
92639263
}
92649264
Y.version = le;
92659265
Y.toDDL = Pe;

‎dist/quick-sql.umd.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,4 +264,4 @@ modify `+A+" generated always as identity restart start with "+(this.cardinalit
264264
Non-default options:
265265
# settings = `+JSON.stringify(this.nonDefaultOptions())+`
266266
`,C+=`
267-
*/`,this.ddl=C,C},this.getErrors=function(){return this.errors!=null?this.errors:(this.errors=ke.findErrors(this,this.fullInput),this.errors)},this.version=ee}return w}();function pe(h,d){return Ie(h,d)}function ge(h,d){return new j(h,d).getERD()}function Ce(h,d){return new j(h,d).getDDL()}function ve(h,d){return new j(h,d).getErrors()}function ee(){return"1.2.9"}j.version=ee,j.toDDL=Ce,j.toERD=ge,j.toErrors=ve,j.fromJSON=pe,j.lexer=$,U.default=j,U.fromJSON=pe,U.qsql_version=ee,U.quicksql=j,U.toDDL=Ce,U.toERD=ge,U.toErrors=ve,Object.defineProperties(U,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
267+
*/`,this.ddl=C,C},this.getErrors=function(){return this.errors!=null?this.errors:(this.errors=ke.findErrors(this,this.fullInput),this.errors)},this.version=ee}return w}();function pe(h,d){return Ie(h,d)}function ge(h,d){return new j(h,d).getERD()}function Ce(h,d){return new j(h,d).getDDL()}function ve(h,d){return new j(h,d).getErrors()}function ee(){return"1.2.10"}j.version=ee,j.toDDL=Ce,j.toERD=ge,j.toErrors=ve,j.fromJSON=pe,j.lexer=$,U.default=j,U.fromJSON=pe,U.qsql_version=ee,U.quicksql=j,U.toDDL=Ce,U.toERD=ge,U.toErrors=ve,Object.defineProperties(U,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

‎doc/user/quick-erd.md

+6
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ You need to add the following dependencies to your HTML:
2020
- jQuery
2121
- lodash
2222
- Backbone JS
23+
- graphlib
24+
- dagre
2325

2426
## ERD Browser ESM Example
2527

@@ -53,6 +55,8 @@ You need to add the following dependencies to your HTML:
5355
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
5456
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
5557
<script src="https://cdn.jsdelivr.net/npm/[email protected]/backbone-min.min.js"></script>
58+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/graphlib.core.min.js"></script>
59+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/dagre.core.min.js"></script>
5660

5761
<!-- Assuming you put the rappid.min.js file in this path -->
5862
<script src="./examples/diagram-generator/libs/rappid.min.js"></script>
@@ -119,6 +123,8 @@ view emp_v departments employees
119123
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
120124
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
121125
<script src="https://cdn.jsdelivr.net/npm/[email protected]/backbone-min.min.js"></script>
126+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/graphlib.core.min.js"></script>
127+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/dagre.core.min.js"></script>
122128

123129
<!-- Assuming you put the rappid.min.js file in this path -->
124130
<script src="./examples/diagram-generator/libs/rappid.min.js"></script>

‎examples/diagram-generator/index.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
1414
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
1515
<script src="https://cdn.jsdelivr.net/npm/[email protected]/backbone-min.min.js"></script>
16+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/graphlib.core.min.js"></script>
17+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/dagre.core.min.js"></script>
1618

1719
<!-- Assuming you put the rappid.min.js file in this path -->
1820
<script src="libs/rappid.min.js"></script>
@@ -66,7 +68,7 @@
6668
<div id="sql">
6769
<pre></pre>
6870
</div>
69-
<div id="quickERD" style="width: 100%; height: 100%;"></div>
71+
<div id="quickERD" style="width: 85%; height: 100%;"></div>
7072
</div>
7173

7274
<script type="module">

‎package-lock.json

+11-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@oracle/quicksql",
3-
"version": "1.2.9",
3+
"version": "1.2.10",
44
"description": "Quick SQL to DDL and ERD translator",
55
"main": "./dist/quick-sql.umd.cjs",
66
"module": "./dist/quick-sql.js",

0 commit comments

Comments
 (0)