totole/services
1
0
Fork 0
mirror of https://github.com/kevin-DL/services.git synced 2026-01-14 12:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

reuse connections to DB (#76)

Browse Source
This commit is contained in:
Dominic Wong
2021-03-24 10:22:48 +00:00
committed by GitHub
parent d68fdeb516
commit 40738bedc8
4 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
users/handler/handler_test.go
View File

@@ -2,18 +2,18 @@ package handler_test
import (
"context"
"database/sql"
"os"
"testing"
"time"
"github.com/micro/micro/v3/service/auth"
"github.com/stretchr/testify/assert"
"gorm.io/gorm/schema"
"github.com/micro/services/users/handler"
pb "github.com/micro/services/users/proto"
"gorm.io/driver/postgres"
"gorm.io/gorm"
_ "github.com/jackc/pgx/v4/stdlib"
)
func testHandler(t *testing.T) *handler.Users {
@@ -22,24 +22,16 @@ func testHandler(t *testing.T) *handler.Users {
if len(addr) == 0 {
addr = "postgresql://postgres@localhost:5432/postgres?sslmode=disable"
}
dial := postgres.Open(addr)
db, err := gorm.Open(dial, &gorm.Config{
NamingStrategy: schema.NamingStrategy{TablePrefix: "micro_"},
})
sqlDB, err := sql.Open("pgx", addr)
if err != nil {
t.Fatalf("Error connecting to database: %v", err)
t.Fatalf("Failed to open connection to DB %s", err)
}
// clean any data from a previous run
if err := db.Exec("DROP TABLE IF EXISTS micro_users, micro_tokens CASCADE").Error; err != nil {
if _, err := sqlDB.Exec("DROP TABLE IF EXISTS micro_users, micro_tokens CASCADE"); err != nil {
t.Fatalf("Error cleaning database: %v", err)
}
// migrate the database
if err := db.AutoMigrate(&handler.User{}, &handler.Token{}); err != nil {
t.Fatalf("Error migrating database: %v", err)
}
return handler.NewHandler(time.Now, dial)
return handler.NewHandler(time.Now, sqlDB)
}
func assertUsersMatch(t *testing.T, exp, act *pb.User) {