Skip to content

Commit 3de58c8

Browse files
committed
Improve wording for connection/extensions/locales check
1 parent 8dbddbf commit 3de58c8

File tree

1 file changed

+7
-4
lines changed
  • engine/internal/retrieval/engine/postgres/tools/db

1 file changed

+7
-4
lines changed

engine/internal/retrieval/engine/postgres/tools/db/pg.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func CheckSource(ctx context.Context, conf *models.ConnectionTest, imageContent
8989
tcResponse = &models.TestConnection{
9090
Status: models.TCStatusNotice,
9191
Result: models.TCResultUnverifiedDB,
92-
Message: "Too many databases are supposed to be checked. Only the following databases have been verified: " +
92+
Message: "Too many databases were requested to be checked. Only the following databases have been verified: " +
9393
strings.Join(dbList, ", "),
9494
}
9595
}
@@ -263,15 +263,17 @@ func buildExtensionsWarningMessage(dbName string, missingExtensions, unsupported
263263
sb := &strings.Builder{}
264264

265265
if len(missingExtensions) > 0 {
266-
sb.WriteString("There are missing extensions in the \"" + dbName + "\" database:")
266+
sb.WriteString("The image specified in section \"databaseContainer\" lacks the following " +
267+
"extensions used in the source database (\"" + dbName + "\"):")
267268

268269
formatExtensionList(sb, missingExtensions)
269270

270271
sb.WriteString(".\n")
271272
}
272273

273274
if len(unsupportedVersions) > 0 {
274-
sb.WriteString("There are extensions with an unsupported version in the \"" + dbName + "\" database:")
275+
sb.WriteString("The source database (\"" + dbName + "\") uses extensions that are present " +
276+
"in image specified in section \"databaseContainer\" but their versions are not supported by the image:")
275277

276278
formatExtensionList(sb, unsupportedVersions)
277279
}
@@ -336,7 +338,8 @@ func buildLocalesWarningMessage(dbName string, missingLocales []locale) string {
336338
sb := &strings.Builder{}
337339

338340
if length := len(missingLocales); length > 0 {
339-
sb.WriteString("There are missing locales in the \"" + dbName + "\" database:")
341+
sb.WriteString("The image specified in section \"databaseContainer\" lacks the following " +
342+
"locales used in the source database (\"" + dbName + "\"):")
340343

341344
for i, missing := range missingLocales {
342345
sb.WriteString(fmt.Sprintf(" '%s' (collate: %s, ctype: %s)", missing.name, missing.collate, missing.ctype))

0 commit comments

Comments
 (0)