SQuiz/common
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update sqlc gen

Browse Source
This commit is contained in:
Pavel 2024-06-08 17:59:19 +03:00
parent 41e21f5f84
commit 4f688b5bc8
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dal/sqlcgen/models.go
View File

@ -186,4 +186,5 @@ type User struct {
Subdomain string `db:"subdomain" json:"subdomain"` Subdomain string `db:"subdomain" json:"subdomain"`
Amouserid int32 `db:"amouserid" json:"amouserid"` Amouserid int32 `db:"amouserid" json:"amouserid"`
Country string `db:"country" json:"country"` Country string `db:"country" json:"country"`
Driveurl string `db:"driveurl" json:"driveurl"`
} }

21
dal/sqlcgen/queries.sql.go
View File

@ -583,12 +583,12 @@ WITH new_users AS (
nu.createdAt nu.createdAt
FROM new_users nu FROM new_users nu
ON CONFLICT (amoID) DO NOTHING ON CONFLICT (amoID) DO NOTHING
RETURNING id, accountid, amoid, name, email, role, "Group", deleted, createdat, subdomain, amouserid, country RETURNING id, accountid, amoid, name, email, role, "Group", deleted, createdat, subdomain, amouserid, country, driveurl
) )
SELECT nu.amoid, nu.name, nu."Group", nu.role, nu.email, nu.amouserid, nu.createdat SELECT nu.amoid, nu.name, nu."Group", nu.role, nu.email, nu.amouserid, nu.createdat
FROM new_users nu FROM new_users nu
WHERE NOT EXISTS ( WHERE NOT EXISTS (
SELECT id, accountid, amoid, name, email, role, "Group", deleted, createdat, subdomain, amouserid, country SELECT id, accountid, amoid, name, email, role, "Group", deleted, createdat, subdomain, amouserid, country, driveurl
FROM inserted_users ins FROM inserted_users ins
WHERE ins.amoID = nu.amoID WHERE ins.amoID = nu.amoID
) )
@ -780,8 +780,8 @@ func (q *Queries) CreateAccount(ctx context.Context, arg CreateAccountParams) (A
const createAmoAccount = `-- name: CreateAmoAccount :exec const createAmoAccount = `-- name: CreateAmoAccount :exec
INSERT INTO users (AccountID, AmoID, Name, Email, Role, "Group", Deleted, CreatedAt, Subdomain, AmoUserID, Country) INSERT INTO users (AccountID, AmoID, Name, Email, Role, "Group", Deleted, CreatedAt, Subdomain, AmoUserID, Country,DriveURL)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
` `
type CreateAmoAccountParams struct { type CreateAmoAccountParams struct {
@ -796,6 +796,7 @@ type CreateAmoAccountParams struct {
Subdomain string `db:"subdomain" json:"subdomain"` Subdomain string `db:"subdomain" json:"subdomain"`
Amouserid int32 `db:"amouserid" json:"amouserid"` Amouserid int32 `db:"amouserid" json:"amouserid"`
Country string `db:"country" json:"country"` Country string `db:"country" json:"country"`
Driveurl string `db:"driveurl" json:"driveurl"`
} }
// amo methods: // amo methods:
@ -812,6 +813,7 @@ func (q *Queries) CreateAmoAccount(ctx context.Context, arg CreateAmoAccountPara
arg.Subdomain, arg.Subdomain,
arg.Amouserid, arg.Amouserid,
arg.Country, arg.Country,
arg.Driveurl,
) )
return err return err
} }
@ -1492,7 +1494,7 @@ func (q *Queries) GetAllTokens(ctx context.Context) ([]Token, error) {
} }
const getCurrentAccount = `-- name: GetCurrentAccount :one const getCurrentAccount = `-- name: GetCurrentAccount :one
SELECT id, accountid, amoid, name, email, role, "Group", deleted, createdat, subdomain, amouserid, country FROM users WHERE AccountID = $1 AND Deleted = false SELECT id, accountid, amoid, name, email, role, "Group", deleted, createdat, subdomain, amouserid, country, driveurl FROM users WHERE AccountID = $1 AND Deleted = false
` `
func (q *Queries) GetCurrentAccount(ctx context.Context, accountid string) (User, error) { func (q *Queries) GetCurrentAccount(ctx context.Context, accountid string) (User, error) {
@ -1511,6 +1513,7 @@ func (q *Queries) GetCurrentAccount(ctx context.Context, accountid string) (User
&i.Subdomain, &i.Subdomain,
&i.Amouserid, &i.Amouserid,
&i.Country, &i.Country,
&i.Driveurl,
) )
return i, err return i, err
} }
@ -2741,7 +2744,7 @@ const getUsersWithPagination = `-- name: GetUsersWithPagination :many
WITH user_data AS ( WITH user_data AS (
SELECT AmoID FROM users WHERE users.AccountID = $1 AND Deleted = false SELECT AmoID FROM users WHERE users.AccountID = $1 AND Deleted = false
) )
SELECT u.id, u.accountid, u.amoid, u.name, u.email, u.role, u."Group", u.deleted, u.createdat, u.subdomain, u.amouserid, u.country, COUNT(*) OVER() as total_count SELECT u.id, u.accountid, u.amoid, u.name, u.email, u.role, u."Group", u.deleted, u.createdat, u.subdomain, u.amouserid, u.country, u.driveurl, COUNT(*) OVER() as total_count
FROM users u FROM users u
JOIN user_data a ON u.AmoUserID = a.AmoID JOIN user_data a ON u.AmoUserID = a.AmoID
WHERE u.Deleted = false WHERE u.Deleted = false
@ -2767,6 +2770,7 @@ type GetUsersWithPaginationRow struct {
Subdomain string `db:"subdomain" json:"subdomain"` Subdomain string `db:"subdomain" json:"subdomain"`
Amouserid int32 `db:"amouserid" json:"amouserid"` Amouserid int32 `db:"amouserid" json:"amouserid"`
Country string `db:"country" json:"country"` Country string `db:"country" json:"country"`
Driveurl string `db:"driveurl" json:"driveurl"`
TotalCount int64 `db:"total_count" json:"total_count"` TotalCount int64 `db:"total_count" json:"total_count"`
} }
@ -2792,6 +2796,7 @@ func (q *Queries) GetUsersWithPagination(ctx context.Context, arg GetUsersWithPa
&i.Subdomain, &i.Subdomain,
&i.Amouserid, &i.Amouserid,
&i.Country, &i.Country,
&i.Driveurl,
&i.TotalCount, &i.TotalCount,
); err != nil { ); err != nil {
return nil, err return nil, err
@ -2813,7 +2818,7 @@ SELECT a.quiz_id,a.id,a.result,a.question_id,a.content,a.session,
FROM answer a2 FROM answer a2
WHERE a2.start = true AND a2.session = a.session WHERE a2.start = true AND a2.session = a.session
LIMIT 1) AS utm LIMIT 1) AS utm
,t.accesstoken,r.accountid,r.fieldsrule,r.tagstoadd,r.performerid,r.stepid,r.pipelineid,(SELECT u.name FROM users u WHERE u.amoid = r.performerid) AS performer_name,u.subdomain,u.accountid ,t.accesstoken,r.accountid,r.fieldsrule,r.tagstoadd,r.performerid,r.stepid,r.pipelineid,(SELECT u.name FROM users u WHERE u.amoid = r.performerid) AS performer_name,u.subdomain,u.accountid,u.driveurl
FROM answer a FROM answer a
INNER JOIN quiz q ON a.quiz_id = q.id INNER JOIN quiz q ON a.quiz_id = q.id
LEFT JOIN amoCRMStatuses s ON a.id = s.AnswerID LEFT JOIN amoCRMStatuses s ON a.id = s.AnswerID
@ -2846,6 +2851,7 @@ type GettingAmoUsersTrueResultsRow struct {
PerformerName string `db:"performer_name" json:"performer_name"` PerformerName string `db:"performer_name" json:"performer_name"`
Subdomain string `db:"subdomain" json:"subdomain"` Subdomain string `db:"subdomain" json:"subdomain"`
Accountid_2 string `db:"accountid_2" json:"accountid_2"` Accountid_2 string `db:"accountid_2" json:"accountid_2"`
Driveurl string `db:"driveurl" json:"driveurl"`
} }
func (q *Queries) GettingAmoUsersTrueResults(ctx context.Context) ([]GettingAmoUsersTrueResultsRow, error) { func (q *Queries) GettingAmoUsersTrueResults(ctx context.Context) ([]GettingAmoUsersTrueResultsRow, error) {
@ -2875,6 +2881,7 @@ func (q *Queries) GettingAmoUsersTrueResults(ctx context.Context) ([]GettingAmoU
&i.PerformerName, &i.PerformerName,
&i.Subdomain, &i.Subdomain,
&i.Accountid_2, &i.Accountid_2,
&i.Driveurl,
); err != nil { ); err != nil {
return nil, err return nil, err
} }