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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

[HCK-6077, HCK-6074]: remove unsupported column options #18

Merged
merged 4 commits into from
Jun 4, 2024
Merged

[HCK-6077, HCK-6074]: remove unsupported column options #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a3a19b
HCK-6077: remove unsupported column option
serhii-filonenko Jun 3, 2024
94ba87e
HCK-6077: add adapter to remove unsupported encrypt option
serhii-filonenko Jun 3, 2024
b8cc252
HCK-6077: remove unsupported column option
serhii-filonenko Jun 3, 2024
296af91
Merge branch 'develop' into Fix/HCK-6077-HCK-6074-db2-unsupported-col…
serhii-filonenko Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions adapter/0.2.2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/**
* Copyright © 2016-2024 by IntegrIT S.A. dba Hackolade. All rights reserved.
*
* The copyright to the computer software herein is the property of IntegrIT S.A.
* The software may be used and/or copied only with the written permission of
* IntegrIT S.A. or in accordance with the terms and conditions stipulated in
* the agreement/contract under which the software has been supplied.
*
* {
* "add": {
* "entity": [<names of new property>],
* "container": [<names of new property>],
* "model": [<names of new property>],
* "view": [<names of new property>],
* "field": {
* "<type>": [<names of new property>]
* }
* },
* "delete": {
* "entity": [<names of new property>],
* "container": [<names of new property>],
* "model": [<names of new property>],
* "view": [<names of new property>],
* "field": {
* "<type>": [<names of new property>]
* }
* },
* "modify": {
* "entity": [
* {
* "from": { <properties that identify record> },
* "to": { <properties that need to be changed> }
* }
* ],
* "container": [],
* "model": [],
* "view": [],
* "field": []
* },
* }
*/
{
"delete": {
"field": {
"char": ["encryption"],
"array": ["encryption"],
"multiset": ["encryption"],
"xml": ["array_type"]
}
}
}
22 changes: 0 additions & 22 deletions forward_engineering/ddlProvider/ddlHelpers/columnDefinition/getColumnEncrypt.js
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions forward_engineering/ddlProvider/ddlProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const {
} = require('../utils/general.js');
const { assignTemplates } = require('../utils/assignTemplates');
const keyHelper = require('./ddlHelpers/key/keyHelper.js');
const { getColumnEncrypt } = require('./ddlHelpers/columnDefinition/getColumnEncrypt.js');
const { getColumnType } = require('./ddlHelpers/columnDefinition/getColumnType.js');
const { getColumnDefault } = require('./ddlHelpers/columnDefinition/getColumnDefault.js');
const { getColumnConstraints } = require('./ddlHelpers/columnDefinition/getColumnConstraints.js');
Expand Down Expand Up @@ -95,7 +94,6 @@ module.exports = (baseProvider, options, app) => {
withTimeZone: jsonSchema.withTimeZone,
localTimeZone: jsonSchema.localTimeZone,
lengthSemantics: jsonSchema.lengthSemantics,
encryption: jsonSchema.encryption,
identity: jsonSchema.identity,
isUDTRef,
itemsType,
Expand All @@ -118,7 +116,6 @@ module.exports = (baseProvider, options, app) => {
name: wrapInQuotes({ name: columnDefinition.name }),
type: getColumnType(columnDefinition),
default: getColumnDefault(columnDefinition),
encrypt: getColumnEncrypt(columnDefinition),
constraints: getColumnConstraints(columnDefinition),
},
});
Expand Down
2 changes: 1 addition & 1 deletion forward_engineering/ddlProvider/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {

createTableProps: '${columns}${keyConstraints}${checkConstraints}${foreignKeyConstraints}',

columnDefinition: '${name}${type}${default}${encrypt}${constraints}',
columnDefinition: '${name}${type}${default}${constraints}',

createForeignKey:
'ALTER TABLE ${foreignTable} ADD CONSTRAINT ${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable} (${primaryKey})${onDelete};',
Expand Down
86 changes: 0 additions & 86 deletions properties_pane/field_level/fieldLevelConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,29 +443,6 @@ making sure that you maintain a proper JSON format.
]
}
},
{
"propertyName": "Encryption",
"propertyType": "block",
"propertyKeyword": "encryption",
"propertyTooltip": "",
"structure": [
{
"propertyName": "Algorithm",
"propertyKeyword": "ENCRYPTION_ALGORITHM",
"propertyType": "text"
},
{
"propertyName": "No Salt",
"propertyKeyword": "noSalt",
"propertyType": "checkbox"
},
{
"propertyName": "Integrity Algorithm",
"propertyKeyword": "INTEGRITY_ALGORITHM",
"propertyType": "text"
}
]
},
{
"propertyName": "Primary key",
"propertyKeyword": "compositePrimaryKey",
Expand Down Expand Up @@ -2931,29 +2908,6 @@ making sure that you maintain a proper JSON format.
]
}
},
{
"propertyName": "Encryption",
"propertyType": "block",
"propertyKeyword": "encryption",
"propertyTooltip": "",
"structure": [
{
"propertyName": "Algorithm",
"propertyKeyword": "ENCRYPTION_ALGORITHM",
"propertyType": "text"
},
{
"propertyName": "No Salt",
"propertyKeyword": "noSalt",
"propertyType": "checkbox"
},
{
"propertyName": "Integrity Algorithm",
"propertyKeyword": "INTEGRITY_ALGORITHM",
"propertyType": "text"
}
]
},
{
"propertyName": "Primary key",
"propertyKeyword": "compositePrimaryKey",
Expand Down Expand Up @@ -3452,29 +3406,6 @@ making sure that you maintain a proper JSON format.
]
}
},
{
"propertyName": "Encryption",
"propertyType": "block",
"propertyKeyword": "encryption",
"propertyTooltip": "",
"structure": [
{
"propertyName": "Algorithm",
"propertyKeyword": "ENCRYPTION_ALGORITHM",
"propertyType": "text"
},
{
"propertyName": "No Salt",
"propertyKeyword": "noSalt",
"propertyType": "checkbox"
},
{
"propertyName": "Integrity Algorithm",
"propertyKeyword": "INTEGRITY_ALGORITHM",
"propertyType": "text"
}
]
},
{
"propertyName": "Primary key",
"propertyKeyword": "compositePrimaryKey",
Expand Down Expand Up @@ -3904,23 +3835,6 @@ making sure that you maintain a proper JSON format.
"editorDialect": "markdown"
}
},
{
"propertyName": "Array type",
"propertyType": "group",
"propertyKeyword": "array_type",
"propertyTooltip": "Declaring the array number of dimensions is simply for documentation; it does not affect run-time behavior.",
"structure": [
{
"propertyName": "Size limit",
"propertyKeyword": "array_size_limit",
"propertyTooltip": "Declaring the array size is simply for documentation; it does not affect run-time behavior.",
"propertyType": "numeric",
"valueType": "number",
"minValue": 0,
"step": 1
}
]
},
{
"propertyName": "Generated column",
"propertyKeyword": "generatedColumn",
Expand Down