From 82c0cca8c56b61fcfc7adff10332dcd24bfd0083 Mon Sep 17 00:00:00 2001 From: Pavel Date: Wed, 14 May 2025 15:43:00 +0300 Subject: [PATCH] sqlc gen --- dal/db_query/queries.sql | 4 ++-- dal/sqlcgen/queries.sql.go | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dal/db_query/queries.sql b/dal/db_query/queries.sql index 7538548..4d3d1bf 100644 --- a/dal/db_query/queries.sql +++ b/dal/db_query/queries.sql @@ -1094,11 +1094,11 @@ UPDATE amoContact SET Field = $1,AmoID=$3 WHERE ID = $2; -- name: GetQuestionsAI :many SELECT q.id, q.quiz_id, q.title, q.description, q.questiontype, q.required, q.deleted, q.page, q.content, q.version, q.parent_ids, q.created_at, q.updated_at, q.session,q.auditory FROM question q -WHERE q.quiz_id = $1 AND (q.session = $2 OR q.session = '') AND q.deleted = FALSE AND q.auditory = $3 +WHERE q.quiz_id = $1 AND q.auditory = $2 AND (q.session = $3 OR q.session = '') AND q.deleted = FALSE ORDER BY (q.session != '') ASC, --без сессии первые потом с сессией q.page, --по возрастанию страницы q.created_at --по времени создания - LIMIT $3 OFFSET $4; + LIMIT $4 OFFSET $5; -- name: GetQuestionsAICount :one SELECT COUNT(*) AS count FROM question WHERE quiz_id = $1 AND (session = $2 OR session = '') AND deleted = FALSE; diff --git a/dal/sqlcgen/queries.sql.go b/dal/sqlcgen/queries.sql.go index 8068489..1791b34 100644 --- a/dal/sqlcgen/queries.sql.go +++ b/dal/sqlcgen/queries.sql.go @@ -3062,23 +3062,25 @@ func (q *Queries) GetQuestions(ctx context.Context, quizID int64) ([]GetQuestion const getQuestionsAI = `-- name: GetQuestionsAI :many SELECT q.id, q.quiz_id, q.title, q.description, q.questiontype, q.required, q.deleted, q.page, q.content, q.version, q.parent_ids, q.created_at, q.updated_at, q.session,q.auditory FROM question q -WHERE q.quiz_id = $1 AND (q.session = $2 OR q.session = '') AND q.deleted = FALSE AND q.auditory = $3 +WHERE q.quiz_id = $1 AND q.auditory = $2 AND (q.session = $3 OR q.session = '') AND q.deleted = FALSE ORDER BY (q.session != '') ASC, --без сессии первые потом с сессией q.page, --по возрастанию страницы q.created_at --по времени создания - LIMIT $3 OFFSET $4 + LIMIT $4 OFFSET $5 ` type GetQuestionsAIParams struct { - QuizID int64 `db:"quiz_id" json:"quiz_id"` - Session string `db:"session" json:"session"` - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` + QuizID int64 `db:"quiz_id" json:"quiz_id"` + Auditory int64 `db:"auditory" json:"auditory"` + Session string `db:"session" json:"session"` + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` } func (q *Queries) GetQuestionsAI(ctx context.Context, arg GetQuestionsAIParams) ([]Question, error) { rows, err := q.db.QueryContext(ctx, getQuestionsAI, arg.QuizID, + arg.Auditory, arg.Session, arg.Limit, arg.Offset,