diff --git a/server/auth_audit_test.go b/server/auth_audit_test.go index 4ad4bb0..bcee600 100644 --- a/server/auth_audit_test.go +++ b/server/auth_audit_test.go @@ -110,6 +110,7 @@ func TestUserQuerySupportsKeywordAndUserIDs(t *testing.T) { t.Fatalf("unexpected filter arguments: got %#v, want %#v", args, want) } for _, field := range []string{ + "CAST(u.id AS CHAR) AS user_id", "AS avatar", "u.account_no AS display_no", "AS register_type", diff --git a/server/internal_admin_query_resources.go b/server/internal_admin_query_resources.go index 18ad9bd..1cb9070 100644 --- a/server/internal_admin_query_resources.go +++ b/server/internal_admin_query_resources.go @@ -265,7 +265,7 @@ func internalAdminQuerySpec(resource string) (*internalQuerySpec, bool) { func usersInternalQuerySpec() *internalQuerySpec { return &internalQuerySpec{ - Select: `SELECT u.id AS user_id,u.account_no AS display_no,u.username,u.phone,u.state,u.stateat AS state_at,u.access,u.lastseen AS last_seen,u.useragent AS user_agent,u.public,u.trusted, + Select: `SELECT CAST(u.id AS CHAR) AS user_id,u.account_no AS display_no,u.username,u.phone,u.state,u.stateat AS state_at,u.access,u.lastseen AS last_seen,u.useragent AS user_agent,u.public,u.trusted, p.nickname,p.public_account,p.gender,p.region,p.avatar_file_id, COALESCE( NULLIF(avatar.location,''),