go/starter
1
0
Fork 0
mirror of https://github.com/ManyakRus/starter.git synced 2025-11-26 23:10:42 +02:00
Code Issues Releases Activity

сделал defer rows.Close()

Browse Source
This commit is contained in:
Nikitin Aleksandr
2025-04-01 13:57:07 +03:00
parent 8e7bfecfc6
commit 1a763d61c2
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
postgres_pgx/postgres_pgx.go
View File

@@ -401,21 +401,21 @@ func GetConnection_WithApplicationName(ApplicationName string) *pgx.Conn {
// RawMultipleSQL - выполняет текст запроса, отдельно для каждого запроса
func RawMultipleSQL(tx pgx.Tx, TextSQL string) (pgx.Rows, error) {
var Rows pgx.Rows
var rows pgx.Rows
var err error
if tx == nil {
TextError := "RawMultipleSQL() error: tx =nil"
log.Error(TextError)
err = errors.New(TextError)
return Rows, err
return rows, err
}
//if tx.IsClosed() {
// TextError := "RawMultipleSQL() error: tx is closed"
// log.Error(TextError)
// err = errors.New(TextError)
// return Rows, err
// return rows, err
//}
ctx := contextmain.GetContext()
@@ -424,7 +424,7 @@ func RawMultipleSQL(tx pgx.Tx, TextSQL string) (pgx.Rows, error) {
//tx, err := tx.Begin(ctx)
//if err != nil {
// log.Error(err)
// return Rows, err
// return rows, err
//}
//defer tx.Commit()
@@ -442,17 +442,18 @@ func RawMultipleSQL(tx pgx.Tx, TextSQL string) (pgx.Rows, error) {
TextError := fmt.Sprint("tx.Exec() error: ", err, ", TextSQL: \n", TextSQL1)
err = errors.New(TextError)
log.Error(err)
return Rows, err
return rows, err
}
}
//запустим последний запрос, с возвратом результата
Rows, err = tx.Query(ctx, TextSQL2)
rows, err = tx.Query(ctx, TextSQL2)
if err != nil {
TextError := fmt.Sprint("tx.Raw() error: ", err, ", TextSQL: \n", TextSQL2)
err = errors.New(TextError)
return Rows, err
return rows, err
}
defer rows.Close()
return Rows, err
return rows, err
}