diff --git a/packages/core/database/src/database.ts b/packages/core/database/src/database.ts index a3b813b96b..6ef92765b6 100644 --- a/packages/core/database/src/database.ts +++ b/packages/core/database/src/database.ts @@ -460,10 +460,6 @@ export class Database extends EventEmitter implements AsyncEmitter { } if (options.underscored) { - if (lodash.get(options, 'sortable.scopeKey')) { - options.sortable.scopeKey = snakeCase(options.sortable.scopeKey); - } - if (lodash.get(options, 'indexes')) { // change index fields to snake case options.indexes = options.indexes.map((index) => { diff --git a/packages/core/database/src/fields/sort-field.ts b/packages/core/database/src/fields/sort-field.ts index da4a77fd3e..cbdf8ee5f8 100644 --- a/packages/core/database/src/fields/sort-field.ts +++ b/packages/core/database/src/fields/sort-field.ts @@ -171,6 +171,7 @@ export class SortField extends Field { }; const scopeKey = this.options.scopeKey; + if (scopeKey) { const groups = await this.collection.repository.find({ attributes: [scopeKey],