balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Fix all tests

Browse Source
This commit is contained in:
Dan Sosedoff
2015-04-30 12:09:29 -05:00
parent e9f2f8eb83
commit 50cdf99913
5 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/client/client.go
View File

@@ -6,6 +6,8 @@ import (
"fmt"
"reflect"
_ "github.com/lib/pq"
"github.com/jmoiron/sqlx"
"github.com/sosedoff/pgweb/pkg/command"
"github.com/sosedoff/pgweb/pkg/connection"
@@ -65,7 +67,6 @@ func NewFromUrl(url string) (*Client, error) {
}
db, err := sqlx.Open("postgres", url)
if err != nil {
return nil, err
}
@@ -237,7 +238,10 @@ func (res *Result) CSV() []byte {
// Close database connection
func (client *Client) Close() error {
return client.db.Close()
if client.db != nil {
return client.db.Close()
}
return nil
}
// Fetch all rows as strings for a single column

20
pkg/client/client_test.go
View File

@@ -10,8 +10,10 @@ import (
"github.com/stretchr/testify/assert"
)
var testClient *Client
var testCommands map[string]string
var (
testClient *Client
testCommands map[string]string
)
func setupCommands() {
testCommands = map[string]string{
@@ -40,7 +42,7 @@ func setup() {
os.Exit(1)
}
out, err = exec.Command(testCommands["psql"], "-U", "postgres", "-h", "localhost", "-f", "./data/booktown.sql", "booktown").CombinedOutput()
out, err = exec.Command(testCommands["psql"], "-U", "postgres", "-h", "localhost", "-f", "../../data/booktown.sql", "booktown").CombinedOutput()
if err != nil {
fmt.Println("Database import failed:", string(out))
@@ -50,7 +52,7 @@ func setup() {
}
func setupClient() {
testClient, _ = NewClientFromUrl("postgres://postgres@localhost/booktown?sslmode=disable")
testClient, _ = NewFromUrl("postgres://postgres@localhost/booktown?sslmode=disable")
}
func teardownClient() {
@@ -69,14 +71,14 @@ func teardown() {
func test_NewClientFromUrl(t *testing.T) {
url := "postgres://postgres@localhost/booktown?sslmode=disable"
client, err := NewClientFromUrl(url)
client, err := NewFromUrl(url)
if err != nil {
defer client.db.Close()
defer client.Close()
}
assert.Equal(t, nil, err)
assert.Equal(t, url, client.connectionString)
assert.Equal(t, url, client.ConnectionString)
}
func test_Test(t *testing.T) {
@@ -209,7 +211,7 @@ func test_ResultCsv(t *testing.T) {
func test_History(t *testing.T) {
_, err := testClient.Query("SELECT * FROM books")
query := testClient.history[len(testClient.history)-1].Query
query := testClient.History[len(testClient.History)-1].Query
assert.Equal(t, nil, err)
assert.Equal(t, "SELECT * FROM books", query)
@@ -217,7 +219,7 @@ func test_History(t *testing.T) {
func test_HistoryError(t *testing.T) {
_, err := testClient.Query("SELECT * FROM books123")
query := testClient.history[len(testClient.history)-1].Query
query := testClient.History[len(testClient.History)-1].Query
assert.NotEqual(t, nil, err)
assert.NotEqual(t, "SELECT * FROM books123", query)