poignatov/play-life
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dictionary_id type error by removing COALESCE from prepared statement (v2.0.8)
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 34s
Details

Browse Source
This commit is contained in:
poignatov
2026-01-01 19:33:29 +03:00
parent cf4d5d40c3
commit 4df054536a
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
2.0.7 2.0.8

6
play-life-backend/main.go
View File

@@ -903,7 +903,7 @@ func (a *App) addWordsHandler(w http.ResponseWriter, r *http.Request) {
stmt, err := tx.Prepare(` stmt, err := tx.Prepare(`
INSERT INTO words (name, translation, description, dictionary_id, user_id) INSERT INTO words (name, translation, description, dictionary_id, user_id)
VALUES ($1, $2, $3, COALESCE($4, $5), $6) VALUES ($1, $2, $3, $4, $5)
RETURNING id RETURNING id
`) `)
if err != nil { if err != nil {
@@ -917,10 +917,8 @@ func (a *App) addWordsHandler(w http.ResponseWriter, r *http.Request) {
for i, wordReq := range req.Words { for i, wordReq := range req.Words {
var id int var id int
dictionaryID := defaultDictID dictionaryID := defaultDictID
var dictIDParam interface{} = nil
if wordReq.DictionaryID != nil { if wordReq.DictionaryID != nil {
dictionaryID = *wordReq.DictionaryID dictionaryID = *wordReq.DictionaryID
dictIDParam = dictionaryID
// Проверяем, что словарь принадлежит пользователю // Проверяем, что словарь принадлежит пользователю
var dictUserID int var dictUserID int
err := tx.QueryRow(` err := tx.QueryRow(`
@@ -941,7 +939,7 @@ func (a *App) addWordsHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
} }
err := stmt.QueryRow(wordReq.Name, wordReq.Translation, wordReq.Description, dictIDParam, dictionaryID, userID).Scan(&id) err := stmt.QueryRow(wordReq.Name, wordReq.Translation, wordReq.Description, dictionaryID, userID).Scan(&id)
if err != nil { if err != nil {
log.Printf("Error inserting word %d (name='%s', dict_id=%d, user_id=%d): %v", i, wordReq.Name, dictionaryID, userID, err) log.Printf("Error inserting word %d (name='%s', dict_id=%d, user_id=%d): %v", i, wordReq.Name, dictionaryID, userID, err)
sendErrorWithCORS(w, err.Error(), http.StatusInternalServerError) sendErrorWithCORS(w, err.Error(), http.StatusInternalServerError)