From d607d55cb4138e4860855f0f2b0b1cba2f3bcbe5 Mon Sep 17 00:00:00 2001 From: Pavel Date: Tue, 4 Jun 2024 18:53:06 +0300 Subject: [PATCH] update sqlc gen --- dal/db_query/queries.sql | 10 ++++++---- dal/sqlcgen/queries.sql.go | 22 ++++++++++++++-------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dal/db_query/queries.sql b/dal/db_query/queries.sql index 6b12a6a..09a0085 100644 --- a/dal/db_query/queries.sql +++ b/dal/db_query/queries.sql @@ -918,15 +918,17 @@ SELECT * FROM tokens WHERE accountID = $1; -- name: GetQuizRule :one SELECT * FROM rules WHERE QuizID = $1 AND Deleted = false; --- name: SetQuizSettings :exec +-- name: SetQuizSettings :one INSERT INTO rules (AccountID, QuizID, PerformerID, PipelineID, StepID, FieldsRule) SELECT u.AmoID AS AccountID,$1 AS QuizID,$2 AS PerformerID,$3 AS PipelineID, - $4 AS StepID,$5 AS FieldsRule FROM users u WHERE u.AccountID = $6 AND u.Deleted = false; + $4 AS StepID,$5 AS FieldsRule FROM users u WHERE u.AccountID = $6 AND u.Deleted = false + RETURNING id; --- name: ChangeQuizSettings :exec +-- name: ChangeQuizSettings :one UPDATE rules SET PerformerID = $1,PipelineID = $2,StepID = $3,FieldsRule = $4 -WHERE AccountID = (SELECT AmoID FROM users WHERE users.AccountID = $5 AND users.Deleted = false) AND QuizID = $6 AND Deleted = false; +WHERE AccountID = (SELECT AmoID FROM users WHERE users.AccountID = $5 AND users.Deleted = false) AND QuizID = $6 AND Deleted = false +RETURNING id; -- name: GetQuestionListByIDs :many SELECT * FROM question WHERE id = ANY($1::int[]) AND deleted = FALSE; diff --git a/dal/sqlcgen/queries.sql.go b/dal/sqlcgen/queries.sql.go index 503569e..ff465d4 100644 --- a/dal/sqlcgen/queries.sql.go +++ b/dal/sqlcgen/queries.sql.go @@ -114,10 +114,11 @@ func (q *Queries) ArchiveQuiz(ctx context.Context, arg ArchiveQuizParams) error return err } -const changeQuizSettings = `-- name: ChangeQuizSettings :exec +const changeQuizSettings = `-- name: ChangeQuizSettings :one UPDATE rules SET PerformerID = $1,PipelineID = $2,StepID = $3,FieldsRule = $4 WHERE AccountID = (SELECT AmoID FROM users WHERE users.AccountID = $5 AND users.Deleted = false) AND QuizID = $6 AND Deleted = false +RETURNING id ` type ChangeQuizSettingsParams struct { @@ -129,8 +130,8 @@ type ChangeQuizSettingsParams struct { Quizid int32 `db:"quizid" json:"quizid"` } -func (q *Queries) ChangeQuizSettings(ctx context.Context, arg ChangeQuizSettingsParams) error { - _, err := q.db.ExecContext(ctx, changeQuizSettings, +func (q *Queries) ChangeQuizSettings(ctx context.Context, arg ChangeQuizSettingsParams) (int64, error) { + row := q.db.QueryRowContext(ctx, changeQuizSettings, arg.Performerid, arg.Pipelineid, arg.Stepid, @@ -138,7 +139,9 @@ func (q *Queries) ChangeQuizSettings(ctx context.Context, arg ChangeQuizSettings arg.Accountid, arg.Quizid, ) - return err + var id int64 + err := row.Scan(&id) + return id, err } const checkAndAddDefault = `-- name: CheckAndAddDefault :exec @@ -3247,10 +3250,11 @@ func (q *Queries) QuizCopyQid(ctx context.Context, arg QuizCopyQidParams) (QuizC return i, err } -const setQuizSettings = `-- name: SetQuizSettings :exec +const setQuizSettings = `-- name: SetQuizSettings :one INSERT INTO rules (AccountID, QuizID, PerformerID, PipelineID, StepID, FieldsRule) SELECT u.AmoID AS AccountID,$1 AS QuizID,$2 AS PerformerID,$3 AS PipelineID, $4 AS StepID,$5 AS FieldsRule FROM users u WHERE u.AccountID = $6 AND u.Deleted = false + RETURNING id ` type SetQuizSettingsParams struct { @@ -3262,8 +3266,8 @@ type SetQuizSettingsParams struct { Accountid string `db:"accountid" json:"accountid"` } -func (q *Queries) SetQuizSettings(ctx context.Context, arg SetQuizSettingsParams) error { - _, err := q.db.ExecContext(ctx, setQuizSettings, +func (q *Queries) SetQuizSettings(ctx context.Context, arg SetQuizSettingsParams) (int64, error) { + row := q.db.QueryRowContext(ctx, setQuizSettings, arg.Quizid, arg.Performerid, arg.Pipelineid, @@ -3271,7 +3275,9 @@ func (q *Queries) SetQuizSettings(ctx context.Context, arg SetQuizSettingsParams arg.Fieldsrule, arg.Accountid, ) - return err + var id int64 + err := row.Scan(&id) + return id, err } const settingDealAmoStatus = `-- name: SettingDealAmoStatus :exec