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

Add support for automatic query logging.

Browse source
This commit is contained in:
go-jet 2020-05-10 11:41:07 +02:00
parent 5d742837f1
commit 0d3ec872d6
22 changed files with 152 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/mysql/alltypes_test.go
View file

@ -80,6 +80,7 @@ func TestUUID(t *testing.T) {
require.True(t, dest.UUID.String() != uuid.UUID{}.String())
require.True(t, dest.StrUUID.String() != uuid.UUID{}.String())
require.Equal(t, dest.StrUUID.String(), dest.BinUUID.String())
requireLogged(t, query)
}
func TestExpressionOperators(t *testing.T) {

2
tests/mysql/cast_test.go
View file

@ -68,4 +68,6 @@ FROM test_sample.all_types;
Unsigned: 15,
Binary: "Some text",
})
requireLogged(t, query)
}

3
tests/mysql/delete_test.go
View file

@ -24,6 +24,7 @@ WHERE link.name IN ('Gmail', 'Outlook');
testutils.AssertDebugStatementSql(t, deleteStmt, expectedSQL, "Gmail", "Outlook")
testutils.AssertExec(t, deleteStmt, db, 2)
requireLogged(t, deleteStmt)
}
func TestDeleteWithWhereOrderByLimit(t *testing.T) {
@ -43,6 +44,7 @@ LIMIT 1;
testutils.AssertDebugStatementSql(t, deleteStmt, expectedSQL, "Gmail", "Outlook", int64(1))
testutils.AssertExec(t, deleteStmt, db, 1)
requireLogged(t, deleteStmt)
}
func TestDeleteQueryContext(t *testing.T) {
@ -61,6 +63,7 @@ func TestDeleteQueryContext(t *testing.T) {
err := deleteStmt.QueryContext(ctx, db, &dest)
require.Error(t, err, "context deadline exceeded")
requireLogged(t, deleteStmt)
}
func TestDeleteExecContext(t *testing.T) {

2
tests/mysql/insert_test.go
View file

@ -34,6 +34,7 @@ VALUES (100, 'http://www.postgresqltutorial.com', 'PostgreSQL Tutorial', DEFAULT
_, err := insertQuery.Exec(db)
require.NoError(t, err)
requireLogged(t, insertQuery)
insertedLinks := []model.Link{}
@ -82,6 +83,7 @@ VALUES (100, 'http://www.postgresqltutorial.com', 'PostgreSQL Tutorial', DEFAULT
_, err := stmt.Exec(db)
require.NoError(t, err)
requireLogged(t, stmt)
insertedLinks := []model.Link{}

3
tests/mysql/lock_test.go
View file

@ -17,6 +17,7 @@ LOCK TABLES dvds.customer READ;
_, err := query.Exec(db)
require.NoError(t, err)
requireLogged(t, query)
}
func TestLockWrite(t *testing.T) {
@ -28,6 +29,7 @@ LOCK TABLES dvds.customer WRITE;
_, err := query.Exec(db)
require.NoError(t, err)
requireLogged(t, query)
}
func TestUnlockTables(t *testing.T) {
@ -39,4 +41,5 @@ UNLOCK TABLES;
_, err := query.Exec(db)
require.NoError(t, err)
requireLogged(t, query)
}

22
tests/mysql/main_test.go
View file

@ -1,9 +1,13 @@
package mysql
import (
"context"
"database/sql"
"flag"
jetmysql "github.com/go-jet/jet/mysql"
"github.com/go-jet/jet/postgres"
"github.com/go-jet/jet/tests/dbconfig"
"github.com/stretchr/testify/require"
"math/rand"
"time"
@ -44,3 +48,21 @@ func TestMain(m *testing.M) {
os.Exit(ret)
}
var loggedSQL string
var loggedSQLArgs []interface{}
var loggedDebugSQL string
func init() {
jetmysql.SetLogger(func(ctx context.Context, statement jetmysql.LoggableStatement) {
loggedSQL, loggedSQLArgs = statement.Sql()
loggedDebugSQL = statement.DebugSql()
})
}
func requireLogged(t *testing.T, statement postgres.Statement) {
query, args := statement.Sql()
require.Equal(t, loggedSQL, query)
require.Equal(t, loggedSQLArgs, args)
require.Equal(t, loggedDebugSQL, statement.DebugSql())
}

3
tests/mysql/select_test.go
View file

@ -33,6 +33,7 @@ WHERE actor.actor_id = ?;
require.NoError(t, err)
testutils.AssertDeepEqual(t, actor, actor2)
requireLogged(t, query)
}
var actor2 = model.Actor{
@ -67,6 +68,7 @@ ORDER BY actor.actor_id;
//testutils.PrintJson(dest)
//testutils.SaveJsonFile(dest, "mysql/testdata/all_actors.json")
testutils.AssertJSONFile(t, dest, "./testdata/results/mysql/all_actors.json")
requireLogged(t, query)
}
func TestSelectGroupByHaving(t *testing.T) {
@ -144,6 +146,7 @@ ORDER BY payment.customer_id, SUM(payment.amount) ASC;
//testutils.SaveJsonFile(dest, "mysql/testdata/customer_payment_sum.json")
testutils.AssertJSONFile(t, dest, "./testdata/results/mysql/customer_payment_sum.json")
requireLogged(t, query)
}
func TestSubQuery(t *testing.T) {

8
tests/mysql/update_test.go
View file

@ -30,6 +30,7 @@ WHERE link.name = 'Bing';
testutils.AssertDebugStatementSql(t, query, expectedSQL, "Bong", "http://bong.com", "Bing")
testutils.AssertExec(t, query, db)
requireLogged(t, query)
})
t.Run("new version", func(t *testing.T) {
@ -42,6 +43,7 @@ WHERE link.name = 'Bing';
testutils.AssertDebugStatementSql(t, stmt, expectedSQL, "Bong", "http://bong.com", "Bing")
testutils.AssertExec(t, stmt, db)
requireLogged(t, stmt)
})
links := []model.Link{}
@ -88,6 +90,7 @@ WHERE link.name = ?;
testutils.AssertStatementSql(t, query, expectedSQL, "Bong", "Youtube", "Bing")
testutils.AssertExec(t, query, db)
requireLogged(t, query)
})
t.Run("new version", func(t *testing.T) {
@ -105,6 +108,7 @@ WHERE link.name = ?;
testutils.AssertStatementSql(t, query, expectedSQL, "Bong", "Youtube", "Bing")
testutils.AssertExec(t, query, db)
requireLogged(t, query)
})
}
@ -130,10 +134,10 @@ SET id = ?,
description = ?
WHERE link.id = ?;
`
fmt.Println(stmt.Sql())
testutils.AssertStatementSql(t, stmt, expectedSQL, int32(201), "http://www.duckduckgo.com", "DuckDuckGo", nil, int64(201))
testutils.AssertExec(t, stmt, db)
requireLogged(t, stmt)
}
func TestUpdateWithModelDataAndPredefinedColumnList(t *testing.T) {
@ -165,10 +169,10 @@ WHERE link.id = 201;
testutils.AssertDebugStatementSql(t, stmt, expectedSQL, nil, "DuckDuckGo", "http://www.duckduckgo.com", int64(201))
testutils.AssertExec(t, stmt, db)
requireLogged(t, stmt)
}
func TestUpdateWithModelDataAndMutableColumns(t *testing.T) {
setupLinkTableForUpdateTest(t)
link := model.Link{

3
tests/postgres/alltypes_test.go
View file

@ -834,6 +834,7 @@ func TestInterval(t *testing.T) {
err := stmt.Query(db, &struct{}{})
require.NoError(t, err)
requireLogged(t, stmt)
}
func TestSubQueryColumnReference(t *testing.T) {
@ -1009,6 +1010,7 @@ FROM`
require.NoError(t, err)
testutils.AssertDeepEqual(t, dest1, dest2)
requireLogged(t, stmt2)
}
}
@ -1062,6 +1064,7 @@ LIMIT $6;
"Timestamp": "2009-11-17T20:34:58.651387Z"
}
`)
requireLogged(t, query)
}
var allTypesRow0 = model.AllTypes{

2
tests/postgres/chinook_db_test.go
View file

@ -35,6 +35,7 @@ ORDER BY "Album"."AlbumId" ASC;
testutils.AssertDeepEqual(t, dest[0], album1)
testutils.AssertDeepEqual(t, dest[1], album2)
testutils.AssertDeepEqual(t, dest[len(dest)-1], album347)
requireLogged(t, stmt)
}
func TestJoinEverything(t *testing.T) {
@ -106,6 +107,7 @@ func TestJoinEverything(t *testing.T) {
require.NoError(t, err)
require.Equal(t, len(dest), 275)
testutils.AssertJSONFile(t, dest, "./testdata/results/postgres/joined_everything.json")
requireLogged(t, stmt)
}
func TestSelfJoin(t *testing.T) {

3
tests/postgres/delete_test.go
View file

@ -53,6 +53,7 @@ RETURNING link.id AS "link.id",
require.Equal(t, len(dest), 2)
testutils.AssertDeepEqual(t, dest[0].Name, "Gmail")
testutils.AssertDeepEqual(t, dest[1].Name, "Outlook")
requireLogged(t, deleteStmt)
}
func initForDeleteTest(t *testing.T) {
@ -80,6 +81,7 @@ func TestDeleteQueryContext(t *testing.T) {
err := deleteStmt.QueryContext(ctx, db, &dest)
require.Error(t, err, "context deadline exceeded")
requireLogged(t, deleteStmt)
}
func TestDeleteExecContext(t *testing.T) {
@ -99,4 +101,5 @@ func TestDeleteExecContext(t *testing.T) {
_, err := deleteStmt.ExecContext(ctx, db)
require.Error(t, err, "context deadline exceeded")
requireLogged(t, deleteStmt)
}

3
tests/postgres/insert_test.go
View file

@ -89,6 +89,7 @@ VALUES (100, 'http://www.postgresqltutorial.com', 'PostgreSQL Tutorial', DEFAULT
100, "http://www.postgresqltutorial.com", "PostgreSQL Tutorial")
AssertExec(t, stmt, 1)
requireLogged(t, stmt)
}
func TestInsertOnConflict(t *testing.T) {
@ -108,6 +109,7 @@ VALUES ($1, $2, $3, $4, $5),
ON CONFLICT (employee_id) DO NOTHING;
`)
AssertExec(t, stmt, 1)
requireLogged(t, stmt)
})
t.Run("on constraint do nothing", func(t *testing.T) {
@ -125,6 +127,7 @@ VALUES ($1, $2, $3, $4, $5),
ON CONFLICT ON CONSTRAINT employee_pkey DO NOTHING;
`)
AssertExec(t, stmt, 1)
requireLogged(t, stmt)
})
t.Run("do update", func(t *testing.T) {

2
tests/postgres/lock_test.go
View file

@ -40,6 +40,7 @@ LOCK TABLE dvds.address IN`
err = tx.Rollback()
require.NoError(t, err)
requireLogged(t, query)
}
for _, lockMode := range testData {
@ -56,6 +57,7 @@ LOCK TABLE dvds.address IN`
err = tx.Rollback()
require.NoError(t, err)
requireLogged(t, query)
}
}

21
tests/postgres/main_test.go
View file

@ -1,10 +1,13 @@
package postgres
import (
"context"
"database/sql"
"github.com/go-jet/jet/postgres"
"github.com/go-jet/jet/tests/dbconfig"
_ "github.com/lib/pq"
"github.com/pkg/profile"
"github.com/stretchr/testify/require"
"math/rand"
"os"
"os/exec"
@ -43,3 +46,21 @@ func setTestRoot() {
testRoot = strings.TrimSpace(string(byteArr)) + "/tests/"
}
var loggedSQL string
var loggedSQLArgs []interface{}
var loggedDebugSQL string
func init() {
postgres.SetLogger(func(ctx context.Context, statement postgres.LoggableStatement) {
loggedSQL, loggedSQLArgs = statement.Sql()
loggedDebugSQL = statement.DebugSql()
})
}
func requireLogged(t *testing.T, statement postgres.Statement) {
query, args := statement.Sql()
require.Equal(t, loggedSQL, query)
require.Equal(t, loggedSQLArgs, args)
require.Equal(t, loggedDebugSQL, statement.DebugSql())
}

1
tests/postgres/northwind_test.go
View file

@ -63,4 +63,5 @@ func TestNorthwindJoinEverything(t *testing.T) {
//jsonSave("./testdata/northwind-all.json", dest)
testutils.AssertJSONFile(t, dest, "./testdata/results/postgres/northwind-all.json")
requireLogged(t, stmt)
}

3
tests/postgres/sample_test.go
View file

@ -28,6 +28,7 @@ WHERE all_types.uuid = 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11';
require.NoError(t, err)
require.Equal(t, result.UUID, uuid.MustParse("a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11"))
testutils.AssertDeepEqual(t, result.UUIDPtr, testutils.UUIDPtr("a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11"))
requireLogged(t, query)
}
func TestUUIDComplex(t *testing.T) {
@ -118,6 +119,7 @@ func TestUUIDComplex(t *testing.T) {
]
}
`)
requireLogged(t, query)
})
t.Run("slice of structs left join", func(t *testing.T) {
@ -175,6 +177,7 @@ func TestUUIDComplex(t *testing.T) {
}
]
`)
requireLogged(t, leftQuery)
})
}

6
tests/postgres/select_test.go
View file

@ -43,6 +43,8 @@ WHERE actor.actor_id = 2;
}
testutils.AssertDeepEqual(t, actor, expectedActor)
requireLogged(t, query)
}
func TestClassicSelect(t *testing.T) {
@ -86,6 +88,8 @@ LIMIT 30;
require.NoError(t, err)
require.Equal(t, len(dest), 30)
requireLogged(t, query)
}
func TestSelect_ScanToSlice(t *testing.T) {
@ -117,6 +121,8 @@ ORDER BY customer.customer_id ASC;
testutils.AssertDeepEqual(t, customer0, customers[0])
testutils.AssertDeepEqual(t, customer1, customers[1])
testutils.AssertDeepEqual(t, lastCustomer, customers[598])
requireLogged(t, query)
}
func TestSelectAndUnionInProjection(t *testing.T) {

15
tests/postgres/update_test.go
View file

@ -27,13 +27,15 @@ WHERE link.name = 'Bing';
`, "Bong", "http://bong.com", "Bing")
testutils.AssertExec(t, query, db, 1)
requireLogged(t, query)
links := []model.Link{}
err := Link.
selQuery := Link.
SELECT(Link.AllColumns).
WHERE(Link.Name.IN(String("Bong"))).
Query(db, &links)
WHERE(Link.Name.IN(String("Bong")))
err := selQuery.Query(db, &links)
require.NoError(t, err)
require.Equal(t, len(links), 1)
@ -42,6 +44,7 @@ WHERE link.name = 'Bing';
URL: "http://bong.com",
Name: "Bong",
})
requireLogged(t, selQuery)
})
t.Run("new version", func(t *testing.T) {
@ -59,6 +62,7 @@ SET name = 'DuckDuckGo',
WHERE link.name = 'Yahoo';
`)
testutils.AssertExec(t, stmt, db, 1)
requireLogged(t, stmt)
})
}
@ -90,6 +94,7 @@ WHERE link.name = 'Bing';
testutils.AssertDebugStatementSql(t, query, expectedSQL, "Bong", "Bing", "Bing")
AssertExec(t, query, 1)
requireLogged(t, query)
})
t.Run("new version", func(t *testing.T) {
@ -114,6 +119,9 @@ SET name = $1,
)
WHERE link.name = $3;
`, "Bong", "Bing", "Bing")
_, err := query.Exec(db)
require.NoError(t, err)
requireLogged(t, query)
})
}
@ -146,6 +154,7 @@ RETURNING link.id AS "link.id",
require.Equal(t, len(links), 2)
require.Equal(t, links[0].Name, "DuckDuckGo")
require.Equal(t, links[1].Name, "DuckDuckGo")
requireLogged(t, stmt)
}
func TestUpdateWithSelect(t *testing.T) {