arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

database: improve PostgreSQL test inits and cleanups

Browse Source
This commit is contained in:
Quentin Machu 2016-02-02 13:40:41 -05:00 committed by Jimmy Zelinskie
parent 3defe6448a
commit 03d904c620
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
database/pgsql/pgsql.go
View File

@ -19,6 +19,7 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os"
"path" "path"
"runtime" "runtime"
"strings" "strings"
@ -174,9 +175,17 @@ func dropDatabase(dataSource, databaseName string) error {
} }
defer db.Close() defer db.Close()
// Kill any opened connection.
if _, err := db.Exec(`
SELECT pg_terminate_backend(pg_stat_activity.pid)
FROM pg_stat_activity
WHERE pg_stat_activity.datname = $1
AND pid <> pg_backend_pid()`, databaseName); err != nil {
return fmt.Errorf("could not drop database: %v", err)
}
// Drop database. // Drop database.
_, err = db.Exec("DROP DATABASE " + databaseName) if _, err = db.Exec("DROP DATABASE " + databaseName); err != nil {
if err != nil {
return fmt.Errorf("could not drop database: %v", err) return fmt.Errorf("could not drop database: %v", err)
} }
@ -187,33 +196,33 @@ func dropDatabase(dataSource, databaseName string) error {
// Its Close() method drops the database. // Its Close() method drops the database.
type pgSQLTest struct { type pgSQLTest struct {
*pgSQL *pgSQL
dataSource string dataSourceDefaultDatabase string
dbName string dbName string
}
func (pgSQL *pgSQLTest) Close() {
pgSQL.DB.Close()
dropDatabase(pgSQL.dataSource+"dbname=postgres", pgSQL.dbName)
} }
// OpenForTest creates a test Datastore backed by a new PostgreSQL database. // OpenForTest creates a test Datastore backed by a new PostgreSQL database.
// It creates a new unique and prefixed ("test_") database. // It creates a new unique and prefixed ("test_") database.
// Using Close() will drop the database. // Using Close() will drop the database.
func OpenForTest(name string, withTestData bool) (*pgSQLTest, error) { func OpenForTest(name string, withTestData bool) (*pgSQLTest, error) {
dataSource := "host=127.0.0.1 sslmode=disable " // Define the PostgreSQL connection strings.
dataSource := "host=127.0.0.1 sslmode=disable user=postgres dbname="
if dataSourceEnv := os.Getenv("CLAIR_TEST_PGSQL"); dataSourceEnv != "" {
dataSource = dataSourceEnv + " dbname="
}
dbName := "test_" + strings.ToLower(name) + "_" + strings.Replace(uuid.New(), "-", "_", -1) dbName := "test_" + strings.ToLower(name) + "_" + strings.Replace(uuid.New(), "-", "_", -1)
dataSourceDefaultDatabase := dataSource + "postgres"
dataSourceTestDatabase := dataSource + dbName
// Create database. // Create database.
err := createDatabase(dataSource+"dbname=postgres", dbName) if err := createDatabase(dataSourceDefaultDatabase, dbName); err != nil {
if err != nil {
log.Error(err) log.Error(err)
return nil, database.ErrCantOpen return nil, database.ErrCantOpen
} }
// Open database. // Open database.
db, err := Open(&config.DatabaseConfig{Source: dataSource + "dbname=" + dbName, CacheSize: 0}) db, err := Open(&config.DatabaseConfig{Source: dataSourceTestDatabase, CacheSize: 0})
if err != nil { if err != nil {
dropDatabase(dataSource, dbName) dropDatabase(dataSourceDefaultDatabase, dbName)
log.Error(err) log.Error(err)
return nil, database.ErrCantOpen return nil, database.ErrCantOpen
} }
@ -224,13 +233,21 @@ func OpenForTest(name string, withTestData bool) (*pgSQLTest, error) {
d, _ := ioutil.ReadFile(path.Join(path.Dir(filename)) + "/testdata/data.sql") d, _ := ioutil.ReadFile(path.Join(path.Dir(filename)) + "/testdata/data.sql")
_, err = db.(*pgSQL).Exec(string(d)) _, err = db.(*pgSQL).Exec(string(d))
if err != nil { if err != nil {
dropDatabase(dataSource+"dbname=postgres", dbName) dropDatabase(dataSourceDefaultDatabase, dbName)
log.Error(err) log.Error(err)
return nil, database.ErrCantOpen return nil, database.ErrCantOpen
} }
} }
return &pgSQLTest{pgSQL: db.(*pgSQL), dataSource: dataSource, dbName: dbName}, nil return &pgSQLTest{
pgSQL: db.(*pgSQL),
dataSourceDefaultDatabase: dataSourceDefaultDatabase,
dbName: dbName}, nil
}
func (pgSQL *pgSQLTest) Close() {
pgSQL.DB.Close()
dropDatabase(pgSQL.dataSourceDefaultDatabase, pgSQL.dbName)
} }
// handleError logs an error with an extra description and masks the error if it's an SQL one. // handleError logs an error with an extra description and masks the error if it's an SQL one.