X-Git-Url: https://git.auder.net/?a=blobdiff_plain;ds=sidebyside;f=parser.js;h=0ab6a4321a15f59a62718d39cbfc699d17563e39;hb=refs%2Fheads%2Fmaster;hp=6d028fd05e07e5f812a4a0238f13dbce54aa30ef;hpb=e570c0aab6f7b776cb8c6ce3c7d64c585deb66a0;p=erdiag.git
diff --git a/parser.js b/parser.js
index 6d028fd..0ab6a43 100644
--- a/parser.js
+++ b/parser.js
@@ -1,7 +1,7 @@
// ER diagram description parser
class ErDiags
{
- constructor(description)
+ constructor(description, output, image)
{
this.entities = { };
this.inheritances = [ ];
@@ -9,22 +9,21 @@ class ErDiags
this.tables = { };
this.mcdParsing(description);
this.mldParsing();
- // Cache SVG graphs returned by server (in addition to server cache = good perfs)
- this.mcdGraph = "";
- this.mldGraph = "";
- this.sqlText = "";
+ this.output = output || "graph";
+ this.image = image || "svg";
}
- static get CARDINAL()
+ static CARDINAL(symbol)
{
- return {
- "*": "0,n",
- "+": "1,n",
- "?": "0,1",
- "1": "1,1",
- "?R": "(0,1)",
- "1R": "(1,1)",
- };
+ let res = { "*": "0,n", "+": "1,n", "?": "0,1", "1": "1,1" } [ symbol[0] ];
+ if (symbol.length >= 2)
+ {
+ if (symbol[1] == 'R')
+ res = '(' + res + ')';
+ else if (['>','<'].includes(symbol[1]))
+ res += symbol[1];
+ }
+ return res;
}
///////////////////////////////
@@ -99,13 +98,12 @@ class ErDiags
field.isKey = true;
line = line.slice(1);
}
- field.name = line.match(/[^()"\s]+/)[0];
- let parenthesis = line.match(/\((.+)\)/);
- if (parenthesis !== null)
+ field.name = line.match(/[^"\s]+/)[0];
+ let sqlClues = line.substring(field.name.length).trim();
+ if (sqlClues.length > 0)
{
- let sqlClues = parenthesis[1];
field.type = sqlClues.match(/[^\s]+/)[0]; //type is always the first indication (mandatory)
- field.qualifiers = sqlClues.substring(field.type.length).trim();
+ field.qualifiers = sqlClues.substring(field.type.length);
}
attributes.push(field);
}
@@ -166,12 +164,17 @@ class ErDiags
Object.keys(this.entities).forEach( name => {
let newTable = [ ]; //array of fields
this.entities[name].attributes.forEach( attr => {
- newTable.push({
+ let newField = {
name: attr.name,
type: attr.type,
isKey: attr.isKey,
- qualifiers: attr.qualifiers,
- });
+ };
+ if (!!attr.qualifiers && !!attr.qualifiers.match(/references/i))
+ {
+ Object.assign(newField, {ref: attr.qualifiers.match(/references ([^\s]+)/i)[1]});
+ newField.qualifiers = attr.qualifiers.replace(/references [^\s]+/i, "");
+ }
+ newTable.push(newField);
});
this.tables[name] = newTable;
});
@@ -184,8 +187,8 @@ class ErDiags
name: inh.parent + "_id",
type: this.tables[inh.parent][idx].type,
isKey: true,
- qualifiers: (this.tables[inh.parent][idx].qualifiers || "") + " foreign key references " + inh.parent,
- ref: inh.parent,
+ qualifiers: this.tables[inh.parent][idx].qualifiers || "",
+ ref: inh.parent + "(" + this.tables[inh.parent][idx].name + ")",
});
});
});
@@ -204,12 +207,14 @@ class ErDiags
this.entities[e2.name].attributes.forEach( attr => {
if (attr.isKey)
{
+ // For "weak tables", foreign keys become part of the key
+ const isKey = e.card.length >= 2 && e.card[1] == 'R';
this.tables[e.name].push({
- isKey: e.card.length >= 2 && e.card[1] == 'R', //"weak tables" foreign keys become part of the key
+ isKey: isKey,
name: e2.name + "_" + attr.name,
type: attr.type,
- qualifiers: "foreign key references " + e2.name + " " + (e.card[0]=='1' ? "not null" : ""),
- ref: e2.name, //easier drawMld function (fewer regexps)
+ qualifiers: !isKey && e.card[0]=='1' ? "not null" : "",
+ ref: e2.name + "(" + attr.name + ")",
});
}
});
@@ -238,11 +243,27 @@ class ErDiags
name: item.entity + "_" + f.name,
isKey: true,
type: f.type,
- qualifiers: (f.qualifiers || "") + " foreign key references " + item.entity + " not null",
- ref: item.entity,
+ qualifiers: f.qualifiers || "",
+ ref: item.entity + "(" + f.name + ")",
});
});
});
+ // Check for duplicates (in case of self-relationship), rename if needed
+ newTable.fields.forEach( (f,i) => {
+ const idx = newTable.fields.findIndex( item => { return item.name == f.name; });
+ if (idx < i)
+ {
+ // Current field is a duplicate
+ let suffix = 2;
+ let newName = f.name + suffix;
+ while (newTable.fields.findIndex( item => { return item.name == newName; }) >= 0)
+ {
+ suffix++;
+ newName = f.name + suffix;
+ }
+ f.name = newName;
+ }
+ });
// Add relationship potential own attributes
(a.attributes || [ ]).forEach( attr => {
newTable.fields.push({
@@ -261,28 +282,12 @@ class ErDiags
// DRAWING + GET SQL FROM PARSING
/////////////////////////////////
- static AjaxGet(dotInput, callback)
- {
- let xhr = new XMLHttpRequest();
- xhr.onreadystatechange = function() {
- if (this.readyState == 4 && this.status == 200)
- callback(this.responseText);
- };
- xhr.open("GET", "scripts/getGraphSvg.php?dot=" + encodeURIComponent(dotInput), true);
- xhr.send();
- }
-
// "Modèle conceptuel des données". TODO: option for graph size
// NOTE: randomizing helps to obtain better graphs (sometimes)
drawMcd(id, mcdStyle) //mcdStyle: bubble, or compact
{
let element = document.getElementById(id);
mcdStyle = mcdStyle || "compact";
- if (this.mcdGraph.length > 0)
- {
- element.innerHTML = this.mcdGraph;
- return;
- }
// Build dot graph input
let mcdDot = 'graph {\n';
mcdDot += 'rankdir="LR";\n';
@@ -392,27 +397,20 @@ class ErDiags
mcdDot += '"' + e.name + '":name -- "' + name + '"';
else
mcdDot += '"' + name + '" -- "' + e.name + '":name';
- mcdDot += '[label="' + ErDiags.CARDINAL[e.card] + '"];\n';
+ mcdDot += '[label="' + ErDiags.CARDINAL(e.card) + '"];\n';
});
});
mcdDot += '}';
- //console.log(mcdDot);
- ErDiags.AjaxGet(mcdDot, graphSvg => {
- this.mcdGraph = graphSvg;
- element.innerHTML = graphSvg;
- });
+ if (this.output == "graph") //draw graph in element
+ element.innerHTML = "";
+ else //output = "text": just show dot input
+ element.innerHTML = mcdDot.replace(//g,">");
}
// "Modèle logique des données", from MCD without anomalies
- // TODO: this one should draw links from foreign keys to keys (port=... in
' + name + ' |
' + label + ' |
" + sqlText + "
";
}