mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
<!-- CURSOR_AGENT_PR_BODY_BEGIN -->
# Which Problems Are Solved
Handler/v2 projections (`users14` and every other event projection) can
overlook committed events under load:
- `eventstore.commands_to_events` stamped `position` with `NOW()`
(transaction start). A slow create TX could commit after a faster TX
that started later, so the projector stored a later position and never
saw the earlier one.
- Resume used `OFFSET` on a **filtered** row count. That could skip
`in_tx_order = 1` at the next position (for example `user.human.added`).
- Two transactions in the same microsecond both start at `in_tx_order =
1`. A cursor of `in_tx_order > last` alone would drop the other TX’s
first event.
This does not repair rows that are already missing from projections.
# How the Problems Are Solved
- Setup step 77 replaces `eventstore.commands_to_events` so `created_at
= statement_timestamp()` and `position = EXTRACT(EPOCH FROM
clock_timestamp())` at INSERT time. Initialise `08_events_table.sql`
matches that for new databases. The function is `VOLATILE` to match
`clock_timestamp()`.
- The projector still drains in-flight writers with `pg_advisory_lock` /
`pg_advisory_unlock` in one statement, then caps with `position <=
EXTRACT(EPOCH FROM now())` (projector TX start). The exclusive lock is
**not** held across the event `SELECT`. The cap must stay `now()`, not
`clock_timestamp()`, or later inserts become a high-water mark.
- Resume is a lexicographic `EventSortKey` on `(position, in_tx_order,
instance_id, aggregate_type, aggregate_id, sequence)` via
`AfterEventSortKey`. SQL `OFFSET` is no longer used for projection
catch-up.
- Handler and FieldHandler persist the last event’s `in_tx_order` in
`current_states.filter_offset` (existing column, new meaning). Step 77
backfills matching rows from `events2`; unmatched rows keep their
previous value.
# Additional Changes
- `eventstore.Event` exposes `InTxOrder() uint32` (BaseEvent, repository
Event, v3 event, v1 models).
- v3 push SELECT/RETURNING now includes `in_tx_order` so newly written
events carry a real ordinal.
- `WithMinPosition` stays an inclusive `PositionAtLeast` floor and does
not smash the sort-key cursor.
- `SearchQuery.PositionAfter(decimal)` is unchanged (used by
access-token lookup). Do not confuse it with
`SearchQueryBuilder.AfterEventSortKey`.
- `commands_to_events` in setup 77 and initialise 08 is `VOLATILE
PARALLEL SAFE`. Shipped 40/64/70 stay `STABLE` because they still stamp
with `NOW()`.
- Drop unused `last_owner TEXT` DECLARE from setup 77 and initialise
`08_events_table.sql` (`i INTEGER` remains for the enforce-owner loop).
Shipped 40/64/70 keep the leftover.
- This PR’s migration is numbered 77 because `main` already has setup 76
(`76_users14_login_equality_indexes`). First-loop order is s70, then
main’s 76, then this 77.
# Additional Context
**Reviewer map**
| Start here | Why |
| --- | --- |
| `cmd/setup/77.sql` + `cmd/setup/77.go` | Position stamp + atomic
function replace/backfill after shipped `s70` and main’s s76 |
| `internal/eventstore/event_sort_key.go` + `search_query.go` |
Canonical cursor and `AfterEventSortKey` |
| `internal/eventstore/handler/v2/{state.go,handler.go}` |
Persist/resume cursor; `eventQuery` |
| `internal/eventstore/repository/sql/{query.go,postgres.go}` | Tuple
`>` filter, 6-column `ORDER BY`, await cap |
| `internal/eventstore/v3/push.go` / `push.sql` | Scan `in_tx_order` on
write |
Mechanical / low-risk: handler and query test fixtures, Event interface
stubs (`event_base.go`, repository Event, mocks, v1 models).
**Do not look for** a `70.sql` change — shipped migrations stay as on
`main`. Setup 40/64 still use `NOW()`; step 77 overwrites the function
afterward. Fresh `FirstInstance` (runs before `s70`) can still stamp
`NOW()` until 77; runtime pushes after 77 use `clock_timestamp()`.
Main’s `cmd/setup/76.go` is the users14 login-equality indexes, not this
stamp.
**Rollout**
1. Run setup so 77 replaces `commands_to_events` and backfills
`filter_offset`.
2. Restart ZITADEL so projectors load the new resume path.
3. Existing missing `users14` rows are not repaired by this PR.
**Tests**
- `go test ./internal/eventstore/... ./cmd/setup/`
- Sort-key SQL fixtures in `query_sort_key_test.go` (no `OFFSET`;
aggregate-id queries keep 6-column `ORDER BY`)
- `cmd/setup/77_test.go` asserts the embed has no unused `last_owner`
and still uses `clock_timestamp()` / `VOLATILE PARALLEL SAFE`
Related: #8509, #10480 (remove OFFSET), #10560 (advisory locks), #10710
(stable ORDER BY).
Out of scope: repairing already-missing projection rows, holding the
exclusive lock during SELECT, rewriting historical setup 40/64 SQL.
<!-- CURSOR_AGENT_PR_BODY_END -->
<div><a
href="https://cursor.com/agents/bc-3da6eb51-11d4-4a8a-8ba0-e190f116df05?cursor_ref=pr_footer&cursor_cta=open_in_web"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://cursor.com/assets/images/open-in-web-dark.png"><source
media="(prefers-color-scheme: light)"
srcset="https://cursor.com/assets/images/open-in-web-light.png"><img
alt="Open in Web" width="114" height="28"
src="https://cursor.com/assets/images/open-in-web-dark.png"></picture></a> <a
href="https://cursor.com/background-agent?bcId=bc-3da6eb51-11d4-4a8a-8ba0-e190f116df05&cursor_ref=pr_footer&cursor_cta=open_in_cursor"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://cursor.com/assets/images/open-in-cursor-dark.png"><source
media="(prefers-color-scheme: light)"
srcset="https://cursor.com/assets/images/open-in-cursor-light.png"><img
alt="Open in Cursor" width="131" height="28"
src="https://cursor.com/assets/images/open-in-cursor-dark.png"></picture></a> </div>
---------
Co-authored-by: Cursor Agent <[email protected]>
Co-authored-by: Silvan <[email protected]>
1021 lines
32 KiB
Go
1021 lines
32 KiB
Go
package sql
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"database/sql/driver"
|
|
"reflect"
|
|
"regexp"
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/DATA-DOG/go-sqlmock"
|
|
"github.com/shopspring/decimal"
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
new_sql "github.com/zitadel/zitadel/backend/v3/storage/database/dialect/sql"
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
db_mock "github.com/zitadel/zitadel/internal/database/mock"
|
|
"github.com/zitadel/zitadel/internal/database/postgres"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/eventstore/repository"
|
|
new_es "github.com/zitadel/zitadel/internal/eventstore/v3"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
func Test_getCondition(t *testing.T) {
|
|
type args struct {
|
|
filter *repository.Filter
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want string
|
|
}{
|
|
{
|
|
name: "equals",
|
|
args: args{filter: repository.NewFilter(repository.FieldAggregateID, "", repository.OperationEquals)},
|
|
want: "aggregate_id = ?",
|
|
},
|
|
{
|
|
name: "greater",
|
|
args: args{filter: repository.NewFilter(repository.FieldSequence, 0, repository.OperationGreater)},
|
|
want: `"sequence" > ?`,
|
|
},
|
|
{
|
|
name: "less",
|
|
args: args{filter: repository.NewFilter(repository.FieldSequence, 5000, repository.OperationLess)},
|
|
want: `"sequence" < ?`,
|
|
},
|
|
{
|
|
name: "in list",
|
|
args: args{filter: repository.NewFilter(repository.FieldAggregateType, []eventstore.AggregateType{"movies", "actors"}, repository.OperationIn)},
|
|
want: "aggregate_type = ANY(?)",
|
|
},
|
|
{
|
|
name: "invalid operation",
|
|
args: args{filter: repository.NewFilter(repository.FieldAggregateType, []eventstore.AggregateType{"movies", "actors"}, repository.Operation(-1))},
|
|
want: "",
|
|
},
|
|
{
|
|
name: "invalid field",
|
|
args: args{filter: repository.NewFilter(repository.Field(-1), []eventstore.AggregateType{"movies", "actors"}, repository.OperationEquals)},
|
|
want: "",
|
|
},
|
|
{
|
|
name: "invalid field and operation",
|
|
args: args{filter: repository.NewFilter(repository.Field(-1), []eventstore.AggregateType{"movies", "actors"}, repository.Operation(-1))},
|
|
want: "",
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
db := &Postgres{}
|
|
if got := getCondition(db, tt.args.filter, false); got != tt.want {
|
|
t.Errorf("getCondition() = %v, want %v", got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_prepareColumns(t *testing.T) {
|
|
var reducedEvents []eventstore.Event
|
|
|
|
type fields struct {
|
|
dbRow []interface{}
|
|
}
|
|
type args struct {
|
|
columns eventstore.Columns
|
|
dest interface{}
|
|
dbErr error
|
|
useV1 bool
|
|
}
|
|
type res struct {
|
|
query string
|
|
expected interface{}
|
|
dbErr func(error) bool
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
res res
|
|
fields fields
|
|
}{
|
|
{
|
|
name: "invalid columns",
|
|
args: args{columns: eventstore.Columns(-1)},
|
|
res: res{
|
|
query: "",
|
|
dbErr: func(err error) bool { return err == nil },
|
|
},
|
|
},
|
|
{
|
|
name: "max column",
|
|
args: args{
|
|
columns: eventstore.ColumnsMaxPosition,
|
|
dest: new(decimal.Decimal),
|
|
useV1: true,
|
|
},
|
|
res: res{
|
|
query: `SELECT event_sequence FROM eventstore.events`,
|
|
expected: decimal.NewFromInt(42),
|
|
},
|
|
fields: fields{
|
|
dbRow: []interface{}{decimal.NewNullDecimal(decimal.NewFromInt(42))},
|
|
},
|
|
},
|
|
{
|
|
name: "max column v2",
|
|
args: args{
|
|
columns: eventstore.ColumnsMaxPosition,
|
|
dest: new(decimal.Decimal),
|
|
},
|
|
res: res{
|
|
query: `SELECT "position" FROM eventstore.events2`,
|
|
expected: decimal.NewFromInt(42),
|
|
},
|
|
fields: fields{
|
|
dbRow: []interface{}{decimal.NewNullDecimal(decimal.NewFromInt(42))},
|
|
},
|
|
},
|
|
{
|
|
name: "max sequence wrong dest type",
|
|
args: args{
|
|
columns: eventstore.ColumnsMaxPosition,
|
|
dest: new(uint64),
|
|
},
|
|
res: res{
|
|
query: `SELECT "position" FROM eventstore.events2`,
|
|
dbErr: zerrors.IsErrorInvalidArgument,
|
|
},
|
|
},
|
|
{
|
|
name: "events",
|
|
args: args{
|
|
columns: eventstore.ColumnsEvent,
|
|
dest: eventstore.Reducer(func(event eventstore.Event) error {
|
|
reducedEvents = append(reducedEvents, event)
|
|
return nil
|
|
}),
|
|
useV1: true,
|
|
},
|
|
res: res{
|
|
query: `SELECT creation_date, event_type, event_sequence, event_data, editor_user, resource_owner, instance_id, aggregate_type, aggregate_id, aggregate_version FROM eventstore.events`,
|
|
expected: []eventstore.Event{
|
|
&repository.Event{AggregateID: "hodor", AggregateType: "user", Seq: 5, Data: nil},
|
|
},
|
|
},
|
|
fields: fields{
|
|
dbRow: []interface{}{time.Time{}, eventstore.EventType(""), uint64(5), sql.RawBytes(nil), "", sql.NullString{}, "", eventstore.AggregateType("user"), "hodor", eventstore.Version("")},
|
|
},
|
|
},
|
|
{
|
|
name: "events v2",
|
|
args: args{
|
|
columns: eventstore.ColumnsEvent,
|
|
dest: eventstore.Reducer(func(event eventstore.Event) error {
|
|
reducedEvents = append(reducedEvents, event)
|
|
return nil
|
|
}),
|
|
},
|
|
res: res{
|
|
query: `SELECT created_at, event_type, "sequence", "position", payload, creator, "owner", instance_id, aggregate_type, aggregate_id, revision, in_tx_order FROM eventstore.events2`,
|
|
expected: []eventstore.Event{
|
|
&repository.Event{AggregateID: "hodor", AggregateType: "user", Seq: 5, Pos: decimal.NewFromInt(42), Data: nil, Version: "v1", InTx: 3},
|
|
},
|
|
},
|
|
fields: fields{
|
|
dbRow: []interface{}{time.Time{}, eventstore.EventType(""), uint64(5), decimal.NewNullDecimal(decimal.NewFromInt(42)), sql.RawBytes(nil), "", sql.NullString{}, "", eventstore.AggregateType("user"), "hodor", uint8(1), uint32(3)},
|
|
},
|
|
},
|
|
{
|
|
name: "event null position",
|
|
args: args{
|
|
columns: eventstore.ColumnsEvent,
|
|
dest: eventstore.Reducer(func(event eventstore.Event) error {
|
|
reducedEvents = append(reducedEvents, event)
|
|
return nil
|
|
}),
|
|
},
|
|
res: res{
|
|
query: `SELECT created_at, event_type, "sequence", "position", payload, creator, "owner", instance_id, aggregate_type, aggregate_id, revision, in_tx_order FROM eventstore.events2`,
|
|
expected: []eventstore.Event{
|
|
&repository.Event{AggregateID: "hodor", AggregateType: "user", Seq: 5, Pos: decimal.Decimal{}, Data: nil, Version: "v1"},
|
|
},
|
|
},
|
|
fields: fields{
|
|
dbRow: []interface{}{time.Time{}, eventstore.EventType(""), uint64(5), decimal.NullDecimal{}, sql.RawBytes(nil), "", sql.NullString{}, "", eventstore.AggregateType("user"), "hodor", uint8(1), uint32(0)},
|
|
},
|
|
},
|
|
{
|
|
name: "events wrong dest type",
|
|
args: args{
|
|
columns: eventstore.ColumnsEvent,
|
|
dest: []*repository.Event{},
|
|
useV1: true,
|
|
},
|
|
res: res{
|
|
query: `SELECT creation_date, event_type, event_sequence, event_data, editor_user, resource_owner, instance_id, aggregate_type, aggregate_id, aggregate_version FROM eventstore.events`,
|
|
dbErr: zerrors.IsErrorInvalidArgument,
|
|
},
|
|
},
|
|
{
|
|
name: "event query error",
|
|
args: args{
|
|
columns: eventstore.ColumnsEvent,
|
|
dest: eventstore.Reducer(func(event eventstore.Event) error {
|
|
reducedEvents = append(reducedEvents, event)
|
|
return nil
|
|
}),
|
|
dbErr: sql.ErrConnDone,
|
|
useV1: true,
|
|
},
|
|
res: res{
|
|
query: `SELECT creation_date, event_type, event_sequence, event_data, editor_user, resource_owner, instance_id, aggregate_type, aggregate_id, aggregate_version FROM eventstore.events`,
|
|
dbErr: zerrors.IsInternal,
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
query, rowScanner := prepareColumns(new(Postgres), tt.args.columns, tt.args.useV1)
|
|
if query != tt.res.query {
|
|
t.Errorf("prepareColumns() got = %s, want %s", query, tt.res.query)
|
|
}
|
|
if tt.res.query == "" && rowScanner != nil {
|
|
t.Errorf("row scanner should be nil")
|
|
}
|
|
if rowScanner == nil {
|
|
return
|
|
}
|
|
err := rowScanner(prepareTestScan(tt.args.dbErr, tt.fields.dbRow), tt.args.dest)
|
|
if err != nil && tt.res.dbErr == nil || err != nil && !tt.res.dbErr(err) || err == nil && tt.res.dbErr != nil {
|
|
t.Errorf("wrong error type in rowScanner got: %v", err)
|
|
return
|
|
}
|
|
if tt.res.dbErr != nil && tt.res.dbErr(err) {
|
|
return
|
|
}
|
|
if equalizer, ok := tt.res.expected.(interface{ Equal(time.Time) bool }); ok {
|
|
equalizer.Equal(tt.args.dest.(*sql.NullTime).Time)
|
|
return
|
|
}
|
|
if _, ok := tt.args.dest.(eventstore.Reducer); ok {
|
|
assert.Equal(t, tt.res.expected, reducedEvents)
|
|
reducedEvents = nil
|
|
return
|
|
}
|
|
|
|
got := reflect.Indirect(reflect.ValueOf(tt.args.dest)).Interface()
|
|
if !reflect.DeepEqual(got, tt.res.expected) {
|
|
t.Errorf("unexpected result from rowScanner nwant: %+v ngot: %+v", tt.res.expected, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func prepareTestScan(err error, res []interface{}) scan {
|
|
return func(dests ...interface{}) error {
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if len(dests) != len(res) {
|
|
return zerrors.ThrowInvalidArgumentf(nil, "SQL-NML1q", "expected len %d got %d", len(res), len(dests))
|
|
}
|
|
for i, r := range res {
|
|
_, ok := dests[i].(*eventstore.Version)
|
|
if ok {
|
|
val, ok := r.(uint8)
|
|
if ok {
|
|
r = eventstore.Version("" + strconv.Itoa(int(val)))
|
|
}
|
|
}
|
|
reflect.ValueOf(dests[i]).Elem().Set(reflect.ValueOf(r))
|
|
}
|
|
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func Test_prepareCondition(t *testing.T) {
|
|
type args struct {
|
|
query *repository.SearchQuery
|
|
useV1 bool
|
|
}
|
|
type res struct {
|
|
clause string
|
|
values []interface{}
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
res res
|
|
}{
|
|
{
|
|
name: "nil filters",
|
|
args: args{
|
|
query: &repository.SearchQuery{},
|
|
useV1: true,
|
|
},
|
|
res: res{
|
|
clause: "",
|
|
values: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "nil filters v2",
|
|
args: args{
|
|
query: &repository.SearchQuery{},
|
|
},
|
|
res: res{
|
|
clause: "",
|
|
values: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "empty filters",
|
|
args: args{
|
|
query: &repository.SearchQuery{
|
|
SubQueries: [][]*repository.Filter{},
|
|
},
|
|
useV1: true,
|
|
},
|
|
res: res{
|
|
clause: "",
|
|
values: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "empty filters v2",
|
|
args: args{
|
|
query: &repository.SearchQuery{
|
|
SubQueries: [][]*repository.Filter{},
|
|
},
|
|
},
|
|
res: res{
|
|
clause: "",
|
|
values: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "invalid condition",
|
|
args: args{
|
|
query: &repository.SearchQuery{
|
|
SubQueries: [][]*repository.Filter{
|
|
{
|
|
repository.NewFilter(repository.FieldAggregateID, "wrong", repository.Operation(-1)),
|
|
},
|
|
},
|
|
},
|
|
useV1: true,
|
|
},
|
|
res: res{
|
|
clause: "",
|
|
values: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "invalid condition v2",
|
|
args: args{
|
|
query: &repository.SearchQuery{
|
|
SubQueries: [][]*repository.Filter{
|
|
{
|
|
repository.NewFilter(repository.FieldAggregateID, "wrong", repository.Operation(-1)),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
res: res{
|
|
clause: "",
|
|
values: nil,
|
|
},
|
|
},
|
|
{
|
|
name: "array as condition value",
|
|
args: args{
|
|
query: &repository.SearchQuery{
|
|
AwaitOpenTransactions: true,
|
|
SubQueries: [][]*repository.Filter{
|
|
{
|
|
repository.NewFilter(repository.FieldAggregateType, []eventstore.AggregateType{"user", "org"}, repository.OperationIn),
|
|
},
|
|
},
|
|
},
|
|
useV1: true,
|
|
},
|
|
res: res{
|
|
clause: " WHERE aggregate_type = ANY(?)",
|
|
values: []interface{}{[]eventstore.AggregateType{"user", "org"}},
|
|
},
|
|
},
|
|
{
|
|
name: "array as condition value v2",
|
|
args: args{
|
|
query: &repository.SearchQuery{
|
|
AwaitOpenTransactions: true,
|
|
SubQueries: [][]*repository.Filter{
|
|
{
|
|
repository.NewFilter(repository.FieldAggregateType, []eventstore.AggregateType{"user", "org"}, repository.OperationIn),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
res: res{
|
|
clause: ` WHERE aggregate_type = ANY(?)`,
|
|
values: []interface{}{[]eventstore.AggregateType{"user", "org"}},
|
|
},
|
|
},
|
|
{
|
|
name: "multiple filters",
|
|
args: args{
|
|
query: &repository.SearchQuery{
|
|
AwaitOpenTransactions: true,
|
|
SubQueries: [][]*repository.Filter{
|
|
{
|
|
repository.NewFilter(repository.FieldAggregateType, []eventstore.AggregateType{"user", "org"}, repository.OperationIn),
|
|
repository.NewFilter(repository.FieldAggregateID, "1234", repository.OperationEquals),
|
|
repository.NewFilter(repository.FieldEventType, []eventstore.EventType{"user.created", "org.created"}, repository.OperationIn),
|
|
},
|
|
},
|
|
},
|
|
useV1: true,
|
|
},
|
|
res: res{
|
|
clause: " WHERE aggregate_type = ANY(?) AND aggregate_id = ? AND event_type = ANY(?)",
|
|
values: []interface{}{[]eventstore.AggregateType{"user", "org"}, "1234", []eventstore.EventType{"user.created", "org.created"}},
|
|
},
|
|
},
|
|
{
|
|
name: "multiple filters v2",
|
|
args: args{
|
|
query: &repository.SearchQuery{
|
|
AwaitOpenTransactions: true,
|
|
SubQueries: [][]*repository.Filter{
|
|
{
|
|
repository.NewFilter(repository.FieldAggregateType, []eventstore.AggregateType{"user", "org"}, repository.OperationIn),
|
|
repository.NewFilter(repository.FieldAggregateID, "1234", repository.OperationEquals),
|
|
repository.NewFilter(repository.FieldEventType, []eventstore.EventType{"user.created", "org.created"}, repository.OperationIn),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
res: res{
|
|
clause: ` WHERE aggregate_type = ANY(?) AND aggregate_id = ? AND event_type = ANY(?)`,
|
|
values: []interface{}{[]eventstore.AggregateType{"user", "org"}, "1234", []eventstore.EventType{"user.created", "org.created"}},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
gotClause, gotValues := prepareConditions(NewPostgres(&database.DB{Database: new(postgres.Config)}), tt.args.query, tt.args.useV1)
|
|
if gotClause != tt.res.clause {
|
|
t.Errorf("prepareCondition() gotClause = %v, want %v", gotClause, tt.res.clause)
|
|
}
|
|
if len(gotValues) != len(tt.res.values) {
|
|
t.Errorf("wrong length of gotten values got = %d, want %d", len(gotValues), len(tt.res.values))
|
|
return
|
|
}
|
|
for i, value := range gotValues {
|
|
if !reflect.DeepEqual(value, tt.res.values[i]) {
|
|
t.Errorf("prepareCondition() gotValues = %v, want %v", gotValues, tt.res.values)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_query_events_with_postgres(t *testing.T) {
|
|
type args struct {
|
|
searchQuery *eventstore.SearchQueryBuilder
|
|
}
|
|
type fields struct {
|
|
existingEvents []eventstore.Command
|
|
client *sql.DB
|
|
}
|
|
type res struct {
|
|
eventCount int
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
fields fields
|
|
args args
|
|
res res
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "aggregate type filter no events",
|
|
args: args{
|
|
searchQuery: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
AddQuery().
|
|
AggregateTypes("not found").
|
|
Builder(),
|
|
},
|
|
fields: fields{
|
|
client: testClient,
|
|
existingEvents: []eventstore.Command{
|
|
generateEvent(t, "300"),
|
|
generateEvent(t, "300"),
|
|
generateEvent(t, "300"),
|
|
},
|
|
},
|
|
res: res{
|
|
eventCount: 0,
|
|
},
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "aggregate type filter events found",
|
|
args: args{
|
|
searchQuery: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
AddQuery().
|
|
AggregateTypes(eventstore.AggregateType(t.Name())).
|
|
Builder(),
|
|
},
|
|
fields: fields{
|
|
client: testClient,
|
|
existingEvents: []eventstore.Command{
|
|
generateEvent(t, "301"),
|
|
generateEvent(t, "302"),
|
|
generateEvent(t, "302"),
|
|
generateEvent(t, "303", func(e *repository.Event) { e.AggregateType = "not in list" }),
|
|
},
|
|
},
|
|
res: res{
|
|
eventCount: 3,
|
|
},
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "aggregate type and id filter events found",
|
|
args: args{
|
|
searchQuery: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
AddQuery().
|
|
AggregateTypes(eventstore.AggregateType(t.Name())).
|
|
AggregateIDs("303").
|
|
Builder(),
|
|
},
|
|
fields: fields{
|
|
client: testClient,
|
|
existingEvents: []eventstore.Command{
|
|
generateEvent(t, "303"),
|
|
generateEvent(t, "303"),
|
|
generateEvent(t, "303"),
|
|
generateEvent(t, "304", func(e *repository.Event) { e.AggregateType = "not in list" }),
|
|
generateEvent(t, "305"),
|
|
},
|
|
},
|
|
res: res{
|
|
eventCount: 3,
|
|
},
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "resource owner filter events found",
|
|
args: args{
|
|
searchQuery: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner("caos"),
|
|
},
|
|
fields: fields{
|
|
client: testClient,
|
|
existingEvents: []eventstore.Command{
|
|
generateEvent(t, "306", func(e *repository.Event) { e.ResourceOwner = sql.NullString{String: "caos", Valid: true} }),
|
|
generateEvent(t, "307", func(e *repository.Event) { e.ResourceOwner = sql.NullString{String: "caos", Valid: true} }),
|
|
generateEvent(t, "308", func(e *repository.Event) { e.ResourceOwner = sql.NullString{String: "caos", Valid: true} }),
|
|
generateEvent(t, "309", func(e *repository.Event) { e.ResourceOwner = sql.NullString{String: "orgID", Valid: true} }),
|
|
generateEvent(t, "309", func(e *repository.Event) { e.ResourceOwner = sql.NullString{String: "orgID", Valid: true} }),
|
|
},
|
|
},
|
|
res: res{
|
|
eventCount: 3,
|
|
},
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "event type filter events found",
|
|
args: args{
|
|
searchQuery: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
AddQuery().
|
|
EventTypes("user.created", "user.updated").
|
|
Builder(),
|
|
},
|
|
fields: fields{
|
|
client: testClient,
|
|
existingEvents: []eventstore.Command{
|
|
generateEvent(t, "311", func(e *repository.Event) { e.Typ = "user.created" }),
|
|
generateEvent(t, "311", func(e *repository.Event) { e.Typ = "user.updated" }),
|
|
generateEvent(t, "311", func(e *repository.Event) { e.Typ = "user.deactivated" }),
|
|
generateEvent(t, "311", func(e *repository.Event) { e.Typ = "user.locked" }),
|
|
generateEvent(t, "312", func(e *repository.Event) { e.Typ = "user.created" }),
|
|
generateEvent(t, "312", func(e *repository.Event) { e.Typ = "user.updated" }),
|
|
generateEvent(t, "312", func(e *repository.Event) { e.Typ = "user.deactivated" }),
|
|
generateEvent(t, "312", func(e *repository.Event) { e.Typ = "user.reactivated" }),
|
|
generateEvent(t, "313", func(e *repository.Event) { e.Typ = "user.locked" }),
|
|
},
|
|
},
|
|
res: res{
|
|
eventCount: 7,
|
|
},
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "fail because no filter",
|
|
args: args{
|
|
searchQuery: eventstore.NewSearchQueryBuilder(eventstore.Columns(-1)),
|
|
},
|
|
fields: fields{
|
|
client: testClient,
|
|
existingEvents: []eventstore.Command{},
|
|
},
|
|
res: res{
|
|
eventCount: 0,
|
|
},
|
|
wantErr: true,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
dbClient := &database.DB{
|
|
DB: tt.fields.client,
|
|
Database: new(testDB),
|
|
}
|
|
|
|
client := &Postgres{
|
|
DB: dbClient,
|
|
}
|
|
|
|
pusher := new_es.NewEventstore(dbClient)
|
|
// setup initial data for query
|
|
if _, err := pusher.Push(context.Background(), new_sql.SQLPool(dbClient.DB), tt.fields.existingEvents...); err != nil {
|
|
t.Errorf("error in setup = %v", err)
|
|
return
|
|
}
|
|
|
|
events := []eventstore.Event{}
|
|
if err := query(context.Background(), client, tt.args.searchQuery, eventstore.Reducer(func(event eventstore.Event) error {
|
|
events = append(events, event)
|
|
return nil
|
|
}), true); (err != nil) != tt.wantErr {
|
|
t.Errorf("eventstore.query() error = %v, wantErr %v", err, tt.wantErr)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_query_events_mocked(t *testing.T) {
|
|
type args struct {
|
|
query *eventstore.SearchQueryBuilder
|
|
dest any
|
|
useV1 bool
|
|
}
|
|
type res struct {
|
|
wantErr bool
|
|
}
|
|
type fields struct {
|
|
mock *dbMock
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
fields fields
|
|
res res
|
|
}{
|
|
{
|
|
name: "with order by desc",
|
|
args: args{
|
|
dest: &[]*repository.Event{},
|
|
query: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
OrderDesc().
|
|
AwaitOpenTransactions().
|
|
AddQuery().
|
|
AggregateTypes("user").
|
|
Builder(),
|
|
useV1: true,
|
|
},
|
|
fields: fields{
|
|
mock: newMockClient(t).
|
|
expectExec(regexp.QuoteMeta(
|
|
`select pg_advisory_lock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1)), pg_advisory_unlock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1))`),
|
|
[]driver.Value{""}).
|
|
expectQuery(
|
|
regexp.QuoteMeta(`SELECT creation_date, event_type, event_sequence, event_data, editor_user, resource_owner, instance_id, aggregate_type, aggregate_id, aggregate_version FROM eventstore.events WHERE aggregate_type = $1 AND created_at <= now() ORDER BY event_sequence DESC`),
|
|
[]driver.Value{eventstore.AggregateType("user")},
|
|
),
|
|
},
|
|
res: res{
|
|
wantErr: false,
|
|
},
|
|
},
|
|
{
|
|
name: "with limit",
|
|
args: args{
|
|
dest: &[]*repository.Event{},
|
|
query: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
OrderAsc().
|
|
AwaitOpenTransactions().
|
|
Limit(5).
|
|
AddQuery().
|
|
AggregateTypes("user").
|
|
Builder(),
|
|
useV1: true,
|
|
},
|
|
fields: fields{
|
|
mock: newMockClient(t).
|
|
expectExec(regexp.QuoteMeta(
|
|
`select pg_advisory_lock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1)), pg_advisory_unlock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1))`),
|
|
[]driver.Value{""}).
|
|
expectQuery(
|
|
regexp.QuoteMeta(`SELECT creation_date, event_type, event_sequence, event_data, editor_user, resource_owner, instance_id, aggregate_type, aggregate_id, aggregate_version FROM eventstore.events WHERE aggregate_type = $1 AND created_at <= now() ORDER BY event_sequence LIMIT $2`),
|
|
[]driver.Value{eventstore.AggregateType("user"), uint64(5)},
|
|
),
|
|
},
|
|
res: res{
|
|
wantErr: false,
|
|
},
|
|
},
|
|
{
|
|
name: "with limit and order by desc",
|
|
args: args{
|
|
dest: &[]*repository.Event{},
|
|
query: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
OrderDesc().
|
|
AwaitOpenTransactions().
|
|
Limit(5).
|
|
AddQuery().
|
|
AggregateTypes("user").
|
|
Builder(),
|
|
useV1: true,
|
|
},
|
|
fields: fields{
|
|
mock: newMockClient(t).
|
|
expectExec(regexp.QuoteMeta(
|
|
`select pg_advisory_lock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1)), pg_advisory_unlock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1))`),
|
|
[]driver.Value{""}).
|
|
expectQuery(
|
|
regexp.QuoteMeta(`SELECT creation_date, event_type, event_sequence, event_data, editor_user, resource_owner, instance_id, aggregate_type, aggregate_id, aggregate_version FROM eventstore.events WHERE aggregate_type = $1 AND created_at <= now() ORDER BY event_sequence DESC LIMIT $2`),
|
|
[]driver.Value{eventstore.AggregateType("user"), uint64(5)},
|
|
),
|
|
},
|
|
res: res{
|
|
wantErr: false,
|
|
},
|
|
},
|
|
{
|
|
name: "error sql conn closed",
|
|
args: args{
|
|
dest: &[]*repository.Event{},
|
|
query: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
OrderDesc().
|
|
AwaitOpenTransactions().
|
|
Limit(0).
|
|
AddQuery().
|
|
AggregateTypes("user").
|
|
Builder(),
|
|
useV1: true,
|
|
},
|
|
fields: fields{
|
|
mock: newMockClient(t).
|
|
expectExec(regexp.QuoteMeta(
|
|
`select pg_advisory_lock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1)), pg_advisory_unlock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1))`),
|
|
[]driver.Value{""}).
|
|
expectQueryErr(
|
|
regexp.QuoteMeta(`SELECT creation_date, event_type, event_sequence, event_data, editor_user, resource_owner, instance_id, aggregate_type, aggregate_id, aggregate_version FROM eventstore.events WHERE aggregate_type = $1 AND created_at <= now() ORDER BY event_sequence DESC`),
|
|
[]driver.Value{eventstore.AggregateType("user")},
|
|
sql.ErrConnDone),
|
|
},
|
|
res: res{
|
|
wantErr: true,
|
|
},
|
|
},
|
|
{
|
|
name: "error unexpected dest",
|
|
args: args{
|
|
dest: nil,
|
|
query: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
OrderDesc().
|
|
AwaitOpenTransactions().
|
|
Limit(0).
|
|
AddQuery().
|
|
AggregateTypes("user").
|
|
Builder(),
|
|
useV1: true,
|
|
},
|
|
fields: fields{
|
|
mock: newMockClient(t).
|
|
expectExec(regexp.QuoteMeta(
|
|
`select pg_advisory_lock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1)), pg_advisory_unlock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1))`),
|
|
[]driver.Value{""}).
|
|
expectQueryScanErr(
|
|
regexp.QuoteMeta(`SELECT creation_date, event_type, event_sequence, event_data, editor_user, resource_owner, instance_id, aggregate_type, aggregate_id, aggregate_version FROM eventstore.events WHERE aggregate_type = $1 AND created_at <= now() ORDER BY event_sequence DESC`),
|
|
[]driver.Value{eventstore.AggregateType("user")},
|
|
&repository.Event{Seq: 100}),
|
|
},
|
|
res: res{
|
|
wantErr: true,
|
|
},
|
|
},
|
|
{
|
|
name: "error no columns",
|
|
args: args{
|
|
query: eventstore.NewSearchQueryBuilder(eventstore.Columns(-1)),
|
|
},
|
|
res: res{
|
|
wantErr: true,
|
|
},
|
|
},
|
|
{
|
|
name: "with subqueries",
|
|
args: args{
|
|
dest: &[]*repository.Event{},
|
|
query: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
OrderDesc().
|
|
AwaitOpenTransactions().
|
|
Limit(5).
|
|
AddQuery().
|
|
AggregateTypes("user").
|
|
Or().
|
|
AggregateTypes("org").
|
|
AggregateIDs("asdf42").
|
|
Builder(),
|
|
useV1: true,
|
|
},
|
|
fields: fields{
|
|
mock: newMockClient(t).
|
|
expectExec(regexp.QuoteMeta(
|
|
`select pg_advisory_lock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1)), pg_advisory_unlock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1))`),
|
|
[]driver.Value{""}).
|
|
expectQuery(
|
|
regexp.QuoteMeta(`SELECT creation_date, event_type, event_sequence, event_data, editor_user, resource_owner, instance_id, aggregate_type, aggregate_id, aggregate_version FROM eventstore.events WHERE (aggregate_type = $1 OR (aggregate_type = $2 AND aggregate_id = $3)) AND created_at <= now() ORDER BY event_sequence DESC LIMIT $4`),
|
|
[]driver.Value{eventstore.AggregateType("user"), eventstore.AggregateType("org"), "asdf42", uint64(5)},
|
|
),
|
|
},
|
|
res: res{
|
|
wantErr: false,
|
|
},
|
|
},
|
|
{
|
|
name: "aggregate / event type, position and exclusion, v1",
|
|
args: args{
|
|
dest: &[]*repository.Event{},
|
|
query: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
InstanceID("instanceID").
|
|
OrderDesc().
|
|
Limit(5).
|
|
PositionAtLeast(decimal.NewFromFloat(123.456)).
|
|
AddQuery().
|
|
AggregateTypes("notify").
|
|
EventTypes("notify.foo.bar").
|
|
Builder().
|
|
ExcludeAggregateIDs().
|
|
AggregateTypes("notify").
|
|
EventTypes("notification.failed", "notification.success").
|
|
Builder(),
|
|
useV1: true,
|
|
},
|
|
fields: fields{
|
|
mock: newMockClient(t).expectQuery(
|
|
regexp.QuoteMeta(`SELECT creation_date, event_type, event_sequence, event_data, editor_user, resource_owner, instance_id, aggregate_type, aggregate_id, aggregate_version FROM eventstore.events WHERE instance_id = $1 AND aggregate_type = $2 AND event_type = $3 AND "position" >= $4 AND aggregate_id NOT IN (SELECT aggregate_id FROM eventstore.events WHERE aggregate_type = $5 AND event_type = ANY($6) AND instance_id = $7 AND "position" >= $8) ORDER BY event_sequence DESC LIMIT $9`),
|
|
[]driver.Value{"instanceID", eventstore.AggregateType("notify"), eventstore.EventType("notify.foo.bar"), decimal.NewFromFloat(123.456), eventstore.AggregateType("notify"), []eventstore.EventType{"notification.failed", "notification.success"}, "instanceID", decimal.NewFromFloat(123.456), uint64(5)},
|
|
),
|
|
},
|
|
res: res{
|
|
wantErr: false,
|
|
},
|
|
},
|
|
{
|
|
name: "aggregate / event type, position and exclusion, v2",
|
|
args: args{
|
|
dest: &[]*repository.Event{},
|
|
query: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
InstanceID("instanceID").
|
|
OrderDesc().
|
|
Limit(5).
|
|
PositionAtLeast(decimal.NewFromFloat(123.456)).
|
|
AddQuery().
|
|
AggregateTypes("notify").
|
|
EventTypes("notify.foo.bar").
|
|
Builder().
|
|
ExcludeAggregateIDs().
|
|
AggregateTypes("notify").
|
|
EventTypes("notification.failed", "notification.success").
|
|
Builder(),
|
|
useV1: false,
|
|
},
|
|
fields: fields{
|
|
mock: newMockClient(t).expectQuery(
|
|
regexp.QuoteMeta(`SELECT created_at, event_type, "sequence", "position", payload, creator, "owner", instance_id, aggregate_type, aggregate_id, revision, in_tx_order FROM eventstore.events2 WHERE instance_id = $1 AND aggregate_type = $2 AND event_type = $3 AND "position" >= $4 AND aggregate_id NOT IN (SELECT aggregate_id FROM eventstore.events2 WHERE aggregate_type = $5 AND event_type = ANY($6) AND instance_id = $7 AND "position" >= $8) ORDER BY (`+eventSortKeySQL+`) DESC LIMIT $9`),
|
|
[]driver.Value{"instanceID", eventstore.AggregateType("notify"), eventstore.EventType("notify.foo.bar"), decimal.NewFromFloat(123.456), eventstore.AggregateType("notify"), []eventstore.EventType{"notification.failed", "notification.success"}, "instanceID", decimal.NewFromFloat(123.456), uint64(5)},
|
|
),
|
|
},
|
|
res: res{
|
|
wantErr: false,
|
|
},
|
|
},
|
|
{
|
|
name: "aggregate / event type, created after and exclusion, v2",
|
|
args: args{
|
|
dest: &[]*repository.Event{},
|
|
query: eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
InstanceID("instanceID").
|
|
OrderDesc().
|
|
Limit(5).
|
|
CreationDateAfter(time.Unix(123, 456)).
|
|
AddQuery().
|
|
AggregateTypes("notify").
|
|
EventTypes("notify.foo.bar").
|
|
Builder().
|
|
ExcludeAggregateIDs().
|
|
AggregateTypes("notify").
|
|
EventTypes("notification.failed", "notification.success").
|
|
Builder(),
|
|
useV1: false,
|
|
},
|
|
fields: fields{
|
|
mock: newMockClient(t).expectQuery(
|
|
regexp.QuoteMeta(`SELECT created_at, event_type, "sequence", "position", payload, creator, "owner", instance_id, aggregate_type, aggregate_id, revision, in_tx_order FROM eventstore.events2 WHERE instance_id = $1 AND aggregate_type = $2 AND event_type = $3 AND created_at > $4 AND aggregate_id NOT IN (SELECT aggregate_id FROM eventstore.events2 WHERE aggregate_type = $5 AND event_type = ANY($6) AND instance_id = $7 AND created_at > $8) ORDER BY (`+eventSortKeySQL+`) DESC LIMIT $9`),
|
|
[]driver.Value{"instanceID", eventstore.AggregateType("notify"), eventstore.EventType("notify.foo.bar"), time.Unix(123, 456), eventstore.AggregateType("notify"), []eventstore.EventType{"notification.failed", "notification.success"}, "instanceID", time.Unix(123, 456), uint64(5)},
|
|
),
|
|
},
|
|
res: res{
|
|
wantErr: false,
|
|
},
|
|
},
|
|
}
|
|
client := NewPostgres(&database.DB{Database: new(testDB)})
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if tt.fields.mock != nil {
|
|
client.DB.DB = tt.fields.mock.client
|
|
}
|
|
|
|
if strings.HasPrefix(tt.name, "aggregate / event type, position and exclusion") {
|
|
t.Log("hodor")
|
|
}
|
|
|
|
err := query(context.Background(), client, tt.args.query, tt.args.dest, tt.args.useV1)
|
|
if (err != nil) != tt.res.wantErr {
|
|
t.Errorf("query() error = %v, wantErr %v", err, tt.res.wantErr)
|
|
}
|
|
|
|
if tt.fields.mock == nil {
|
|
return
|
|
}
|
|
|
|
if err := tt.fields.mock.mock.ExpectationsWereMet(); err != nil {
|
|
t.Errorf("not all expectaions met: %v", err)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
type dbMock struct {
|
|
mock sqlmock.Sqlmock
|
|
client *sql.DB
|
|
}
|
|
|
|
func (m *dbMock) expectQuery(expectedQuery string, args []driver.Value, events ...*repository.Event) *dbMock {
|
|
query := m.mock.ExpectQuery(expectedQuery).WithArgs(args...)
|
|
rows := m.mock.NewRows([]string{"sequence"})
|
|
for _, event := range events {
|
|
rows = rows.AddRow(event.Seq)
|
|
}
|
|
query.WillReturnRows(rows).RowsWillBeClosed()
|
|
return m
|
|
}
|
|
|
|
func (m *dbMock) expectQueryScanErr(expectedQuery string, args []driver.Value, events ...*repository.Event) *dbMock {
|
|
query := m.mock.ExpectQuery(expectedQuery).WithArgs(args...)
|
|
rows := m.mock.NewRows([]string{"sequence"})
|
|
for _, event := range events {
|
|
rows = rows.AddRow(event.Seq)
|
|
}
|
|
query.WillReturnRows(rows).RowsWillBeClosed()
|
|
return m
|
|
}
|
|
|
|
func (m *dbMock) expectQueryErr(expectedQuery string, args []driver.Value, err error) *dbMock {
|
|
m.mock.ExpectQuery(expectedQuery).WithArgs(args...).WillReturnError(err)
|
|
return m
|
|
}
|
|
|
|
func (m *dbMock) expectExec(expectedQuery string, args []driver.Value) *dbMock {
|
|
m.mock.ExpectExec(expectedQuery).WithArgs(args...).WillReturnResult(sqlmock.NewResult(1, 1))
|
|
return m
|
|
}
|
|
|
|
func newMockClient(t *testing.T) *dbMock {
|
|
t.Helper()
|
|
db, mock, err := sqlmock.New(sqlmock.ValueConverterOption(new(db_mock.TypeConverter)))
|
|
if err != nil {
|
|
t.Errorf("unable to create mock client: %v", err)
|
|
t.FailNow()
|
|
return nil
|
|
}
|
|
|
|
return &dbMock{
|
|
mock: mock,
|
|
client: db,
|
|
}
|
|
}
|