mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-05 22:17:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dev'

Browse source
This commit is contained in:
fox.cpp 2021-08-09 13:01:18 +03:00
commit 61e6e73910
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
112 changed files with 4630 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

35
internal/table/sql_query.go
View file

@ -19,6 +19,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
package table
import (
"context"
"database/sql"
"fmt"
"strings"
@ -137,15 +138,15 @@ func (s *SQL) Close() error {
return s.db.Close()
}
func (s *SQL) Lookup(val string) (string, bool, error) {
func (s *SQL) Lookup(ctx context.Context, val string) (string, bool, error) {
var (
repl string
row *sql.Row
)
if s.namedArgs {
row = s.lookup.QueryRow(sql.Named("key", val))
row = s.lookup.QueryRowContext(ctx, sql.Named("key", val))
} else {
row = s.lookup.QueryRow(val)
row = s.lookup.QueryRowContext(ctx, val)
}
if err := row.Scan(&repl); err != nil {
if err == sql.ErrNoRows {
@ -156,6 +157,33 @@ func (s *SQL) Lookup(val string) (string, bool, error) {
return repl, true, nil
}
func (s *SQL) LookupMulti(ctx context.Context, val string) ([]string, error) {
var (
repl []string
rows *sql.Rows
err error
)
if s.namedArgs {
rows, err = s.lookup.QueryContext(ctx, sql.Named("key", val))
} else {
rows, err = s.lookup.QueryContext(ctx, val)
}
if err != nil {
return nil, fmt.Errorf("%s; lookup %s: %w", s.modName, val, err)
}
for rows.Next() {
var res string
if err := rows.Scan(&res); err != nil {
return nil, fmt.Errorf("%s; lookup %s: %w", s.modName, val, err)
}
repl = append(repl, res)
}
if err := rows.Err(); err != nil {
return nil, fmt.Errorf("%s; lookup %s: %w", s.modName, val, err)
}
return repl, nil
}
func (s *SQL) Keys() ([]string, error) {
if s.list == nil {
return nil, fmt.Errorf("%s: table is not mutable (no 'list' query)", s.modName)
@ -219,6 +247,5 @@ func (s *SQL) SetKey(k, v string) error {
}
func init() {
module.RegisterDeprecated("sql_query", "table.sql_query", NewSQL)
module.Register("table.sql_query", NewSQL)
}