Skip to content
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

Jump to bottom

Run tests as subtests with names #268

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Run tests as subtests with names #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6456d1c
Run tests as subtests with names
pablomatiasgomez Jun 24, 2024
cdb9179
Merge branch 'master' of github.com:gocraft/dbr into pablomatiasgomez…
pablomatiasgomez Jul 3, 2024
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
225 changes: 111 additions & 114 deletions dbr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,124 +114,121 @@ func reset(t *testing.T, sess *Session) {

func TestBasicCRUD(t *testing.T) {
for _, sess := range testSession {
reset(t, sess)

jonathan := dbrPerson{
Name: "jonathan",
Email: "[email protected]",
}
insertColumns := []string{"name", "email"}
if sess.Dialect == dialect.PostgreSQL {
jonathan.Id = 1
insertColumns = []string{"id", "name", "email"}
}
if sess.Dialect == dialect.MSSQL {
jonathan.Id = 1
}

// insert
result, err := sess.InsertInto("dbr_people").Columns(insertColumns...).Record(&jonathan).Exec()
require.NoError(t, err)

rowsAffected, err := result.RowsAffected()
require.NoError(t, err)
require.Equal(t, int64(1), rowsAffected)

require.True(t, jonathan.Id > 0)
// select
var people []dbrPerson
count, err := sess.Select("*").From("dbr_people").Where(Eq("id", jonathan.Id)).Load(&people)
require.NoError(t, err)
require.Equal(t, 1, count)
require.Equal(t, jonathan.Id, people[0].Id)
require.Equal(t, jonathan.Name, people[0].Name)
require.Equal(t, jonathan.Email, people[0].Email)

// select id
ids, err := sess.Select("id").From("dbr_people").ReturnInt64s()
require.NoError(t, err)
require.Equal(t, 1, len(ids))

// select id limit
ids, err = sess.Select("id").From("dbr_people").Limit(1).ReturnInt64s()
require.NoError(t, err)
require.Equal(t, 1, len(ids))

// update
result, err = sess.Update("dbr_people").Where(Eq("id", jonathan.Id)).Set("name", "jonathan1").Exec()
require.NoError(t, err)

rowsAffected, err = result.RowsAffected()
require.NoError(t, err)
require.Equal(t, int64(1), rowsAffected)

var n NullInt64
err = sess.Select("count(*)").From("dbr_people").Where("name = ?", "jonathan1").LoadOne(&n)
require.NoError(t, err)
require.Equal(t, int64(1), n.Int64)

// delete
result, err = sess.DeleteFrom("dbr_people").Where(Eq("id", jonathan.Id)).Exec()
require.NoError(t, err)

rowsAffected, err = result.RowsAffected()
require.NoError(t, err)
require.Equal(t, int64(1), rowsAffected)

// select id
ids, err = sess.Select("id").From("dbr_people").ReturnInt64s()
require.NoError(t, err)
require.Equal(t, 0, len(ids))
t.Run(testSessionName(sess), func(t *testing.T) {
reset(t, sess)

jonathan := dbrPerson{
Name: "jonathan",
Email: "[email protected]",
}
insertColumns := []string{"name", "email"}
if sess.Dialect == dialect.PostgreSQL {
jonathan.Id = 1
insertColumns = []string{"id", "name", "email"}
}
if sess.Dialect == dialect.MSSQL {
jonathan.Id = 1
}

// insert
result, err := sess.InsertInto("dbr_people").Columns(insertColumns...).Record(&jonathan).Exec()
require.NoError(t, err)

rowsAffected, err := result.RowsAffected()
require.NoError(t, err)
require.Equal(t, int64(1), rowsAffected)

require.True(t, jonathan.Id > 0)
// select
var people []dbrPerson
count, err := sess.Select("*").From("dbr_people").Where(Eq("id", jonathan.Id)).Load(&people)
require.NoError(t, err)
require.Equal(t, 1, count)
require.Equal(t, jonathan.Id, people[0].Id)
require.Equal(t, jonathan.Name, people[0].Name)
require.Equal(t, jonathan.Email, people[0].Email)

// select id
ids, err := sess.Select("id").From("dbr_people").ReturnInt64s()
require.NoError(t, err)
require.Equal(t, 1, len(ids))

// select id limit
ids, err = sess.Select("id").From("dbr_people").Limit(1).ReturnInt64s()
require.NoError(t, err)
require.Equal(t, 1, len(ids))

// update
result, err = sess.Update("dbr_people").Where(Eq("id", jonathan.Id)).Set("name", "jonathan1").Exec()
require.NoError(t, err)

rowsAffected, err = result.RowsAffected()
require.NoError(t, err)
require.Equal(t, int64(1), rowsAffected)

var n NullInt64
err = sess.Select("count(*)").From("dbr_people").Where("name = ?", "jonathan1").LoadOne(&n)
require.NoError(t, err)
require.Equal(t, int64(1), n.Int64)

// delete
result, err = sess.DeleteFrom("dbr_people").Where(Eq("id", jonathan.Id)).Exec()
require.NoError(t, err)

rowsAffected, err = result.RowsAffected()
require.NoError(t, err)
require.Equal(t, int64(1), rowsAffected)

// select id
ids, err = sess.Select("id").From("dbr_people").ReturnInt64s()
require.NoError(t, err)
require.Equal(t, 0, len(ids))
})
}
}

func TestTimeout(t *testing.T) {
mysqlSession := createSession("mysql", mysqlDSN)
postgresSession := createSession("postgres", postgresDSN)
sqlite3Session := createSession("sqlite3", sqlite3DSN)

// all test sessions should be here
testSession := []*Session{mysqlSession, postgresSession, sqlite3Session}

for _, sess := range testSession {
reset(t, sess)

// session op timeout
sess.Timeout = time.Nanosecond
var people []dbrPerson
_, err := sess.Select("*").From("dbr_people").Load(&people)
require.Equal(t, context.DeadlineExceeded, err)
require.Equal(t, 1, sess.EventReceiver.(*testTraceReceiver).errored)

_, err = sess.InsertInto("dbr_people").Columns("name", "email").Values("test", "[email protected]").Exec()
require.Equal(t, context.DeadlineExceeded, err)
require.Equal(t, 2, sess.EventReceiver.(*testTraceReceiver).errored)

_, err = sess.Update("dbr_people").Set("name", "test1").Exec()
require.Equal(t, context.DeadlineExceeded, err)
require.Equal(t, 3, sess.EventReceiver.(*testTraceReceiver).errored)

_, err = sess.DeleteFrom("dbr_people").Exec()
require.Equal(t, context.DeadlineExceeded, err)
require.Equal(t, 4, sess.EventReceiver.(*testTraceReceiver).errored)

// tx op timeout
sess.Timeout = 0
tx, err := sess.Begin()
require.NoError(t, err)
defer tx.RollbackUnlessCommitted()
tx.Timeout = time.Nanosecond

_, err = tx.Select("*").From("dbr_people").Load(&people)
require.Equal(t, context.DeadlineExceeded, err)

_, err = tx.InsertInto("dbr_people").Columns("name", "email").Values("test", "[email protected]").Exec()
require.Equal(t, context.DeadlineExceeded, err)

_, err = tx.Update("dbr_people").Set("name", "test1").Exec()
require.Equal(t, context.DeadlineExceeded, err)

_, err = tx.DeleteFrom("dbr_people").Exec()
require.Equal(t, context.DeadlineExceeded, err)
t.Run(testSessionName(sess), func(t *testing.T) {
reset(t, sess)

// session op timeout
sess.Timeout = time.Nanosecond
var people []dbrPerson
_, err := sess.Select("*").From("dbr_people").Load(&people)
require.Equal(t, context.DeadlineExceeded, err)
require.Equal(t, 1, sess.EventReceiver.(*testTraceReceiver).errored)

_, err = sess.InsertInto("dbr_people").Columns("name", "email").Values("test", "[email protected]").Exec()
require.Equal(t, context.DeadlineExceeded, err)
require.Equal(t, 2, sess.EventReceiver.(*testTraceReceiver).errored)

_, err = sess.Update("dbr_people").Set("name", "test1").Exec()
require.Equal(t, context.DeadlineExceeded, err)
require.Equal(t, 3, sess.EventReceiver.(*testTraceReceiver).errored)

_, err = sess.DeleteFrom("dbr_people").Exec()
require.Equal(t, context.DeadlineExceeded, err)
require.Equal(t, 4, sess.EventReceiver.(*testTraceReceiver).errored)

// tx op timeout
sess.Timeout = 0
tx, err := sess.Begin()
require.NoError(t, err)
defer tx.RollbackUnlessCommitted()
tx.Timeout = time.Nanosecond

_, err = tx.Select("*").From("dbr_people").Load(&people)
require.Equal(t, context.DeadlineExceeded, err)

_, err = tx.InsertInto("dbr_people").Columns("name", "email").Values("test", "[email protected]").Exec()
require.Equal(t, context.DeadlineExceeded, err)

_, err = tx.Update("dbr_people").Set("name", "test1").Exec()
require.Equal(t, context.DeadlineExceeded, err)

_, err = tx.DeleteFrom("dbr_people").Exec()
require.Equal(t, context.DeadlineExceeded, err)
})
}
}
28 changes: 15 additions & 13 deletions interpolate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,21 +159,23 @@ func TestInterpolateForDialect(t *testing.T) {
// more information on the source and the strings themselves.
func TestCommonSQLInjections(t *testing.T) {
for _, sess := range testSession {
reset(t, sess)
t.Run(testSessionName(sess), func(t *testing.T) {
reset(t, sess)

for _, injectionAttempt := range strings.Split(injectionAttempts, "\n") {
// Create a user with the attempted injection as the email address
_, err := sess.InsertInto("dbr_people").
Pair("name", injectionAttempt).
Exec()
require.NoError(t, err)
for _, injectionAttempt := range strings.Split(injectionAttempts, "\n") {
// Create a user with the attempted injection as the email address
_, err := sess.InsertInto("dbr_people").
Pair("name", injectionAttempt).
Exec()
require.NoError(t, err)

// SELECT the name back and ensure it's equal to the injection attempt
var name string
err = sess.Select("name").From("dbr_people").OrderDesc("id").Limit(1).LoadOne(&name)
require.NoError(t, err)
require.Equal(t, injectionAttempt, name)
}
// SELECT the name back and ensure it's equal to the injection attempt
var name string
err = sess.Select("name").From("dbr_people").OrderDesc("id").Limit(1).LoadOne(&name)
require.NoError(t, err)
require.Equal(t, injectionAttempt, name)
}
})
}
}

Expand Down
Loading