Skip to content

Revert "temporary disable primary key structure check" #1019

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
Artuomka merged 1 commit into from
Feb 11, 2025
Merged

Revert "temporary disable primary key structure check" #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 12 additions & 14 deletions backend/src/entities/table/use-cases/delete-row-from-table.use.case.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable security/detect-object-injection */
import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
import AbstractUseCase from '../../../common/abstract-use.case.js';
import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
Expand Down Expand Up @@ -85,23 +84,22 @@ export class DeleteRowFromTableUseCase
const availablePrimaryColumns: Array<string> = primaryColumns.map((column) => column.column_name);

Object.keys(primaryKey).forEach((key) => {
if (
(!primaryKey[key] && primaryKey[key] !== '') ||
(typeof primaryKey[key] === 'object' && !Object.keys(primaryKey[key]).length)
) {
// eslint-disable-next-line security/detect-object-injection
if (!primaryKey[key] && primaryKey[key] !== '') {
// eslint-disable-next-line security/detect-object-injection
delete primaryKey[key];
}
});

// const receivedPrimaryColumns = Object.keys(primaryKey);
// if (!compareArrayElements(availablePrimaryColumns, receivedPrimaryColumns)) {
// throw new HttpException(
// {
// message: Messages.PRIMARY_KEY_INVALID,
// },
// HttpStatus.BAD_REQUEST,
// );
// }
const receivedPrimaryColumns = Object.keys(primaryKey);
if (!compareArrayElements(availablePrimaryColumns, receivedPrimaryColumns)) {
throw new HttpException(
{
message: Messages.PRIMARY_KEY_INVALID,
},
HttpStatus.BAD_REQUEST,
);
}

const tableSettings = await this._dbContext.tableSettingsRepository.findTableSettings(connectionId, tableName);
if (tableSettings && !tableSettings?.can_delete) {
Expand Down
24 changes: 11 additions & 13 deletions backend/src/entities/table/use-cases/delete-rows-from-table.use.case.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable security/detect-object-injection */
import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
import AbstractUseCase from '../../../common/abstract-use.case.js';
import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
Expand Down Expand Up @@ -97,23 +96,22 @@ export class DeleteRowsFromTableUseCase

primaryKeys.forEach((primaryKey) => {
Object.keys(primaryKey).forEach((key) => {
if (
(!primaryKey[key] && primaryKey[key] !== '') ||
(typeof primaryKey[key] === 'object' && !Object.keys(primaryKey[key]).length)
) {
// eslint-disable-next-line security/detect-object-injection
if (!primaryKey[key] && primaryKey[key] !== '') {
// eslint-disable-next-line security/detect-object-injection
delete primaryKey[key];
}
});

const receivedPrimaryColumns = Object.keys(primaryKey);
// if (!compareArrayElements(availablePrimaryColumns, receivedPrimaryColumns)) {
// throw new HttpException(
// {
// message: Messages.PRIMARY_KEY_INVALID,
// },
// HttpStatus.BAD_REQUEST,
// );
// }
if (!compareArrayElements(availablePrimaryColumns, receivedPrimaryColumns)) {
throw new HttpException(
{
message: Messages.PRIMARY_KEY_INVALID,
},
HttpStatus.BAD_REQUEST,
);
}
});

let oldRowsData: Array<Record<string, unknown>>;
Expand Down
Loading