Skip to content

feat: change interface#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenquan merged 1 commit into from
Sep 19, 2022
Merged

feat: change interface #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions conn.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,18 @@ type conn struct {
ConnHook
}

func (c *conn) Close() (err error) {
ctx, err := c.BeforeClose(context.Background(), nil)
defer func() {
_, err = c.AfterClose(ctx, err)
}()
if err != nil {
return err
}

return c.Conn.Close()
}

func (c *conn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (result driver.Result, err error) {
ctx, query, args, err = c.BeforeExecContext(ctx, query, args, nil)
defer func() {
Expand Down
7 changes: 7 additions & 0 deletions conn_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,14 @@ func Test_conn_QueryContext(t *testing.T) {
assert.Contains(t, s, "BeforeQueryContext")
assert.Contains(t, s, "AfterQueryContext")
})
}

func TestMultiHook_Close(t *testing.T) {
c, m := createMockConn()
err := c.Close()
assert.NoError(t, err)
assert.Contains(t, m.String(), "AfterClose")
assert.Contains(t, m.String(), "BeforeClose")
}

func Test_namedValueToValue(t *testing.T) {
Expand Down
2 changes: 2 additions & 0 deletions hook.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ type (

BeforePrepareContext(ctx context.Context, query string, err error) (context.Context, string, error)
AfterPrepareContext(ctx context.Context, query string, ds driver.Stmt, err error) (context.Context, driver.Stmt, error)
BeforeClose(ctx context.Context, err error) (context.Context, error)
AfterClose(ctx context.Context, err error) (context.Context, error)
}
ConnectorHook interface {
BeforeConnect(ctx context.Context, err error) (context.Context, error)
Expand Down
10 changes: 10 additions & 0 deletions hook_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,16 @@ type mockHook struct {
Args []string
}

func (m *mockHook) BeforeClose(ctx context.Context, err error) (context.Context, error) {
m.Write("BeforeClose")
return ctx, err
}

func (m *mockHook) AfterClose(ctx context.Context, err error) (context.Context, error) {
m.Write("AfterClose")
return ctx, err
}

func (m *mockHook) BeforeConnect(ctx context.Context, err error) (context.Context, error) {
m.Write("BeforeConnect")
return ctx, err
Expand Down
16 changes: 16 additions & 0 deletions multi_hook.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,22 @@ func (h *multiHook) AfterPrepareContext(ctx context.Context, query string, s dri
return ctx, s, err
}

func (h *multiHook) BeforeClose(ctx context.Context, err error) (context.Context, error) {
for _, hook := range h.hooks {
ctx, err = hook.BeforeClose(ctx, err)
}

return ctx, err
}

func (h *multiHook) AfterClose(ctx context.Context, err error) (context.Context, error) {
for i := len(h.hooks) - 1; i >= 0; i-- {
ctx, err = h.hooks[i].AfterClose(ctx, err)
}

return ctx, err
}

func (h *multiHook) BeforeCommit(ctx context.Context, err error) (context.Context, error) {
for _, hook := range h.hooks {
ctx, err = hook.BeforeCommit(ctx, err)
Expand Down