Skip to content

HCK-13793: Oracle - handle NOT NULL constraint name #215

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

Merged
Vitalii4as merged 3 commits into from
Dec 8, 2025
Merged

HCK-13793: Oracle - handle NOT NULL constraint name #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
379bbd9
HCK-13793: Oracle - handle NOT NULL constraint name
AlikRakhmonov Dec 5, 2025
1836327
fix type
AlikRakhmonov Dec 5, 2025
bc41d15
Merge branch 'develop' into HCK-13793
AlikRakhmonov Dec 8, 2025
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
77 changes: 54 additions & 23 deletions forward_engineering/alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,6 @@ const {
prepareNameForScriptFormat,
} = require('../../../utils/general');

/**
* @param {string} tableName
* @param {string} columnName
* @return {string}
* */
const setNotNullConstraint = (tableName, columnName) => {
return assignTemplates(templates.addNotNullConstraint, {
tableName,
columnName,
});
};

/**
* @param {object} params
* @property {string} [scriptFormat]
Expand All @@ -35,34 +23,77 @@ const getModifyNonNullColumnsScriptDtos = ({ scriptFormat, collection }) => {
const currentRequiredColumnNames = collection.required || [];
const previousRequiredColumnNames = collection.role.required || [];

const columnNamesToAddNotNullConstraint = _.difference(currentRequiredColumnNames, previousRequiredColumnNames);
const columnNamesToRemoveNotNullConstraint = _.difference(previousRequiredColumnNames, currentRequiredColumnNames);

const addNotNullConstraintsScript = _.toPairs(collection.properties)
.map(([name, jsonSchema]) => {
const oldName = jsonSchema.compMod.oldField.name;
const shouldRemoveForOldName = columnNamesToRemoveNotNullConstraint.includes(oldName);
const shouldAddForNewName = columnNamesToAddNotNullConstraint.includes(name);

const newConstraintName = jsonSchema.notNullConstraintName || '';
const oldConstraintName = collection.role.properties[oldName]?.notNullConstraintName || '';
const isNameChanged = newConstraintName !== oldConstraintName;

const isOldRequired = previousRequiredColumnNames.includes(oldName);
const isNewRequired = currentRequiredColumnNames.includes(name);

const scriptParams = {
tableName: fullTableName,
columnName: prepareName(name),
};

let script = null;
const scripts = [];

if (shouldAddForNewName && !shouldRemoveForOldName) {
script = assignTemplates(templates.addNotNullConstraint, scriptParams);
} else if (!shouldAddForNewName && shouldRemoveForOldName) {
script = assignTemplates(templates.dropNotNullConstraint, scriptParams);
if (isOldRequired && (!isNewRequired || isNameChanged)) {
const template = oldConstraintName ? templates.dropConstraint : templates.alterNullableConstraint;
scripts.push(
assignTemplates(template, { ...scriptParams, constraintName: prepareName(oldConstraintName) }),
);
}

return script && AlterScriptDto.getInstance([script], true, false);
if (isNewRequired && (!isOldRequired || isNameChanged)) {
const template = newConstraintName
? templates.alterNamedNotNullConstraint
: templates.alterNotNullConstraint;
scripts.push(
assignTemplates(template, { ...scriptParams, constraintName: prepareName(newConstraintName) }),
);
}

return scripts.length ? AlterScriptDto.getInstance(scripts, true, false) : null;
})
.filter(Boolean);

return addNotNullConstraintsScript;
};

const createNotNullConstraintScript = ({ scriptFormat, constraintName, columnName }) => {
const prepareName = prepareNameForScriptFormat(scriptFormat);
return assignTemplates(templates.notNullConstraint, {
constraintName: prepareName(constraintName),
columnName: prepareName(columnName),
});
};

/**
* Get named NOT NULL constraints data
* @param {object} jsonSchema
* @param {string} scriptFormat
* @returns {Array<{ statement: string, isActivated: boolean }>}
*/
const getNotNullConstraints = (jsonSchema, scriptFormat) => {
return _.toPairs(jsonSchema.properties)
.filter(
([name, columnSchema]) => jsonSchema.required?.includes(name) && columnSchema.notNullConstraintName?.trim(),
)
.map(([name, columnSchema]) => ({
statement: createNotNullConstraintScript({
scriptFormat,
constraintName: columnSchema.notNullConstraintName,
columnName: name,
}),
isActivated: columnSchema.isActivated,
}));
};

module.exports = {
getModifyNonNullColumnsScriptDtos,
getNotNullConstraints,
};
2 changes: 1 addition & 1 deletion forward_engineering/ddlProvider/ddlHelpers/columnDefinitionHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module.exports = ({ assignTemplates, templates, commentIfDeactivated, wrapCommen
);
const primaryKeyString = primaryKey ? ` PRIMARY KEY` : '';
const uniqueKeyString = unique ? ` UNIQUE` : '';
const nullableString = nullable ? '' : ' NOT NULL';
const nullableString = nullable || primaryKey ? '' : ' NOT NULL';
return `${nullableString}${constraintString}${primaryKeyString}${uniqueKeyString}${statement}`;
};

Expand Down
27 changes: 18 additions & 9 deletions forward_engineering/ddlProvider/ddlProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const {
} = require('../utils/general');
const { assignTemplates } = require('../utils/assignTemplates');
const { decorateType } = require('./ddlHelpers/columnDefinitionHelpers/decorateType');
const { getNotNullConstraints } = require('../alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper');

