Skip to content

Commit

Permalink
revert: "fix(datasource-sql): handle timestamps of tables with unders…
Browse files Browse the repository at this point in the history
…cored column names" (#1169)

Revert "fix(datasource-sql): handle timestamps of tables with underscored col…"

This reverts commit bed5674.
  • Loading branch information
DayTF authored Sep 10, 2024
1 parent 8404223 commit 3b76e38
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions packages/datasource-sql/src/orm-builder/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ import { LatestIntrospection, Table } from '../introspection/types';

type TableOrView = Table & { view?: boolean };

const createdAtFields = ['createdAt', 'created_at'];
const updatedAtFields = ['updatedAt', 'updated_at'];
const deletedAtFields = ['deletedAt', 'deleted_at'];

const nonParanoidTimestampsField = [...createdAtFields, ...updatedAtFields];

export default class ModelBuilder {
static defineModels(
sequelize: Sequelize,
Expand Down Expand Up @@ -71,8 +65,8 @@ export default class ModelBuilder {

for (const column of table.columns) {
const isExplicit =
!(hasTimestamps && nonParanoidTimestampsField.includes(column.name)) &&
!(isParanoid && deletedAtFields.includes(column.name));
!(hasTimestamps && (column.name === 'updatedAt' || column.name === 'createdAt')) &&
!(isParanoid && column.name === 'deletedAt');
const type = SequelizeTypeFactory.makeType(dialect, column.type, table.name, column.name);

if (column.defaultValue && column.isLiteralDefaultValue) {
Expand Down Expand Up @@ -156,12 +150,12 @@ export default class ModelBuilder {

private static hasTimestamps(table: Table): boolean {
return (
!!table.columns.find(c => createdAtFields.includes(c.name)) &&
!!table.columns.find(c => updatedAtFields.includes(c.name))
!!table.columns.find(c => c.name === 'createdAt') &&
!!table.columns.find(c => c.name === 'updatedAt')
);
}

private static isParanoid(table: Table): boolean {
return !!table.columns.find(c => deletedAtFields.includes(c.name));
return !!table.columns.find(c => c.name === 'deletedAt');
}
}

0 comments on commit 3b76e38

Please sign in to comment.