From a2b2d9c61cdcec6259a5d3ea45193e0d1cbbd2d8 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Sat, 27 Mar 2021 17:28:59 +0100 Subject: [PATCH] Fix sqlite-now incompatibility --- store/rdbms/auth_oa2tokens.go | 3 ++- store/rdbms/auth_sessions.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/store/rdbms/auth_oa2tokens.go b/store/rdbms/auth_oa2tokens.go index b770abebf..00957c4d5 100644 --- a/store/rdbms/auth_oa2tokens.go +++ b/store/rdbms/auth_oa2tokens.go @@ -4,6 +4,7 @@ import ( "context" "github.com/Masterminds/squirrel" "github.com/cortezaproject/corteza-server/system/types" + "time" ) func (s Store) convertAuthOa2tokenFilter(f types.AuthOa2tokenFilter) (query squirrel.SelectBuilder, err error) { @@ -17,7 +18,7 @@ func (s Store) convertAuthOa2tokenFilter(f types.AuthOa2tokenFilter) (query squi } func (s Store) DeleteExpiredAuthOA2Tokens(ctx context.Context) error { - return s.execDeleteAuthOa2tokens(ctx, squirrel.Expr("tkn.expires_at < NOW()")) + return s.execDeleteAuthOa2tokens(ctx, squirrel.Lt{"tkn.expires_at": time.Now()}) } func (s Store) DeleteAuthOA2TokenByCode(ctx context.Context, code string) error { diff --git a/store/rdbms/auth_sessions.go b/store/rdbms/auth_sessions.go index 11cdf2776..d242cc835 100644 --- a/store/rdbms/auth_sessions.go +++ b/store/rdbms/auth_sessions.go @@ -4,6 +4,7 @@ import ( "context" "github.com/Masterminds/squirrel" "github.com/cortezaproject/corteza-server/system/types" + "time" ) func (s Store) convertAuthSessionFilter(f types.AuthSessionFilter) (query squirrel.SelectBuilder, err error) { @@ -20,5 +21,5 @@ func (s Store) DeleteAuthSessionsByUserID(ctx context.Context, userID uint64) er } func (s Store) DeleteExpiredAuthSessions(ctx context.Context) error { - return s.execDeleteAuthSessions(ctx, squirrel.Expr("ses.expires_at < NOW()")) + return s.execDeleteAuthSessions(ctx, squirrel.Lt{"ses.expires_at": time.Now()}) }