/**
* @param dbVersion {string} DB version in "21ai" format
Expand All @@ -35,10 +36,9 @@ const shouldUseTryCatchIfNotExistsWrapper = dbVersion => {
module.exports = (baseProvider, options, app) => {
const toArray = val => (_.isArray(val) ? val : [val]);

const prepareName = prepareNameForScriptFormat(options?.targetScriptOptions?.keyword);
const getNamePrefixedWithSchemaName = getNamePrefixedWithSchemaNameForScriptFormat(
options?.targetScriptOptions?.keyword,
);
const scriptFormat = options?.targetScriptOptions?.keyword;
const prepareName = prepareNameForScriptFormat(scriptFormat);
const getNamePrefixedWithSchemaName = getNamePrefixedWithSchemaNameForScriptFormat(scriptFormat);

const keyHelper = require('./ddlHelpers/keyHelper')(clean);

Expand Down Expand Up @@ -183,7 +183,7 @@ module.exports = (baseProvider, options, app) => {
primaryKeyOptions: jsonSchema.primaryKeyOptions,
unique: keyHelper.isInlineUnique(jsonSchema),
uniqueKeyOptions: jsonSchema.uniqueKeyOptions,
nullable: columnDefinition.nullable,
nullable: columnDefinition.nullable || Boolean(jsonSchema.notNullConstraintName?.trim()),
default: columnDefinition.default,
comment: jsonSchema.refDescription || jsonSchema.description || definitionJsonSchema.description,
isActivated: columnDefinition.isActivated,
Expand Down Expand Up @@ -342,12 +342,12 @@ module.exports = (baseProvider, options, app) => {
* @param fkConstraintName {string}
* @return string
* */
dropForeignKey(tableName, fkConstraintName) {
dropForeignKey(tableName, constraintName) {
const templateConfig = {
tableName,
fkConstraintName,
constraintName,
};
return assignTemplates(templates.dropForeignKey, templateConfig);
return assignTemplates(templates.dropConstraint, templateConfig);
},

hydrateTable({ tableData, entityData, jsonSchema }) {
Expand All @@ -358,6 +358,7 @@ module.exports = (baseProvider, options, app) => {
return {
...tableData,
keyConstraints: keyHelper.getTableKeyConstraints(jsonSchema),
notNullConstraints: getNotNullConstraints(jsonSchema, scriptFormat),
selectStatement: _.trim(detailsTab.selectStatement),
partitioning: _.assign({}, partitioning, { compositePartitionKey }),
..._.pick(
Expand Down Expand Up @@ -405,6 +406,7 @@ module.exports = (baseProvider, options, app) => {
ifNotExist,
tableProperties,
synonyms,
notNullConstraints,
},
isActivated,
) {
Expand All @@ -428,11 +430,18 @@ module.exports = (baseProvider, options, app) => {

const columnDescriptions = getColumnComments(tableName, columnDefinitions);

const dividedNotNullConstraints = divideIntoActivatedAndDeactivated(
notNullConstraints,
key => key.statement,
);
const notNullConstraintsString = generateConstraintsString(dividedNotNullConstraints, isActivated);

const tableProps = assignTemplates(templates.createTableProps, {
columnDefinitions: _.join(columns, ',\n\t'),
foreignKeyConstraints: foreignKeyConstraintsString,
keyConstraints: keyConstraintsString,
checkConstraints: !_.isEmpty(checkConstraints) ? ',\n\t' + _.join(checkConstraints, ',\n\t') : '',
checkConstraints: _.isEmpty(checkConstraints) ? '' : ',\n\t' + _.join(checkConstraints, ',\n\t'),
notNullConstraints: notNullConstraintsString,
});

const synonymsStatements = generateSynonymStatements(synonyms, tableName, schemaData.schemaName);
Expand Down
14 changes: 9 additions & 5 deletions forward_engineering/ddlProvider/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ module.exports = {

createTable: 'CREATE${tableType} TABLE${ifNotExists} ${name}${tableProps}${options}',

createTableProps: '${columnDefinitions}${keyConstraints}${checkConstraints}${foreignKeyConstraints}',
createTableProps:
'${columnDefinitions}${keyConstraints}${checkConstraints}${foreignKeyConstraints}${notNullConstraints}',

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

Expand All @@ -19,8 +20,6 @@ module.exports = {
createForeignKey:
'ALTER TABLE ${foreignTable} ADD CONSTRAINT ${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable} (${primaryKey})${onDelete};',

dropForeignKey: 'ALTER TABLE ${tableName} DROP CONSTRAINT ${fkConstraintName};',

createIndex: `CREATE$\{indexType} INDEX$\{ifNotExists}$\{name} ON $\{tableName}$\{keys}$\{options};\n`,

dropIndex: 'DROP INDEX ${name};',
Expand Down Expand Up @@ -84,9 +83,14 @@ module.exports = {

addPkConstraint: 'ALTER TABLE ${tableName} ADD ${constraintStatement};',

addNotNullConstraint: 'ALTER TABLE ${tableName} MODIFY ${columnName} NOT NULL;',
notNullConstraint: 'CONSTRAINT ${constraintName} CHECK (${columnName} IS NOT NULL)',

alterNotNullConstraint: 'ALTER TABLE ${tableName} MODIFY ${columnName} NOT NULL;',

alterNamedNotNullConstraint:
'ALTER TABLE ${tableName} ADD CONSTRAINT ${constraintName} CHECK (${columnName} IS NOT NULL);',

dropNotNullConstraint: 'ALTER TABLE ${tableName} MODIFY ${columnName} NULL;',
alterNullableConstraint: 'ALTER TABLE ${tableName} MODIFY ${columnName} NULL;',

updateColumnDefaultValue: 'ALTER TABLE ${tableName} MODIFY ${columnName}${defaultValue};',

Expand Down