Gleipnir/jet
4
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Add automatic query logger function with additional execution details.

Browse source
This commit is contained in:
go-jet 2022-01-12 19:03:50 +01:00
parent 7377e078cd
commit 4955bfc4b5
18 changed files with 266 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/mysql/main_test.go
View file

@ -8,6 +8,7 @@ import (
"github.com/go-jet/jet/v2/tests/dbconfig"
"github.com/stretchr/testify/require"
"math/rand"
"runtime"
"time"
_ "github.com/go-sql-driver/mysql"
@ -51,11 +52,21 @@ var loggedSQL string
var loggedSQLArgs []interface{}
var loggedDebugSQL string
var queryInfo jetmysql.QueryInfo
var callerFile string
var callerLine int
var callerFunction string
func init() {
jetmysql.SetLogger(func(ctx context.Context, statement jetmysql.PrintableStatement) {
loggedSQL, loggedSQLArgs = statement.Sql()
loggedDebugSQL = statement.DebugSql()
})
jetmysql.SetQueryLoggerFunc(func(ctx context.Context, info jetmysql.QueryInfo) {
queryInfo = info
callerFile, callerLine, callerFunction = info.Caller()
})
}
func requireLogged(t *testing.T, statement postgres.Statement) {
@ -65,6 +76,21 @@ func requireLogged(t *testing.T, statement postgres.Statement) {
require.Equal(t, loggedDebugSQL, statement.DebugSql())
}
func requireQueryLogged(t *testing.T, statement postgres.Statement, rowsProcessed int64) {
query, args := statement.Sql()
queryLogged, argsLogged := queryInfo.Statement.Sql()
require.Equal(t, query, queryLogged)
require.Equal(t, args, argsLogged)
require.Equal(t, queryInfo.RowsProcessed, rowsProcessed)
pc, file, _, _ := runtime.Caller(1)
funcDetails := runtime.FuncForPC(pc)
require.Equal(t, file, callerFile)
require.NotEmpty(t, callerLine)
require.Equal(t, funcDetails.Name(), callerFunction)
}
func skipForMariaDB(t *testing.T) {
if sourceIsMariaDB() {
t.SkipNow()

6
tests/mysql/select_test.go
View file

@ -38,6 +38,7 @@ WHERE actor.actor_id = ?;
testutils.AssertDeepEqual(t, actor, actor2)
requireLogged(t, query)
requireQueryLogged(t, query, 1)
}
var actor2 = model.Actor{
@ -60,9 +61,9 @@ SELECT actor.actor_id AS "actor.actor_id",
FROM dvds.actor
ORDER BY actor.actor_id;
`)
dest := []model.Actor{}
var dest []model.Actor
err := query.Query(db, &dest)
err := query.QueryContext(context.Background(), db, &dest)
require.NoError(t, err)
@ -73,6 +74,7 @@ ORDER BY actor.actor_id;
//testutils.SaveJsonFile(dest, "mysql/testdata/all_actors.json")
testutils.AssertJSONFile(t, dest, "./testdata/results/mysql/all_actors.json")
requireLogged(t, query)
requireQueryLogged(t, query, 200)
}
func TestSelectGroupByHaving(t *testing.T) {