Skip to content

Commit 04b63de

Browse files
AlikRakhmonovAlikRakhmonov
authored
HCK-14977: Custom scripts - regular model (#70)
* HCK-14977: Custom scripts - regular model * fix * fix * fix
1 parent f80c726 commit 04b63de

7 files changed

Lines changed: 416 additions & 24 deletions

File tree

‎forward_engineering/ddlProvider.js‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module.exports = (baseProvider, options, app) => {
3535
const { generateConstraint } = require('./helpers/constraintHelper')(app);
3636

3737
return {
38-
createDatabase({
38+
createSchema({
3939
name,
4040
authorization,
4141
quota,
@@ -252,7 +252,7 @@ module.exports = (baseProvider, options, app) => {
252252
return { statement: columnStatement, isActivated: columnDefinition.isActivated };
253253
},
254254

255-
hydrateDatabase(containerData, { udfs, procedures } = {}) {
255+
hydrateSchema(containerData, { udfs, procedures } = {}) {
256256
return {
257257
name: containerData.name,
258258
authorization: containerData.authorizationUsername
@@ -291,6 +291,11 @@ module.exports = (baseProvider, options, app) => {
291291
};
292292
},
293293

294+
// Keep it because it was used to hydrate `dbData` for the API
295+
hydrateDatabase(containerData, data) {
296+
return this.hydrateSchema(containerData, data);
297+
},
298+
294299
hydrateTable({ tableData, entityData, jsonSchema }) {
295300
const firstTab = _.get(entityData, '[0]', {});
296301
const secondTab = _.get(entityData, '[1]', {});
@@ -411,6 +416,14 @@ module.exports = (baseProvider, options, app) => {
411416
return commentIfDeactivated(statement, data, isPartOfLine);
412417
},
413418

419+
commentStatement(statement) {
420+
return commentIfDeactivated(statement, { isActivated: false });
421+
},
422+
423+
prepareName(name) {
424+
return `"${name}"`;
425+
},
426+
414427
// * statements for alter script from delta model
415428
dropSchema(schemaName) {
416429
return assignTemplates(templates.dropSchema, { name: schemaName });

‎forward_engineering/helpers/alterScriptHelpers/alterContainerHelper.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ module.exports = app => {
88

99
const getAddContainerScript = containerData => {
1010
const constructedDbData = getDbData([containerData]);
11-
const schemaData = ddlProvider.hydrateDatabase(constructedDbData, {
11+
const schemaData = ddlProvider.hydrateSchema(constructedDbData, {
1212
udfs: containerData.role?.UDFs,
1313
procedures: containerData.role?.Procedures,
1414
});
1515

16-
return _.trim(ddlProvider.createDatabase(schemaData));
16+
return _.trim(ddlProvider.createSchema(schemaData));
1717
};
1818

1919
const getDeleteContainerScript = containerData => {
@@ -28,7 +28,7 @@ module.exports = app => {
2828
containerData.compMod.quota?.old !== containerData.compMod.quota?.new;
2929

3030
const constructedDbData = getDbData([containerData]);
31-
const schemaData = ddlProvider.hydrateDatabase(constructedDbData, {
31+
const schemaData = ddlProvider.hydrateSchema(constructedDbData, {
3232
udfs: containerData.role?.UDFs,
3333
procedures: containerData.role?.Procedures,
3434
});

‎localization/en.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,10 @@
170170
"MODAL_WINDOW___OPTIONS_DISPLAY_ERD_V_ENTITY_BOX_CONTENT": "Display of table box content",
171171
"MODAL_WINDOW___OPTIONS_DISPLAY_ERD_V_FIELDS": "Columns",
172172
"MODAL_WINDOW___OPTIONS_DISPLAY_REQUIRED_ATTRIBUTES": "Required columns",
173-
"MODAL_WINDOW___OPTIONS_DISPLAY_NULLABLE_ATTRIBUTES": "Nullable columns"
173+
"MODAL_WINDOW___OPTIONS_DISPLAY_NULLABLE_ATTRIBUTES": "Nullable columns",
174+
175+
"CUSTOM_SCRIPT_CONTAINER_VAR_NAME": "Schema name",
176+
"CUSTOM_SCRIPT_CONTAINER_VAR": "schemaName",
177+
"CUSTOM_SCRIPT_ENTITY_VAR_NAME": "Table name",
178+
"CUSTOM_SCRIPT_ENTITY_VAR": "tableName"
174179
}

‎properties_pane/container_level/containerLevelConfig.json‎

Lines changed: 128 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* Copyright © 2016-2019 by IntegrIT S.A. dba Hackolade. All rights reserved.
33
*
44
* The copyright to the computer software herein is the property of IntegrIT S.A.
5-
* The software may be used and/or copied only with the written permission of
6-
* IntegrIT S.A. or in accordance with the terms and conditions stipulated in
7-
* the agreement/contract under which the software has been supplied.
5+
* The software may be used and/or copied only with the written permission of
6+
* IntegrIT S.A. or in accordance with the terms and conditions stipulated in
7+
* the agreement/contract under which the software has been supplied.
88

99

1010
In order to define custom properties for any object's properties pane, you may copy/paste from the following,
@@ -71,8 +71,8 @@ making sure that you maintain a proper JSON format.
7171
]
7272
},
7373
// “groupInput” can have the following states - 0 items, 1 item, and many items.
74-
// “blockInput” has only 2 states - 0 items or 1 item.
75-
// This gives us an easy way to represent it as an object and not as an array internally which is beneficial for processing
74+
// “blockInput” has only 2 states - 0 items or 1 item.
75+
// This gives us an easy way to represent it as an object and not as an array internally which is beneficial for processing
7676
// and forward-engineering in particular.
7777
{
7878
"propertyName": "Block",
@@ -100,7 +100,7 @@ making sure that you maintain a proper JSON format.
100100
"propertyKeyword": "keyList",
101101
"propertyType": "fieldList",
102102
"template": "orderedList"
103-
},
103+
},
104104
{
105105
"propertyName": "List with attribute",
106106
"propertyKeyword": "keyListOrder",
@@ -440,6 +440,128 @@ making sure that you maintain a proper JSON format.
440440
"value": true
441441
}
442442
},
443+
{
444+
"propertyName": "Custom scripts",
445+
"propertyType": "block",
446+
"propertyKeyword": "customScripts",
447+
"propertyTooltip": "",
448+
"structure": [
449+
{
450+
"propertyName": "Before CREATE SCHEMA",
451+
"propertyKeyword": "beforeCreateContainer",
452+
"propertyType": "block",
453+
"propertyTooltip": "",
454+
"structure": [
455+
{
456+
"propertyName": "Script",
457+
"propertyKeyword": "script",
458+
"propertyType": "details",
459+
"markdown": false,
460+
"template": "codeEditor",
461+
"templateOptions": {
462+
"editorDialect": "sql",
463+
"customScriptVariables": true
464+
}
465+
}
466+
]
467+
},
468+
{
469+
"propertyName": "After CREATE SCHEMA",
470+
"propertyKeyword": "afterCreateContainer",
471+
"propertyType": "block",
472+
"propertyTooltip": "",
473+
"structure": [
474+
{
475+
"propertyName": "Script",
476+
"propertyKeyword": "script",
477+
"propertyType": "details",
478+
"markdown": false,
479+
"template": "codeEditor",
480+
"templateOptions": {
481+
"editorDialect": "sql",
482+
"customScriptVariables": true
483+
}
484+
}
485+
]
486+
},
487+
{
488+
"propertyName": "Before each CREATE TABLE",
489+
"propertyKeyword": "beforeCreateEntity",
490+
"propertyType": "block",
491+
"propertyTooltip": "",
492+
"structure": [
493+
{
494+
"propertyName": "Script",
495+
"propertyKeyword": "script",
496+
"propertyType": "details",
497+
"markdown": false,
498+
"template": "codeEditor",
499+
"templateOptions": {
500+
"editorDialect": "sql",
501+
"customScriptVariables": true
502+
}
503+
}
504+
]
505+
},
506+
{
507+
"propertyName": "After each CREATE TABLE",
508+
"propertyKeyword": "afterCreateEntity",
509+
"propertyType": "block",
510+
"propertyTooltip": "",
511+
"structure": [
512+
{
513+
"propertyName": "Script",
514+
"propertyKeyword": "script",
515+
"propertyType": "details",
516+
"markdown": false,
517+
"template": "codeEditor",
518+
"templateOptions": {
519+
"editorDialect": "sql",
520+
"customScriptVariables": true
521+
}
522+
}
523+
]
524+
},
525+
{
526+
"propertyName": "Before each CREATE VIEW",
527+
"propertyKeyword": "beforeCreateView",
528+
"propertyType": "block",
529+
"propertyTooltip": "",
530+
"structure": [
531+
{
532+
"propertyName": "Script",
533+
"propertyKeyword": "script",
534+
"propertyType": "details",
535+
"markdown": false,
536+
"template": "codeEditor",
537+
"templateOptions": {
538+
"editorDialect": "sql",
539+
"customScriptVariables": true
540+
}
541+
}
542+
]
543+
},
544+
{
545+
"propertyName": "After each CREATE VIEW",
546+
"propertyKeyword": "afterCreateView",
547+
"propertyType": "block",
548+
"propertyTooltip": "",
549+
"structure": [
550+
{
551+
"propertyName": "Script",
552+
"propertyKeyword": "script",
553+
"propertyType": "details",
554+
"markdown": false,
555+
"template": "codeEditor",
556+
"templateOptions": {
557+
"editorDialect": "sql",
558+
"customScriptVariables": true
559+
}
560+
}
561+
]
562+
}
563+
]
564+
},
443565
{
444566
"propertyName": "Remarks",
445567
"propertyKeyword": "comments",

‎properties_pane/entity_level/entityLevelConfig.json‎

Lines changed: 52 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* Copyright © 2016-2019 by IntegrIT S.A. dba Hackolade. All rights reserved.
33
*
44
* The copyright to the computer software herein is the property of IntegrIT S.A.
5-
* The software may be used and/or copied only with the written permission of
6-
* IntegrIT S.A. or in accordance with the terms and conditions stipulated in
7-
* the agreement/contract under which the software has been supplied.
5+
* The software may be used and/or copied only with the written permission of
6+
* IntegrIT S.A. or in accordance with the terms and conditions stipulated in
7+
* the agreement/contract under which the software has been supplied.
88

99
In order to define custom properties for any object's properties pane, you may copy/paste from the following,
1010
making sure that you maintain a proper JSON format.
@@ -70,8 +70,8 @@ making sure that you maintain a proper JSON format.
7070
]
7171
},
7272
// “groupInput” can have the following states - 0 items, 1 item, and many items.
73-
// “blockInput” has only 2 states - 0 items or 1 item.
74-
// This gives us an easy way to represent it as an object and not as an array internally which is beneficial for processing
73+
// “blockInput” has only 2 states - 0 items or 1 item.
74+
// This gives us an easy way to represent it as an object and not as an array internally which is beneficial for processing
7575
// and forward-engineering in particular.
7676
{
7777
"propertyName": "Block",
@@ -99,7 +99,7 @@ making sure that you maintain a proper JSON format.
9999
"propertyKeyword": "keyList",
100100
"propertyType": "fieldList",
101101
"template": "orderedList"
102-
},
102+
},
103103
{
104104
"propertyName": "List with attribute",
105105
"propertyKeyword": "keyListOrder",
@@ -268,6 +268,52 @@ making sure that you maintain a proper JSON format.
268268
"template": "textarea",
269269
"markdown": false
270270
},
271+
{
272+
"propertyName": "Custom scripts",
273+
"propertyType": "block",
274+
"propertyKeyword": "customScripts",
275+
"propertyTooltip": "",
276+
"structure": [
277+
{
278+
"propertyName": "Before CREATE TABLE",
279+
"propertyKeyword": "beforeCreateEntity",
280+
"propertyType": "block",
281+
"propertyTooltip": "",
282+
"structure": [
283+
{
284+
"propertyName": "Script",
285+
"propertyKeyword": "script",
286+
"propertyType": "details",
287+
"markdown": false,
288+
"template": "codeEditor",
289+
"templateOptions": {
290+
"editorDialect": "sql",
291+
"customScriptVariables": true
292+
}
293+
}
294+
]
295+
},
296+
{
297+
"propertyName": "After CREATE TABLE",
298+
"propertyKeyword": "afterCreateEntity",
299+
"propertyType": "block",
300+
"propertyTooltip": "",
301+
"structure": [
302+
{
303+
"propertyName": "Script",
304+
"propertyKeyword": "script",
305+
"propertyType": "details",
306+
"markdown": false,
307+
"template": "codeEditor",
308+
"templateOptions": {
309+
"editorDialect": "sql",
310+
"customScriptVariables": true
311+
}
312+
}
313+
]
314+
}
315+
]
316+
},
271317
{
272318
"propertyName": "Remarks",
273319
"propertyKeyword": "comments",

0 commit comments

Comments
 (0)