@@ -53,7 +53,7 @@ const createUser = `-- name: CreateUser :one |
| 53 | | 53 | |
| 54 | INSERT INTO users (username, display_name, password_hash) | 54 | INSERT INTO users (username, display_name, password_hash) |
| 55 | VALUES ($1, $2, $3) | 55 | VALUES ($1, $2, $3) |
| 56 | -RETURNING id, username, display_name, primary_email_id, password_hash, password_algo, password_updated_at, email_verified, last_login_at, suspended_at, suspended_reason, deleted_at, created_at, updated_at, bio, location, website, company, pronouns, avatar_object_key, theme, session_epoch, is_site_admin, include_private_contributions | 56 | +RETURNING id, username, display_name, primary_email_id, password_hash, password_algo, password_updated_at, email_verified, last_login_at, suspended_at, suspended_reason, deleted_at, created_at, updated_at, bio, location, website, company, pronouns, avatar_object_key, theme, session_epoch, is_site_admin, include_private_contributions, plan |
| 57 | ` | 57 | ` |
| 58 | | 58 | |
| 59 | type CreateUserParams struct { | 59 | type CreateUserParams struct { |
@@ -91,12 +91,13 @@ func (q *Queries) CreateUser(ctx context.Context, db DBTX, arg CreateUserParams) |
| 91 | &i.SessionEpoch, | 91 | &i.SessionEpoch, |
| 92 | &i.IsSiteAdmin, | 92 | &i.IsSiteAdmin, |
| 93 | &i.IncludePrivateContributions, | 93 | &i.IncludePrivateContributions, |
| | 94 | + &i.Plan, |
| 94 | ) | 95 | ) |
| 95 | return i, err | 96 | return i, err |
| 96 | } | 97 | } |
| 97 | | 98 | |
| 98 | const getUserByID = `-- name: GetUserByID :one | 99 | const getUserByID = `-- name: GetUserByID :one |
| 99 | -SELECT id, username, display_name, primary_email_id, password_hash, password_algo, password_updated_at, email_verified, last_login_at, suspended_at, suspended_reason, deleted_at, created_at, updated_at, bio, location, website, company, pronouns, avatar_object_key, theme, session_epoch, is_site_admin, include_private_contributions | 100 | +SELECT id, username, display_name, primary_email_id, password_hash, password_algo, password_updated_at, email_verified, last_login_at, suspended_at, suspended_reason, deleted_at, created_at, updated_at, bio, location, website, company, pronouns, avatar_object_key, theme, session_epoch, is_site_admin, include_private_contributions, plan |
| 100 | FROM users | 101 | FROM users |
| 101 | WHERE id = $1 AND deleted_at IS NULL | 102 | WHERE id = $1 AND deleted_at IS NULL |
| 102 | ` | 103 | ` |
@@ -129,12 +130,13 @@ func (q *Queries) GetUserByID(ctx context.Context, db DBTX, id int64) (User, err |
| 129 | &i.SessionEpoch, | 130 | &i.SessionEpoch, |
| 130 | &i.IsSiteAdmin, | 131 | &i.IsSiteAdmin, |
| 131 | &i.IncludePrivateContributions, | 132 | &i.IncludePrivateContributions, |
| | 133 | + &i.Plan, |
| 132 | ) | 134 | ) |
| 133 | return i, err | 135 | return i, err |
| 134 | } | 136 | } |
| 135 | | 137 | |
| 136 | const getUserByUsername = `-- name: GetUserByUsername :one | 138 | const getUserByUsername = `-- name: GetUserByUsername :one |
| 137 | -SELECT id, username, display_name, primary_email_id, password_hash, password_algo, password_updated_at, email_verified, last_login_at, suspended_at, suspended_reason, deleted_at, created_at, updated_at, bio, location, website, company, pronouns, avatar_object_key, theme, session_epoch, is_site_admin, include_private_contributions | 139 | +SELECT id, username, display_name, primary_email_id, password_hash, password_algo, password_updated_at, email_verified, last_login_at, suspended_at, suspended_reason, deleted_at, created_at, updated_at, bio, location, website, company, pronouns, avatar_object_key, theme, session_epoch, is_site_admin, include_private_contributions, plan |
| 138 | FROM users | 140 | FROM users |
| 139 | WHERE username = $1 AND deleted_at IS NULL | 141 | WHERE username = $1 AND deleted_at IS NULL |
| 140 | ` | 142 | ` |
@@ -167,12 +169,13 @@ func (q *Queries) GetUserByUsername(ctx context.Context, db DBTX, username strin |
| 167 | &i.SessionEpoch, | 169 | &i.SessionEpoch, |
| 168 | &i.IsSiteAdmin, | 170 | &i.IsSiteAdmin, |
| 169 | &i.IncludePrivateContributions, | 171 | &i.IncludePrivateContributions, |
| | 172 | + &i.Plan, |
| 170 | ) | 173 | ) |
| 171 | return i, err | 174 | return i, err |
| 172 | } | 175 | } |
| 173 | | 176 | |
| 174 | const getUserByUsernameIncludingDeleted = `-- name: GetUserByUsernameIncludingDeleted :one | 177 | const getUserByUsernameIncludingDeleted = `-- name: GetUserByUsernameIncludingDeleted :one |
| 175 | -SELECT id, username, display_name, primary_email_id, password_hash, password_algo, password_updated_at, email_verified, last_login_at, suspended_at, suspended_reason, deleted_at, created_at, updated_at, bio, location, website, company, pronouns, avatar_object_key, theme, session_epoch, is_site_admin, include_private_contributions FROM users WHERE username = $1 | 178 | +SELECT id, username, display_name, primary_email_id, password_hash, password_algo, password_updated_at, email_verified, last_login_at, suspended_at, suspended_reason, deleted_at, created_at, updated_at, bio, location, website, company, pronouns, avatar_object_key, theme, session_epoch, is_site_admin, include_private_contributions, plan FROM users WHERE username = $1 |
| 176 | ` | 179 | ` |
| 177 | | 180 | |
| 178 | func (q *Queries) GetUserByUsernameIncludingDeleted(ctx context.Context, db DBTX, username string) (User, error) { | 181 | func (q *Queries) GetUserByUsernameIncludingDeleted(ctx context.Context, db DBTX, username string) (User, error) { |
@@ -203,12 +206,13 @@ func (q *Queries) GetUserByUsernameIncludingDeleted(ctx context.Context, db DBTX |
| 203 | &i.SessionEpoch, | 206 | &i.SessionEpoch, |
| 204 | &i.IsSiteAdmin, | 207 | &i.IsSiteAdmin, |
| 205 | &i.IncludePrivateContributions, | 208 | &i.IncludePrivateContributions, |
| | 209 | + &i.Plan, |
| 206 | ) | 210 | ) |
| 207 | return i, err | 211 | return i, err |
| 208 | } | 212 | } |
| 209 | | 213 | |
| 210 | const getUserIncludingDeleted = `-- name: GetUserIncludingDeleted :one | 214 | const getUserIncludingDeleted = `-- name: GetUserIncludingDeleted :one |
| 211 | -SELECT id, username, display_name, primary_email_id, password_hash, password_algo, password_updated_at, email_verified, last_login_at, suspended_at, suspended_reason, deleted_at, created_at, updated_at, bio, location, website, company, pronouns, avatar_object_key, theme, session_epoch, is_site_admin, include_private_contributions FROM users WHERE id = $1 | 215 | +SELECT id, username, display_name, primary_email_id, password_hash, password_algo, password_updated_at, email_verified, last_login_at, suspended_at, suspended_reason, deleted_at, created_at, updated_at, bio, location, website, company, pronouns, avatar_object_key, theme, session_epoch, is_site_admin, include_private_contributions, plan FROM users WHERE id = $1 |
| 212 | ` | 216 | ` |
| 213 | | 217 | |
| 214 | // Like GetUserByID but returns the row even when deleted_at IS NOT NULL. | 218 | // Like GetUserByID but returns the row even when deleted_at IS NOT NULL. |
@@ -240,6 +244,7 @@ func (q *Queries) GetUserIncludingDeleted(ctx context.Context, db DBTX, id int64 |
| 240 | &i.SessionEpoch, | 244 | &i.SessionEpoch, |
| 241 | &i.IsSiteAdmin, | 245 | &i.IsSiteAdmin, |
| 242 | &i.IncludePrivateContributions, | 246 | &i.IncludePrivateContributions, |
| | 247 | + &i.Plan, |
| 243 | ) | 248 | ) |
| 244 | return i, err | 249 | return i, err |
| 245 | } | 250 | } |