Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fixed null endpoint issue for MySQL plugin (#2719)

Browse Source
This commit is contained in:
Nidhi 2021-01-26 17:16:31 +05:30 committed by GitHub
parent 777c4bc891
commit 6515b5c91c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java vendored
View File

@ -313,7 +313,9 @@ public class MySqlPlugin extends BasePlugin {
invalids.add("Missing endpoint and url");
} else if (!CollectionUtils.isEmpty(datasourceConfiguration.getEndpoints())) {
for (final Endpoint endpoint : datasourceConfiguration.getEndpoints()) {
if (endpoint.getHost().contains("/") || endpoint.getHost().contains(":")) {
if (endpoint.getHost() == null || endpoint.getHost().isBlank()) {
invalids.add("Host value cannot be empty");
} else if (endpoint.getHost().contains("/") || endpoint.getHost().contains(":")) {
invalids.add("Host value cannot contain `/` or `:` characters. Found `" + endpoint.getHost() + "`.");
}
}

17
app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java vendored
View File

@ -29,6 +29,7 @@ import reactor.test.StepVerifier;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Set;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@ -257,6 +258,18 @@ public class MySqlPluginTest {
assertTrue(output.contains("Missing endpoint and url"));
}
@Test
public void testValidateDatasource_NullHost() {
dsConfig.setEndpoints(List.of(new Endpoint()));
Set<String> output = pluginExecutor.validateDatasource(dsConfig);
assertEquals(output.size(), 1);
assertTrue(output.contains("Host value cannot be empty"));
Endpoint endpoint = new Endpoint();
endpoint.setHost(address);
endpoint.setPort(port.longValue());
dsConfig.setEndpoints(List.of(endpoint));
}
@Test
public void testValidateDatasourceInvalidEndpoint() {
String hostname = "r2dbc:mysql://localhost";
@ -344,8 +357,8 @@ public class MySqlPluginTest {
* 1. Add a test to check that mysql driver can interpret and read all the regular data types used in mysql.
* 2. List of the data types is taken is from https://dev.mysql.com/doc/refman/8.0/en/data-types.html
* 3. Data types tested here are: INTEGER, SMALLINT, TINYINT, MEDIUMINT, BIGINT, DECIMAL, FLOAT, DOUBLE, BIT,
* DATE, DATETIME, TIMESTAMP, TIME, YEAR, CHAR, VARCHAR, BINARY, VARBINARY, TINYBLOB, BLOB, MEDIUMBLOB, LONGBLOB,
* TINYTEXT, TEXT, MEDIUMTEXT, LONGTEXT, ENUM, SET, JSON, GEOMETRY, POINT
* DATE, DATETIME, TIMESTAMP, TIME, YEAR, CHAR, VARCHAR, BINARY, VARBINARY, TINYBLOB, BLOB, MEDIUMBLOB, LONGBLOB,
* TINYTEXT, TEXT, MEDIUMTEXT, LONGTEXT, ENUM, SET, JSON, GEOMETRY, POINT
*/
@Test
public void testExecuteDataTypesExtensive() {