add tests

Author: pashagolub

internal/cmdopts/cmdsource.go

@@ -55,7 +55,7 @@ func (cmd *SourcePingCommand) Execute(args []string) error {
 			_, e = sources.ResolveDatabasesFromPostgres(s)
 		default:
 			mdb := &sources.SourceConn{Source: s}
-			e = mdb.Ping(context.Background())
+			e = mdb.Connect(context.Background(), cmd.owner.Sources)
 		}
 		if e != nil {
 			fmt.Printf("FAIL:\t%s (%s)\n", s.Name, e)

internal/sources/conn.go

@@ -22,8 +22,8 @@ type (
 	SourceConns []*SourceConn
 )
 
-// ping will try to ping the server to ensure the connection is still alive
-func (md *SourceConn) ping(ctx context.Context) (err error) {
+// Ping will try to ping the server to ensure the connection is still alive
+func (md *SourceConn) Ping(ctx context.Context) (err error) {
 	if md.Kind == SourcePgBouncer {
 		// pgbouncer is very picky about the queries it accepts
 		_, err = md.Conn.Exec(ctx, "SHOW VERSION")
@@ -32,17 +32,6 @@ func (md *SourceConn) ping(ctx context.Context) (err error) {
 	return md.Conn.Ping(ctx)
 }
 
-// Ping will try to establish a brand new connection to the server and return any error
-func (md *SourceConn) Ping(ctx context.Context) error {
-	c, err := pgxpool.New(ctx, md.ConnStr)
-	if err != nil {
-		return err
-	}
-	defer c.Close()
-	t := &SourceConn{Conn: c, Source: md.Source}
-	return t.ping(ctx)
-}
-
 // Connect will establish a connection to the database if it's not already connected.
 // If the connection is already established, it pings the server to ensure it's still alive.
 func (md *SourceConn) Connect(ctx context.Context, opts CmdOpts) (err error) {
@@ -61,7 +50,7 @@ func (md *SourceConn) Connect(ctx context.Context, opts CmdOpts) (err error) {
 			return err
 		}
 	}
-	return md.ping(ctx)
+	return md.Ping(ctx)
 }
 
 // ParseConfig will parse the connection string and store the result in the connection config

internal/sources/conn_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/jackc/pgx/v5/pgconn"
 	"github.com/pashagolub/pgxmock/v4"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -16,7 +17,7 @@ import (
 
 const ImageName = "docker.io/postgres:17-alpine"
 
-func TestMonitoredDatabase_Connect(t *testing.T) {
+func TestSourceConn_Connect(t *testing.T) {
 	pgContainer, err := postgres.Run(ctx,
 		ImageName,
 		testcontainers.WithWaitStrategy(
@@ -40,7 +41,7 @@ func TestMonitoredDatabase_Connect(t *testing.T) {
 	err = md.Connect(ctx, sources.CmdOpts{})
 	assert.NoError(t, err)
 }
-func TestMonitoredDatabase_GetDatabaseName(t *testing.T) {
+func TestSourceConn_GetDatabaseName(t *testing.T) {
 	md := &sources.SourceConn{}
 	md.ConnStr = "postgres://user:password@localhost:5432/mydatabase"
 	expected := "mydatabase"
@@ -58,7 +59,7 @@ func TestMonitoredDatabase_GetDatabaseName(t *testing.T) {
 	assert.Equal(t, expected, got, "GetDatabaseName() = %v, want %v", got, expected)
 }
 
-func TestMonitoredDatabase_SetDatabaseName(t *testing.T) {
+func TestSourceConn_SetDatabaseName(t *testing.T) {
 	md := &sources.SourceConn{}
 	md.ConnStr = "postgres://user:password@localhost:5432/mydatabase"
 	expected := "mydatabase"
@@ -80,7 +81,7 @@ func TestMonitoredDatabase_SetDatabaseName(t *testing.T) {
 	assert.Equal(t, expected, got, "GetDatabaseName() = %v, want %v", got, expected)
 }
 
-func TestMonitoredDatabase_IsPostgresSource(t *testing.T) {
+func TestSourceConn_IsPostgresSource(t *testing.T) {
 	md := &sources.SourceConn{}
 	md.Kind = sources.SourcePostgres
 	assert.True(t, md.IsPostgresSource(), "IsPostgresSource() = false, want true")
@@ -95,6 +96,21 @@ func TestMonitoredDatabase_IsPostgresSource(t *testing.T) {
 	assert.True(t, md.IsPostgresSource(), "IsPostgresSource() = false, want true")
 }
 
+func TestSourceConn_Ping(t *testing.T) {
+	db, err := pgxmock.NewPool()
+	require.NoError(t, err)
+	md := &sources.SourceConn{Conn: db}
+
+	db.ExpectPing()
+	md.Kind = sources.SourcePostgres
+	assert.NoError(t, md.Ping(ctx), "Ping() = error, want nil")
+
+	db.ExpectExec("SHOW VERSION").WillReturnResult(pgconn.NewCommandTag("SELECT 1"))
+	md.Conn = db
+	md.Kind = sources.SourcePgBouncer
+	assert.NoError(t, md.Ping(ctx), "Ping() = error, want nil")
+}
+
 type testSourceReader struct {
 	sources.Sources
 	error