Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions cmd/plan/external_db_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,21 @@ func TestExternalDatabase_CleanupOnError(t *testing.T) {

planHost, planPort, planDatabase, planUser, planPassword := externalPlanDB.GetConnectionDetails()

// Detect the actual major version from the embedded database
conn, _, _, _, _, _ := testutil.ConnectToPostgres(t, externalPlanDB)
defer conn.Close()

majorVersion, err := testutil.GetMajorVersion(conn)
require.NoError(t, err, "should detect PostgreSQL major version")

// Create external database connection with correct version
externalConfig := &postgres.ExternalDatabaseConfig{
Host: planHost,
Port: planPort,
Database: planDatabase,
Username: planUser,
Password: planPassword,
TargetMajorVersion: 17, // Assuming test uses PG 17
TargetMajorVersion: majorVersion,
}

extDB, err := postgres.NewExternalDatabase(externalConfig)
Expand Down Expand Up @@ -174,14 +181,21 @@ func TestExternalDatabase_SchemaIsolation(t *testing.T) {

planHost, planPort, planDatabase, planUser, planPassword := externalPlanDB.GetConnectionDetails()

// Detect the actual major version from the embedded database
conn, _, _, _, _, _ := testutil.ConnectToPostgres(t, externalPlanDB)
defer conn.Close()

majorVersion, err := testutil.GetMajorVersion(conn)
require.NoError(t, err, "should detect PostgreSQL major version")

// Create two external database connections
externalConfig1 := &postgres.ExternalDatabaseConfig{
Host: planHost,
Port: planPort,
Database: planDatabase,
Username: planUser,
Password: planPassword,
TargetMajorVersion: 17,
TargetMajorVersion: majorVersion,
}
extDB1, err := postgres.NewExternalDatabase(externalConfig1)
require.NoError(t, err)
Expand All @@ -193,7 +207,7 @@ func TestExternalDatabase_SchemaIsolation(t *testing.T) {
Database: planDatabase,
Username: planUser,
Password: planPassword,
TargetMajorVersion: 17,
TargetMajorVersion: majorVersion,
}
extDB2, err := postgres.NewExternalDatabase(externalConfig2)
require.NoError(t, err)
Expand Down