Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: shadow PR for external contribution #ce-35167 #36053

Merged
merged 10 commits into from
Sep 9, 2024
Merged

chore: shadow PR for external contribution #ce-35167 #36053

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f08932c
feat:Improved-error-messages-for-postgres-connection
AnnaHariprasad5123 Jul 25, 2024
ddb732a
fix-merge-conflicts
AnnaHariprasad5123 Sep 2, 2024
4e80154
Merge remote-tracking branch 'external-AnnaHariprasad5123/Issue-#1972…
NilanshBansal Sep 2, 2024
69965b5
fix-cypress-tests
AnnaHariprasad5123 Sep 3, 2024
09ed8b9
Merge branch 'Issue-#19723/feat-postgres-conn-error-msg-improvements'…
NilanshBansal Sep 6, 2024
6efcd27
reduced-code-duplication
AnnaHariprasad5123 Sep 6, 2024
c3047c1
fix-merge-conflicts
AnnaHariprasad5123 Sep 6, 2024
5723974
removed-comma-in-error-messages
AnnaHariprasad5123 Sep 9, 2024
5a727b7
fix-error-messages
AnnaHariprasad5123 Sep 9, 2024
3c97f02
Merge branch 'Issue-#19723/feat-postgres-conn-error-msg-improvements'…
NilanshBansal Sep 9, 2024
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
27 changes: 23 additions & 4 deletions ...er/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
import org.pf4j.Extension;
import org.pf4j.PluginWrapper;
import org.postgresql.util.PGobject;
import org.postgresql.util.PSQLException;
import org.postgresql.util.PSQLState;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import reactor.core.publisher.Mono;
Expand Down Expand Up @@ -1320,10 +1322,27 @@ private static HikariDataSource createConnectionPool(
try {
datasource = new HikariDataSource(config);
} catch (PoolInitializationException e) {
throw new AppsmithPluginException(
AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR,
PostgresErrorMessages.CONNECTION_POOL_CREATION_FAILED_ERROR_MSG,
e.getMessage());
Throwable cause = e.getCause();
if (cause instanceof PSQLException) {
PSQLException psqlException = (PSQLException) cause;
String sqlState = psqlException.getSQLState();
if (PSQLState.CONNECTION_UNABLE_TO_CONNECT.getState().equals(sqlState)) {
throw new AppsmithPluginException(
AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR,
PostgresErrorMessages.DS_INVALID_HOSTNAME_AND_PORT_MSG,
psqlException.getMessage());
} else {
throw new AppsmithPluginException(
AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR,
PostgresErrorMessages.CONNECTION_POOL_CREATION_FAILED_ERROR_MSG,
cause.getMessage());
}
} else {
throw new AppsmithPluginException(
AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR,
PostgresErrorMessages.CONNECTION_POOL_CREATION_FAILED_ERROR_MSG,
cause != null ? cause.getMessage() : e.getMessage());
}
}

return datasource;
Expand Down
2 changes: 2 additions & 0 deletions ...s/postgresPlugin/src/main/java/com/external/plugins/exceptions/PostgresErrorMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,6 @@ public class PostgresErrorMessages extends BasePluginErrorMessages {
public static final String DS_MISSING_PASSWORD_ERROR_MSG = "Missing password for authentication.";

public static final String DS_MISSING_DATABASE_NAME_ERROR_MSG = "Missing database name.";

public static final String DS_INVALID_HOSTNAME_AND_PORT_MSG = "Please check the host and port.";
}
Loading