github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-28 21:28:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace knex.fn.now() in DB queries (#10736)

Browse Source
This commit is contained in:
ian
2021-12-29 00:03:03 +08:00
committed by GitHub
parent 341c266e58
commit 8a0fba0691
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/services/authentication.ts
View File

@@ -275,12 +275,12 @@ export class AuthenticationService {
.leftJoin('directus_shares AS d', 's.share', 'd.id')
.joinRaw('LEFT JOIN directus_roles AS r ON r.id IN (u.role, d.role)')
.where('s.token', refreshToken)
.andWhere('s.expires', '>=', this.knex.fn.now())
.andWhere('s.expires', '>=', new Date())
.andWhere((subQuery) => {
subQuery.whereNull('d.date_end').orWhere('d.date_end', '>=', this.knex.fn.now());
subQuery.whereNull('d.date_end').orWhere('d.date_end', '>=', new Date());
})
.andWhere((subQuery) => {
subQuery.whereNull('d.date_start').orWhere('d.date_start', '<=', this.knex.fn.now());
subQuery.whereNull('d.date_start').orWhere('d.date_start', '<=', new Date());
})
.first();

4
api/src/services/shares.ts
View File

@@ -54,10 +54,10 @@ export class SharesService extends ItemsService {
.from('directus_shares')
.where('id', payload.share)
.andWhere((subQuery) => {
subQuery.whereNull('date_end').orWhere('date_end', '>=', this.knex.fn.now());
subQuery.whereNull('date_end').orWhere('date_end', '>=', new Date());
})
.andWhere((subQuery) => {
subQuery.whereNull('date_start').orWhere('date_start', '<=', this.knex.fn.now());
subQuery.whereNull('date_start').orWhere('date_start', '<=', new Date());
})
.andWhere((subQuery) => {
subQuery.whereNull('max_uses').orWhere('max_uses', '>=', this.knex.ref('times_used'));