Remove array merge

This commit is contained in:
fogelito 2025-03-28 09:16:25 +03:00
parent cba700402b
commit a4c18c4b77

View file

@ -405,7 +405,7 @@ class Deletes extends Action
);
$queries = [
Query::select(array_merge($this->selects, ['accessedAt'])),
Query::select([...$this->selects, 'accessedAt']),
Query::lessThan('accessedAt', $datetime),
Query::orderDesc('accessedAt'),
Query::orderDesc(),
@ -439,11 +439,11 @@ class Deletes extends Action
/** @var Database $dbForProject*/
$dbForProject = $getProjectDB($project);
$select = array_merge($this->selects, ['time']);
$selects = [...$this->selects, 'time'];
// Delete Usage stats from projectDB
$this->deleteByGroup('stats', [
Query::select($select),
Query::select($selects),
Query::equal('period', ['1h']),
Query::lessThan('time', $hourlyUsageRetentionDatetime),
Query::orderDesc('time'),
@ -456,7 +456,7 @@ class Deletes extends Action
// Delete Usage stats from logsDB
$this->deleteByGroup('stats', [
Query::select($select),
Query::select($selects),
Query::equal('period', ['1h']),
Query::lessThan('time', $hourlyUsageRetentionDatetime),
Query::orderDesc('time'),
@ -753,7 +753,7 @@ class Deletes extends Action
// Delete Executions
$this->deleteByGroup('executions', [
Query::select(array_merge($this->selects, ['$createdAt'])),
Query::select([...$this->selects, '$createdAt']),
Query::lessThan('$createdAt', $datetime),
Query::orderDesc('$createdAt'),
Query::orderDesc(),
@ -774,7 +774,7 @@ class Deletes extends Action
// Delete Sessions
$this->deleteByGroup('sessions', [
Query::select(array_merge($this->selects, ['$createdAt'])),
Query::select([...$this->selects, '$createdAt']),
Query::lessThan('$createdAt', $expired),
Query::orderDesc('$createdAt'),
Query::orderDesc(),
@ -811,7 +811,7 @@ class Deletes extends Action
try {
$this->deleteByGroup(Audit::COLLECTION, [
Query::select(array_merge($this->selects, ['time'])),
Query::select([...$this->selects, 'time']),
Query::lessThan('time', $auditRetention),
Query::orderDesc('time'),
Query::orderAsc(),