Skip to content

Commit dd82b5a

Browse files
authored
Merge pull request #7 from lastlink/f/fixes
F/fixes embed version
2 parents b54909a + 67bb402 commit dd82b5a

File tree

3 files changed

+16
-20
lines changed

3 files changed

+16
-20
lines changed

build/updateVersion.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ console.log("Updating to version " + package.version);
1313
files.forEach((file) => {
1414
const filePath = `${directoryPath}/${file}`;
1515
let content = fs.readFileSync(filePath, "utf8");
16-
content = content.replace(oldText, package.version);
16+
while(content.includes(oldText)) {
17+
content = content.replace(oldText, package.version);
18+
}
1719
// content = content.replace(new RegExp(oldText, "g"), newText);
1820
fs.writeFileSync(filePath, content, "utf8");
1921
console.log(`Replaced text in ${file}`);

dist/sql.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -900,11 +900,7 @@ const sqlsimpleparser_1 = require("@funktechno/sqlsimpleparser");
900900
*/
901901
Draw.loadPlugin(function (ui) {
902902
// export sql methods
903-
/**
904-
* Mermaid Models TO SQL parser
905-
* src https://github.com/Software-Developers-IRL/Little-Mermaid-2-The-SQL/blob/main/src/generate-sql-ddl.ts
906-
*/
907-
// DbParser
903+
const pluginVersion = "0.0.1";
908904
//Create Base div
909905
const divGenSQL = document.createElement("div");
910906
divGenSQL.style.userSelect = "none";
@@ -914,7 +910,8 @@ Draw.loadPlugin(function (ui) {
914910
const sqlInputGenSQL = document.createElement("textarea");
915911
sqlInputGenSQL.style.height = "200px";
916912
sqlInputGenSQL.style.width = "100%";
917-
sqlInputGenSQL.value = "-- click a database type button";
913+
const sqlExportDefault = "-- click a database type button";
914+
sqlInputGenSQL.value = sqlExportDefault;
918915
mxUtils.br(divGenSQL);
919916
divGenSQL.appendChild(sqlInputGenSQL);
920917
const theMenuExportAs = ui.menus.get("exportAs");
@@ -1177,7 +1174,7 @@ Draw.loadPlugin(function (ui) {
11771174
const parser = new generate_sql_ddl_1.DbParser(type, db);
11781175
// generate sql
11791176
let sql = parser.getSQLDataDefinition();
1180-
sql = `/*\n\tGenerated in drawio\n\tDatabase: ${type}\n*/\n\n` + sql;
1177+
sql = `/*\n\tGenerated in drawio\n\tDatabase: ${type}\n\tPlugin: sql\n\tVersion: ${pluginVersion}\n*/\n\n` + sql;
11811178
sql = sql.trim();
11821179
// update sql value in text area
11831180
sqlInputGenSQL.value = sql;
@@ -1187,7 +1184,7 @@ Draw.loadPlugin(function (ui) {
11871184
;
11881185
mxUtils.br(divGenSQL);
11891186
const resetBtnGenSQL = mxUtils.button(mxResources.get("reset"), function () {
1190-
sqlInputGenSQL.value = "";
1187+
sqlInputGenSQL.value = sqlExportDefault;
11911188
});
11921189
resetBtnGenSQL.style.marginTop = "8px";
11931190
resetBtnGenSQL.style.marginRight = "4px";
@@ -1245,7 +1242,7 @@ Draw.loadPlugin(function (ui) {
12451242
const sqlInputFromSQL = document.createElement("textarea");
12461243
sqlInputFromSQL.style.height = "200px";
12471244
sqlInputFromSQL.style.width = "100%";
1248-
const defaultReset = "/*\n\tDraw io default value\n*/\n\nCREATE TABLE Persons\n(\n PersonID int NOT NULL,\n LastName varchar(255),\n " +
1245+
const defaultReset = "/*\n\tDrawio default value\n\tPlugin: sql\n\tVersion: ${pluginVersion}\n*/\n\nCREATE TABLE Persons\n(\n PersonID int NOT NULL,\n LastName varchar(255),\n " +
12491246
"FirstName varchar(255),\n Address varchar(255),\n City varchar(255),\n Primary Key(PersonID)\n);\n\n" +
12501247
"CREATE TABLE Orders\n(\n OrderID int NOT NULL PRIMARY KEY,\n PersonID int NOT NULL,\n FOREIGN KEY ([PersonID]) REFERENCES [Persons]([PersonID])" +
12511248
"\n);";

src/sql.ts

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ import { ForeignKeyModel, PrimaryKeyModel, PropertyModel, TableModel } from "@fu
1111
Draw.loadPlugin(function(ui) {
1212

1313
// export sql methods
14-
15-
/**
16-
* Mermaid Models TO SQL parser
17-
* src https://github.com/Software-Developers-IRL/Little-Mermaid-2-The-SQL/blob/main/src/generate-sql-ddl.ts
18-
*/
19-
// DbParser
14+
const pluginVersion = "<VERSION>";
2015

2116
//Create Base div
2217
const divGenSQL = document.createElement("div");
@@ -28,7 +23,8 @@ Draw.loadPlugin(function(ui) {
2823
const sqlInputGenSQL = document.createElement("textarea");
2924
sqlInputGenSQL.style.height = "200px";
3025
sqlInputGenSQL.style.width = "100%";
31-
sqlInputGenSQL.value = "-- click a database type button";
26+
const sqlExportDefault = "-- click a database type button";
27+
sqlInputGenSQL.value = sqlExportDefault;
3228
mxUtils.br(divGenSQL);
3329
divGenSQL.appendChild(sqlInputGenSQL);
3430
const theMenuExportAs = ui.menus.get("exportAs");
@@ -308,7 +304,7 @@ Draw.loadPlugin(function(ui) {
308304
const parser = new DbParser(type as string, db);
309305
// generate sql
310306
let sql = parser.getSQLDataDefinition();
311-
sql = `/*\n\tGenerated in drawio\n\tDatabase: ${type}\n*/\n\n` + sql;
307+
sql = `/*\n\tGenerated in drawio\n\tDatabase: ${type}\n\tPlugin: sql\n\tVersion: ${pluginVersion}\n*/\n\n` + sql;
312308
sql = sql.trim();
313309
// update sql value in text area
314310
sqlInputGenSQL.value = sql;
@@ -319,7 +315,7 @@ Draw.loadPlugin(function(ui) {
319315
mxUtils.br(divGenSQL);
320316

321317
const resetBtnGenSQL = mxUtils.button(mxResources.get("reset"), function() {
322-
sqlInputGenSQL.value = "";
318+
sqlInputGenSQL.value = sqlExportDefault;
323319
});
324320

325321
resetBtnGenSQL.style.marginTop = "8px";
@@ -395,10 +391,11 @@ Draw.loadPlugin(function(ui) {
395391
const sqlInputFromSQL = document.createElement("textarea");
396392
sqlInputFromSQL.style.height = "200px";
397393
sqlInputFromSQL.style.width = "100%";
398-
const defaultReset = "/*\n\tDraw io default value\n*/\n\nCREATE TABLE Persons\n(\n PersonID int NOT NULL,\n LastName varchar(255),\n " +
394+
const defaultReset = "/*\n\tDrawio default value\n\tPlugin: sql\n\tVersion: ${pluginVersion}\n*/\n\nCREATE TABLE Persons\n(\n PersonID int NOT NULL,\n LastName varchar(255),\n " +
399395
"FirstName varchar(255),\n Address varchar(255),\n City varchar(255),\n Primary Key(PersonID)\n);\n\n" +
400396
"CREATE TABLE Orders\n(\n OrderID int NOT NULL PRIMARY KEY,\n PersonID int NOT NULL,\n FOREIGN KEY ([PersonID]) REFERENCES [Persons]([PersonID])" +
401397
"\n);";
398+
402399
sqlInputFromSQL.value = defaultReset;
403400
mxUtils.br(divFromSQL);
404401
divFromSQL.appendChild(sqlInputFromSQL);

0 commit comments

Comments
 (0)