milarin/advsql
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

renamed ExecFunc to EncodeFunc and ScanFunc to DecodeFunc

Browse Source
This commit is contained in:
Timon Ringwald 2022-07-08 22:25:05 +02:00
parent 26975dc3a1
commit b4c0849e29
5 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
db_test.go
View File

@ -15,30 +15,30 @@ type User struct {
Salt string Salt string
} }
func ScanUser(u *User, scan ScanFunc) error { func UserDecoder(u *User, decode DecodeFunc) error {
return scan(&u.Name, &u.Hash, &u.Salt) return decode(&u.Name, &u.Hash, &u.Salt)
} }
func ExecUser(u *User, exec ExecFunc) error { func InsertUserEncoder(u *User, encode EncodeFunc) error {
return exec(u.Name, u.Hash, u.Salt) return encode(u.Name, u.Hash, u.Salt)
} }
func UpdateUser(u *User, exec ExecFunc) error { func UpdateUserByNameEncoder(u *User, encode EncodeFunc) error {
return exec(u.Salt, u.Name) return encode(u.Salt, u.Name)
} }
func TestDB(t *testing.T) { func TestDB(t *testing.T) {
db, err := NewDatabase("192.168.178.2", 3306, "root", "ZAuJsLdPYFSxHdZon7xpMyh5LW7TPhmM", "users") db, err := NewMysqlDatabase("ip", 3306, "username", "password", "database")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer db.Close() defer db.Close()
insertUser := Insert(db, "INSERT INTO users VALUES (?, ?, ?)", ExecUser) insertUser := Insert(db, "INSERT INTO users VALUES (?, ?, ?)", InsertUserEncoder)
updateUser := Insert(db, "UPDATE users SET salt = ? WHERE name = ?", UpdateUser) updateUser := Insert(db, "UPDATE users SET salt = ? WHERE name = ?", UpdateUserByNameEncoder)
getUsers := Query(db, "SELECT * FROM users WHERE name = ?", ScanUser) getUsers := Query(db, "SELECT * FROM users WHERE name = ?", UserDecoder)
pw := sha512.Sum512([]byte("weiter")) pw := sha512.Sum512([]byte("weiter"))
timon := &User{ timon := &User{

4
insert.go
View File

@ -1,13 +1,13 @@
package advsql package advsql
func Insert[T any](db *Database, query string, exec func(v *T, exec ExecFunc) error) InsertFunc[T] { func Insert[T any](db *Database, query string, encoder func(v *T, encode EncodeFunc) error) InsertFunc[T] {
s, err := db.prepare(query) s, err := db.prepare(query)
if err != nil { if err != nil {
return nil return nil
} }
return func(value *T) error { return func(value *T) error {
return exec(value, func(args ...interface{}) error { return encoder(value, func(args ...interface{}) error {
_, err := s.Exec(args...) _, err := s.Exec(args...)
return err return err
}) })

8
query.go
View File

@ -2,7 +2,7 @@ package advsql
import "context" import "context"
func Query[T any](db *Database, query string, scan func(v *T, scan ScanFunc) error) QueryManyFunc[T] { func Query[T any](db *Database, query string, decoder func(v *T, decode DecodeFunc) error) QueryManyFunc[T] {
s, err := db.prepare(query) s, err := db.prepare(query)
if err != nil { if err != nil {
return nil return nil
@ -21,7 +21,7 @@ func Query[T any](db *Database, query string, scan func(v *T, scan ScanFunc) err
defer close(out) defer close(out)
for rows.Next() { for rows.Next() {
v := new(T) v := new(T)
if scan(v, rows.Scan) == nil { if decoder(v, rows.Scan) == nil {
out <- v out <- v
} }
} }
@ -31,7 +31,7 @@ func Query[T any](db *Database, query string, scan func(v *T, scan ScanFunc) err
} }
} }
func QueryContext[T any](db *Database, query string, scan func(v *T, scan ScanFunc) error) QueryManyContextFunc[T] { func QueryContext[T any](db *Database, query string, decoder func(v *T, decode DecodeFunc) error) QueryManyContextFunc[T] {
s, err := db.db.Prepare(query) s, err := db.db.Prepare(query)
if err != nil { if err != nil {
return nil return nil
@ -51,7 +51,7 @@ func QueryContext[T any](db *Database, query string, scan func(v *T, scan ScanFu
defer close(out) defer close(out)
for rows.Next() { for rows.Next() {
v := new(T) v := new(T)
if scan(v, rows.Scan) == nil { if decoder(v, rows.Scan) == nil {
out <- v out <- v
} }
} }

5
scanner.go
View File

@ -1,5 +1,4 @@
package advsql package advsql
type ScanFunc func(args ...interface{}) error type DecodeFunc func(args ...interface{}) error
type EncodeFunc func(args ...interface{}) error
type ExecFunc func(args ...interface{}) error

4
update.go
View File

@ -1,5 +1,5 @@
package advsql package advsql
func Update[T any](db *Database, query string, exec func(v *T, exec ExecFunc) error) InsertFunc[T] { func Update[T any](db *Database, query string, encoder func(v *T, encode EncodeFunc) error) InsertFunc[T] {
return Insert(db, query, exec) return Insert(db, query, encoder)
} }