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-9128: Handle indexes without name in SQL Server #124

Merged
merged 6 commits into from
Dec 16, 2024
Merged

HCK-9128: Handle indexes without name in SQL Server #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dfb8a9a
HCK-9128: Handle indexes without name
Nightlngale Dec 12, 2024
8534455
HCK-9128: Handle indexes without indxKey
Nightlngale Dec 13, 2024
3c6f304
HCK-9128: Handle indexes without indxKey
Nightlngale Dec 15, 2024
6133052
HCK-9128: Make name optional for full-text index
Nightlngale Dec 15, 2024
639447f
HCK-9128: fix FE
Nightlngale Dec 16, 2024
d3a44e2
HCK-9128: simplify the statement
Nightlngale Dec 16, 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
4 changes: 2 additions & 2 deletions forward_engineering/configs/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ module.exports = {

index:
'CREATE${unique}${clustered}${columnstore} INDEX ${name}\n' +
'\tON ${table} ( ${keys} )${include}${expression}${relational_index_option}${terminator}\n',
'\tON ${table}${keys}${include}${expression}${relational_index_option}${terminator}\n',

fullTextIndex:
'CREATE FULLTEXT INDEX ON ${table} (\n\t${keys}\n)\nKEY INDEX ${indexName}\n${catalog}${options}${terminator}\n',
'CREATE FULLTEXT INDEX ON ${table}${keys}\nKEY INDEX ${indexName}\n${catalog}${options}${terminator}\n',

spatialIndex: 'CREATE SPATIAL INDEX ${name} ON ${table} (${column})${using}\n${options}${terminator}\n',

Expand Down
63 changes: 36 additions & 27 deletions forward_engineering/helpers/indexHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ module.exports = app => {
};

const createIndex = (terminator, tableName, index, isParentActivated = true) => {
if (_.isEmpty(index.keys)) {
const isInvalidColumnStore = index.type !== 'columnstore' || (index.type === 'columnstore' && !index.clustered);

if ((_.isEmpty(index.keys) && isInvalidColumnStore) || !index.name) {
return '';
}

Expand All @@ -81,16 +83,21 @@ module.exports = app => {
? commentIfDeactivated(dividedKeys.deactivatedItems.join(', '), { isActivated: false }, true)
: '';

const activatedKeys = dividedKeys.activatedItems.join(', ');
const deactivatedKeys = dividedKeys.deactivatedItems.join(', ');

let keys = activatedKeys + commentedKeys;

if (!isParentActivated) {
keys = activatedKeys + (activatedKeys && deactivatedKeys ? ', ' : '') + deactivatedKeys;
}

return assignTemplates(templates.index, {
name: index.name,
unique: index.unique ? ' UNIQUE' : '',
clustered: index.clustered ? ' CLUSTERED' : '',
table: getTableName(tableName, index.schemaName),
keys: isParentActivated
? dividedKeys.activatedItems.join(', ') + commentedKeys
: dividedKeys.activatedItems.join(', ') +
(dividedKeys.activatedItems.length ? ', ' : '') +
dividedKeys.deactivatedItems.join(', '),
keys: dividedKeys.activatedItems.length || commentedKeys.length ? ` ( ${keys} )` : '',
columnstore: index.type === 'columnstore' ? ' COLUMNSTORE' : '',
relational_index_option: relationalIndexOption.length
? '\n\tWITH (\n\t\t' + relationalIndexOption.join(',\n\t\t') + '\n\t)'
Expand Down Expand Up @@ -132,33 +139,35 @@ module.exports = app => {
};

const createFullTextIndex = (terminator, tableName, index, isParentActivated) => {
if (_.isEmpty(index.keys)) {
if (!index.keyIndex) {
return '';
}
const catalog = getFulltextCatalog(index);
const options = getFullTextOptions(index);

return assignTemplates(templates.fullTextIndex, {
table: getTableName(tableName, index.schemaName),
keys: index.keys
.map(key => {
let column = `[${key.name}]`;
const keys = index.keys
.map(key => {
let column = `[${key.name}]`;

if (key.columnType) {
column += ` TYPE COLUMN ${key.columnType}`;
}

if (key.columnType) {
column += ` TYPE COLUMN ${key.columnType}`;
}
if (key.languageTerm) {
column += ` LANGUAGE ${key.languageTerm}`;
}

if (key.languageTerm) {
column += ` LANGUAGE ${key.languageTerm}`;
}
if (key.statisticalSemantics) {
column += ` STATISTICAL_SEMANTICS`;
}

if (key.statisticalSemantics) {
column += ` STATISTICAL_SEMANTICS`;
}
return isParentActivated ? commentIfDeactivated(column, key) : column;
})
.join(',\n\t');

return isParentActivated ? commentIfDeactivated(column, key) : column;
})
.join(',\n\t'),
return assignTemplates(templates.fullTextIndex, {
table: getTableName(tableName, index.schemaName),
keys: keys ? ` (\n\t${keys}\n)` : '',
indexName: index.keyIndex,
catalog: catalog ? `ON ${catalog}\n` : '',
options: options ? `WITH (\n\t${options}\n)` : '',
Expand Down Expand Up @@ -206,7 +215,7 @@ module.exports = app => {
};

const createSpatialIndex = (terminator, tableName, index) => {
if (!index.column) {
if (!index.column || !index.name) {
return '';
}
const options = getSpatialOptions(index);
Expand All @@ -226,9 +235,9 @@ module.exports = app => {
return createSpatialIndex(terminator, tableName, index);
} else if (index.type === 'fulltext') {
return createFullTextIndex(terminator, tableName, index);
} else {
return createIndex(terminator, tableName, index, isParentActivated);
}

return createIndex(terminator, tableName, index, isParentActivated);
};

const createMemoryOptimizedClusteredIndex = indexData => {
Expand Down
119 changes: 96 additions & 23 deletions properties_pane/entity_level/entityLevelConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* Copyright © 2016-2020 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.
* 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.

In order to define custom properties for any object's properties pane, you may copy/paste from the following,
making sure that you maintain a proper JSON format.
Expand Down Expand Up @@ -69,8 +69,8 @@ making sure that you maintain a proper JSON format.
]
},
// “groupInput” can have the following states - 0 items, 1 item, and many items.
// “blockInput” has only 2 states - 0 items or 1 item.
// This gives us an easy way to represent it as an object and not as an array internally which is beneficial for processing
// “blockInput” has only 2 states - 0 items or 1 item.
// This gives us an easy way to represent it as an object and not as an array internally which is beneficial for processing
// and forward-engineering in particular.
{
"propertyName": "Block",
Expand Down Expand Up @@ -98,7 +98,7 @@ making sure that you maintain a proper JSON format.
"propertyKeyword": "keyList",
"propertyType": "fieldList",
"template": "orderedList"
},
},
{
"propertyName": "List with attribute",
"propertyKeyword": "keyListOrder",
Expand Down Expand Up @@ -666,7 +666,10 @@ making sure that you maintain a proper JSON format.
"propertyName": "Name",
"propertyKeyword": "indxName",
"propertyTooltip": "",
"propertyType": "text"
"propertyType": "text",
"validation": {
"required": true
}
},
{
"propertyName": "Activated",
Expand Down Expand Up @@ -809,7 +812,29 @@ making sure that you maintain a proper JSON format.
"propertyName": "Name",
"propertyKeyword": "indxName",
"propertyTooltip": "",
"propertyType": "text"
"propertyType": "text",
"validation": {
"required": true
},
"dependency": {
"type": "not",
"values": [
{
"key": "indxType",
"value": "FullText"
}
]
}
},
{
"propertyName": "Name",
"propertyKeyword": "indxName",
"propertyTooltip": "",
"propertyType": "text",
"dependency": {
"key": "indxType",
"value": "FullText"
}
},
{
"propertyName": "Activated",
Expand Down Expand Up @@ -857,16 +882,69 @@ making sure that you maintain a proper JSON format.
"propertyType": "fieldList",
"template": "orderedList",
"attributeList": ["ascending", "descending"],
"validation": {
"required": true,
"minLength": 1
},
"dependency": {
"type": "or",
"key": "indxType",
"value": "Index"
}
},
{
"propertyName": "Keys",
"propertyKeyword": "indxKey",
"propertyType": "fieldList",
"template": "orderedList",
"attributeList": ["ascending", "descending"],
"dependency": {
"type": "and",
"values": [
{
"key": "indxType",
"value": "Index"
"value": "Columnstore"
},
{
"type": "not",
"values": [
{
"key": "clusteredIndx",
"value": true
}
]
}
]
},
"validation": {
"required": true,
"minLength": 1
}
},
{
"propertyName": "Keys",
"propertyKeyword": "indxKey",
"propertyType": "fieldList",
"template": "orderedList",
"attributeList": ["ascending", "descending"],
"dependency": {
"type": "or",
"values": [
{
"key": "indxType",
"value": "Columnstore"
"value": "FullText"
},
{
"type": "and",
"values": [
{
"key": "indxType",
"value": "Columnstore"
},
{
"key": "clusteredIndx",
"value": true
}
]
}
]
}
Expand All @@ -883,6 +961,10 @@ making sure that you maintain a proper JSON format.
},
"templateOptions": {
"maxFields": 1
},
"validation": {
"required": true,
"minLength": 1
}
},
{
Expand Down Expand Up @@ -1330,17 +1412,6 @@ making sure that you maintain a proper JSON format.
]
}
},
{
"propertyName": "Keys",
"propertyKeyword": "indxKey",
"propertyType": "fieldList",
"template": "orderedList",
"attributeList": [],
"dependency": {
"key": "indxType",
"value": "FullText"
}
},
{
"propertyName": "Keys properties",
"propertyKeyword": "indxFullTextKeysProperties",
Expand Down Expand Up @@ -1370,11 +1441,13 @@ making sure that you maintain a proper JSON format.
{
"propertyName": "Key index",
"propertyKeyword": "indxFullTextKeyIndex",
"requiredProperty": true,
"propertyType": "text",
"dependency": {
"key": "indxType",
"value": "FullText"
},
"validation": {
"required": true
}
},
{
Expand Down