mirror of
https://github.com/matrix-org/dendrite
synced 2024-11-19 00:00:55 +01:00
51ab0a8ccf
This is #2819 but rebased on latest `main`. This PR is against main too as opposed to the `moderncsqlite` branch. The main change here is simply: ```go // add query parameters to the dsn if strings.Contains(dsn, "?") { dsn += "&" } else { dsn += "?" } // wait some time before erroring if the db is locked // https://gitlab.com/cznic/sqlite/-/issues/106#note_1058094993 dsn += "_pragma=busy_timeout%3d10000" ``` ### Pull Request Checklist <!-- Please read https://matrix-org.github.io/dendrite/development/contributing before submitting your pull request --> * [x] I have added tests for PR _or_ I have justified why this PR doesn't need tests. * [x] Pull request includes a [sign off below using a legally identifiable name](https://matrix-org.github.io/dendrite/development/contributing#sign-off) _or_ I have already signed off privately Signed off privately. Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
136 lines
3.4 KiB
Go
136 lines
3.4 KiB
Go
package sqlutil_test
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"fmt"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/matrix-org/dendrite/internal/sqlutil"
|
|
"github.com/matrix-org/dendrite/test"
|
|
)
|
|
|
|
var dummyMigrations = []sqlutil.Migration{
|
|
{
|
|
Version: "init",
|
|
Up: func(ctx context.Context, txn *sql.Tx) error {
|
|
_, err := txn.ExecContext(ctx, "CREATE TABLE IF NOT EXISTS dummy ( test TEXT );")
|
|
return err
|
|
},
|
|
},
|
|
{
|
|
Version: "v2",
|
|
Up: func(ctx context.Context, txn *sql.Tx) error {
|
|
_, err := txn.ExecContext(ctx, "ALTER TABLE dummy ADD COLUMN test2 TEXT;")
|
|
return err
|
|
},
|
|
},
|
|
{
|
|
Version: "v2", // duplicate, this migration will be skipped
|
|
Up: func(ctx context.Context, txn *sql.Tx) error {
|
|
_, err := txn.ExecContext(ctx, "ALTER TABLE dummy ADD COLUMN test2 TEXT;")
|
|
return err
|
|
},
|
|
},
|
|
{
|
|
Version: "multiple execs",
|
|
Up: func(ctx context.Context, txn *sql.Tx) error {
|
|
_, err := txn.ExecContext(ctx, "ALTER TABLE dummy ADD COLUMN test3 TEXT;")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = txn.ExecContext(ctx, "ALTER TABLE dummy ADD COLUMN test4 TEXT;")
|
|
return err
|
|
},
|
|
},
|
|
}
|
|
|
|
var failMigration = sqlutil.Migration{
|
|
Version: "iFail",
|
|
Up: func(ctx context.Context, txn *sql.Tx) error {
|
|
return fmt.Errorf("iFail")
|
|
},
|
|
Down: nil,
|
|
}
|
|
|
|
func Test_migrations_Up(t *testing.T) {
|
|
withFail := append(dummyMigrations, failMigration)
|
|
|
|
tests := []struct {
|
|
name string
|
|
migrations []sqlutil.Migration
|
|
wantResult map[string]struct{}
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "dummy migration",
|
|
migrations: dummyMigrations,
|
|
wantResult: map[string]struct{}{
|
|
"init": {},
|
|
"v2": {},
|
|
"multiple execs": {},
|
|
},
|
|
},
|
|
{
|
|
name: "with fail",
|
|
migrations: withFail,
|
|
wantErr: true,
|
|
},
|
|
}
|
|
|
|
ctx := context.Background()
|
|
test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
|
|
conStr, close := test.PrepareDBConnectionString(t, dbType)
|
|
defer close()
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
driverName := sqlutil.SQLITE_DRIVER_NAME
|
|
if dbType == test.DBTypePostgres {
|
|
driverName = "postgres"
|
|
}
|
|
db, err := sql.Open(driverName, conStr)
|
|
if err != nil {
|
|
t.Errorf("unable to open database: %v", err)
|
|
}
|
|
m := sqlutil.NewMigrator(db)
|
|
m.AddMigrations(tt.migrations...)
|
|
if err = m.Up(ctx); (err != nil) != tt.wantErr {
|
|
t.Errorf("Up() error = %v, wantErr %v", err, tt.wantErr)
|
|
}
|
|
result, err := m.ExecutedMigrations(ctx)
|
|
if err != nil {
|
|
t.Errorf("unable to get executed migrations: %v", err)
|
|
}
|
|
if !tt.wantErr && !reflect.DeepEqual(result, tt.wantResult) {
|
|
t.Errorf("expected: %+v, got %v", tt.wantResult, result)
|
|
}
|
|
})
|
|
}
|
|
})
|
|
}
|
|
|
|
func Test_insertMigration(t *testing.T) {
|
|
test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
|
|
conStr, close := test.PrepareDBConnectionString(t, dbType)
|
|
defer close()
|
|
driverName := sqlutil.SQLITE_DRIVER_NAME
|
|
if dbType == test.DBTypePostgres {
|
|
driverName = "postgres"
|
|
}
|
|
|
|
db, err := sql.Open(driverName, conStr)
|
|
if err != nil {
|
|
t.Errorf("unable to open database: %v", err)
|
|
}
|
|
|
|
if err := sqlutil.InsertMigration(context.Background(), db, "testing"); err != nil {
|
|
t.Fatalf("unable to insert migration: %s", err)
|
|
}
|
|
// Second insert should not return an error, as it was already executed.
|
|
if err := sqlutil.InsertMigration(context.Background(), db, "testing"); err != nil {
|
|
t.Fatalf("unable to insert migration: %s", err)
|
|
}
|
|
})
|
|
}
|