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

Add support for prepared statement caching.

Browse source
This commit is contained in:
go-jet 2024-03-07 18:01:31 +01:00
parent 1b63280b74
commit 0918e5503e
30 changed files with 603 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tests/sqlite/delete_test.go
View file

@ -2,6 +2,7 @@ package sqlite
import (
"context"
"github.com/go-jet/jet/v2/qrm"
"testing"
"time"
@ -60,8 +61,6 @@ LIMIT 1;
}
func TestDeleteContextDeadlineExceeded(t *testing.T) {
tx := beginSampleDBTx(t)
defer tx.Rollback()
deleteStmt := Link.
DELETE().
@ -72,12 +71,16 @@ func TestDeleteContextDeadlineExceeded(t *testing.T) {
time.Sleep(10 * time.Millisecond)
dest := []model.Link{}
err := deleteStmt.QueryContext(ctx, tx, &dest)
require.Error(t, err, "context deadline exceeded")
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx qrm.DB) {
var dest []model.Link
err := deleteStmt.QueryContext(ctx, tx, &dest)
require.Error(t, err, "context deadline exceeded")
})
_, err = deleteStmt.ExecContext(ctx, tx)
require.Error(t, err, "context deadline exceeded")
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx qrm.DB) {
_, err := deleteStmt.ExecContext(ctx, tx)
require.Error(t, err, "context deadline exceeded")
})
requireLogged(t, deleteStmt)
}

28
tests/sqlite/insert_test.go
View file

@ -2,7 +2,7 @@ package sqlite
import (
"context"
"database/sql"
"github.com/go-jet/jet/v2/qrm"
"math/rand"
"testing"
@ -30,7 +30,7 @@ VALUES (?, ?, ?, ?),
101, "http://www.google.com", "Google", "Search engine",
102, "http://www.yahoo.com", "Yahoo", nil)
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx *sql.Tx) {
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx qrm.DB) {
testutils.AssertExec(t, insertQuery, tx)
requireLogged(t, insertQuery)
@ -75,7 +75,7 @@ VALUES (100, 'http://www.postgresqltutorial.com', 'PostgreSQL Tutorial', NULL);
`,
100, "http://www.postgresqltutorial.com", "PostgreSQL Tutorial", nil)
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx *sql.Tx) {
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx qrm.DB) {
_, err := stmt.Exec(tx)
require.NoError(t, err)
requireLogged(t, stmt)
@ -108,7 +108,7 @@ INSERT INTO link (url, name)
VALUES ('http://www.duckduckgo.com', 'Duck Duck go');
`, "http://www.duckduckgo.com", "Duck Duck go")
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx *sql.Tx) {
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx qrm.DB) {
_, err := query.Exec(tx)
require.NoError(t, err)
})
@ -130,7 +130,7 @@ INSERT INTO link
VALUES (1000, 'http://www.duckduckgo.com', 'Duck Duck go', NULL);
`, int32(1000), "http://www.duckduckgo.com", "Duck Duck go", nil)
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx *sql.Tx) {
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx qrm.DB) {
_, err := query.Exec(tx)
require.NoError(t, err)
})
@ -219,7 +219,7 @@ WHERE link.id = 24;
)
testutils.AssertDebugStatementSql(t, query, expectedSQL, int64(24))
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx *sql.Tx) {
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx qrm.DB) {
_, err := query.Exec(tx)
require.NoError(t, err)
@ -248,7 +248,7 @@ RETURNING link.id AS "link.id",
link.description AS "link.description";
`)
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx *sql.Tx) {
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx qrm.DB) {
var link model.Link
err := stmt.Query(tx, &link)
require.NoError(t, err)
@ -353,9 +353,15 @@ func TestInsertContextDeadlineExceeded(t *testing.T) {
time.Sleep(10 * time.Millisecond)
var dest []model.Link
err := stmt.QueryContext(ctx, sampleDB, &dest)
require.Error(t, err, "context deadline exceeded")
_, err = stmt.ExecContext(ctx, db)
require.Error(t, err, "context deadline exceeded")
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx qrm.DB) {
err := stmt.QueryContext(ctx, tx, &dest)
require.Error(t, err, "context deadline exceeded")
})
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx qrm.DB) {
_, err := stmt.ExecContext(ctx, tx)
require.Error(t, err, "context deadline exceeded")
})
}

31
tests/sqlite/main_test.go
View file

