Skip to content

Commit 18d46f0

Browse files
committed
fix type in queries on timestamps
1 parent 0f529c3 commit 18d46f0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/mod_invites_sql.erl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ sql_schemas() ->
6565
cleanup_expired(Host) ->
6666
NOW = sql_now(),
6767
{updated, Count} =
68-
ejabberd_sql:sql_query(Host, ?SQL("DELETE FROM invite_token WHERE expires < %(NOW)s")),
68+
ejabberd_sql:sql_query(Host, ?SQL("DELETE FROM invite_token WHERE expires < %(NOW)t")),
6969
Count.
7070

7171
create_invite(Invite) ->
@@ -86,8 +86,8 @@ create_invite(Invite) ->
8686
"username=%(User)s",
8787
"server_host=%(Host)s",
8888
"type=%(Type)s",
89-
"created_at=%(CreatedAt)s",
90-
"expires=%(Expires)s",
89+
"created_at=%(CreatedAt)t",
90+
"expires=%(Expires)t",
9191
"account_name=%(AccountName)s"]),
9292
{updated, 1} = ejabberd_sql:sql_query(Host, Query),
9393
Invite.
@@ -97,7 +97,7 @@ expire_tokens(User, Server) ->
9797
{updated, Count} =
9898
ejabberd_sql:sql_query(Server,
9999
?SQL("UPDATE invite_token SET expires = '1970-01-01 00:00:01' WHERE "
100-
"username = %(User)s AND %(Server)H AND expires > %(NOW)s AND "
100+
"username = %(User)s AND %(Server)H AND expires > %(NOW)t AND "
101101
"type != 'R'")),
102102
Count.
103103

@@ -124,15 +124,15 @@ is_reserved(Host, Token, User) ->
124124
{selected, [{Count}]} =
125125
ejabberd_sql:sql_query(Host,
126126
?SQL("SELECT @(COUNT(*))d FROM invite_token WHERE %(Host)H AND token != %(Token)s AND "
127-
"account_name = %(User)s AND invitee = '' AND expires > %(NOW)s")),
127+
"account_name = %(User)s AND invitee = '' AND expires > %(NOW)t")),
128128
Count > 0.
129129

130130
is_token_valid(Host, Token, {User, Host}) ->
131131
NOW = sql_now(),
132132
{selected, Rows} =
133133
ejabberd_sql:sql_query(Host,
134134
?SQL("SELECT @(token)s FROM invite_token WHERE %(Host)H AND token = %(Token)s AND "
135-
"invitee = '' AND expires > %(NOW)s AND (%(User)s = '' OR username = %(User)s)")),
135+
"invitee = '' AND expires > %(NOW)t AND (%(User)s = '' OR username = %(User)s)")),
136136
case Rows /= [] of
137137
true ->
138138
true;

0 commit comments

Comments
 (0)