@ -22,8 +22,8 @@ import (
_ "github.com/mattn/go-sqlite3"
)
var db *sql.DB
var sampleDB *sql.DB
var db *sqlite.DB
var sampleDB *sqlite.DB
var testRoot string
func TestMain(m *testing.M) {
@ -32,21 +32,30 @@ func TestMain(m *testing.M) {
setTestRoot()
var err error
db, err = sql.Open("sqlite3", "file:"+dbconfig.SakilaDBPath)
sqlDB, err := sql.Open("sqlite3", "file:"+dbconfig.SakilaDBPath)
throw.OnError(err)
db = sqlite.NewDB(sqlDB).WithStatementsCaching(true)
defer db.Close()
_, err = db.Exec(fmt.Sprintf("ATTACH DATABASE '%s' as 'chinook';", dbconfig.ChinookDBPath))
throw.OnError(err)
sampleDB, err = sql.Open("sqlite3", dbconfig.TestSampleDBPath)
sqlSampleDB, err := sql.Open("sqlite3", dbconfig.TestSampleDBPath)
throw.OnError(err)
sampleDB = sqlite.NewDB(sqlSampleDB).WithStatementsCaching(true)
defer sampleDB.Close()
ret := m.Run()
for i := 0; i < 2; i++ {
ret := m.Run()
if ret != 0 {
os.Exit(ret)
}
}
if ret != 0 {
os.Exit(ret)
err = sampleDB.Clear()
if err != nil {
panic(err)
}
}
@ -103,13 +112,13 @@ func requireLogged(t *testing.T, statement sqlite.Statement) {
require.Equal(t, loggedDebugSQL, statement.DebugSql())
}
func beginSampleDBTx(t *testing.T) *sql.Tx {
tx, err := sampleDB.Begin()
func beginSampleDBTx(t *testing.T) *sqlite.Tx {
tx, err := sampleDB.BeginTx(context.Background(), nil)
require.NoError(t, err)
return tx
}
func beginDBTx(t *testing.T) *sql.Tx {
func beginDBTx(t *testing.T) *sqlite.Tx {
tx, err := db.Begin()
require.NoError(t, err)
return tx

4
tests/sqlite/sample_test.go
View file

@ -1,8 +1,8 @@
package sqlite
import (
"database/sql"
"github.com/go-jet/jet/v2/internal/testutils"
"github.com/go-jet/jet/v2/qrm"
"github.com/stretchr/testify/require"
"testing"
@ -48,7 +48,7 @@ WHERE people.people_id = ?;
})
t.Run("should insert without generated columns", func(t *testing.T) {
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx *sql.Tx) {
testutils.ExecuteInTxAndRollback(t, sampleDB, func(tx qrm.DB) {
insertQuery := People.INSERT(
People.MutableColumns,
).MODEL(

16
tests/sqlite/select_test.go
View file

@ -986,14 +986,14 @@ WHERE artists.''ArtistId'' = 11;
}
func TestRowsScan(t *testing.T) {
stmt :=
SELECT(
Inventory.AllColumns,
).FROM(
Inventory,
).ORDER_BY(
Inventory.InventoryID.ASC(),
)
stmt := SELECT(
Inventory.AllColumns,
).FROM(
Inventory,
).ORDER_BY(
Inventory.InventoryID.ASC(),
)
rows, err := stmt.Rows(context.Background(), db)
require.NoError(t, err)

19
tests/sqlite/update_test.go
View file

@ -2,6 +2,7 @@ package sqlite
import (
"context"
"github.com/go-jet/jet/v2/qrm"
model2 "github.com/go-jet/jet/v2/tests/.gentestdata/sqlite/sakila/model"
"github.com/go-jet/jet/v2/tests/.gentestdata/sqlite/sakila/table"
"testing"
@ -215,7 +216,7 @@ WHERE link.id = 20;
testutils.AssertDebugStatementSql(t, stmt, expectedSQL, nil, "DuckDuckGo", "http://www.duckduckgo.com", int32(20))
testutils.AssertExec(t, stmt, tx)
testutils.AssertExec(t, stmt, tx, 1)
requireLogged(t, stmt)
}
@ -271,8 +272,6 @@ func TestUpdateWithInvalidModelData(t *testing.T) {
}
func TestUpdateContextDeadlineExceeded(t *testing.T) {
tx := beginSampleDBTx(t)
defer tx.Rollback()
updateStmt := Link.UPDATE(Link.Name, Link.URL).
SET("Bong", "http://bong.com").
@ -283,12 +282,16 @@ func TestUpdateContextDeadlineExceeded(t *testing.T) {
time.Sleep(10 * time.Millisecond)
dest := []model.Link{}
err := updateStmt.QueryContext(ctx, tx, &dest)
require.Error(t, err, "context deadline exceeded")
testutils.ExecuteInTxAndRollback(t, db, func(tx qrm.DB) {
var dest []model.Link
err := updateStmt.QueryContext(ctx, tx, &dest)
require.Error(t, err, "context deadline exceeded")
})
_, err = updateStmt.ExecContext(ctx, tx)
require.Error(t, err, "context deadline exceeded")
testutils.ExecuteInTxAndRollback(t, db, func(tx qrm.DB) {
_, err := updateStmt.ExecContext(ctx, tx)
require.Error(t, err, "context deadline exceeded")
})
}
func TestUpdateFrom(t *testing.T) {