Skip to content

Commit

Permalink
Merge pull request #6359 from KurtStam/startstep
Browse files Browse the repository at this point in the history
  • Loading branch information
@pure-bot
pure-bot[bot] committed Aug 12, 2019
2 parents d36d52e + bd3c0a7 commit e14633a
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 28 deletions.
9 changes: 7 additions & 2 deletions ...r/sql/src/main/java/io/syndesis/connector/sql/customizer/SqlStartConnectorCustomizer.java
View file
Expand Up @@ -23,6 +23,7 @@

import javax.sql.DataSource;

import io.syndesis.connector.sql.common.DbMetaDataHelper;
import io.syndesis.connector.sql.common.JSONBeanUtil;
import io.syndesis.connector.sql.common.SqlStatementMetaData;
import io.syndesis.connector.sql.common.SqlStatementParser;
Expand Down Expand Up @@ -75,11 +76,15 @@ private void doAfterProducer(Exchange exchange) {
}

private void init(Map<String, Object> options) {
if (isInit) {
if (!isInit) {
final String sql = ConnectorOptions.extractOption(options, "query");
final DataSource dataSource = ConnectorOptions.extractOptionAsType(options, "dataSource", DataSource.class);
try (Connection connection = dataSource.getConnection()) {
SqlStatementMetaData statementInfo = new SqlStatementParser(connection, null, sql).parse();
DbMetaDataHelper dbHelper = new DbMetaDataHelper(connection);
final String defaultSchema = dbHelper.getDefaultSchema(ConnectorOptions.extractOption(options, "user", ""));
final String schemaPattern = ConnectorOptions.extractOption(options, "schema", defaultSchema);

SqlStatementMetaData statementInfo = new SqlStatementParser(connection, schemaPattern, sql).parse();
if (statementInfo.getAutoIncrementColumnName() != null) {
isRetrieveGeneratedKeys = true;
autoIncrementColumnName = statementInfo.getAutoIncrementColumnName();
Expand Down
81 changes: 55 additions & 26 deletions app/connector/sql/src/test/java/io/syndesis/connector/sql/SqlStartConnectorTest.java
View file
Expand Up @@ -15,20 +15,17 @@
*/
package io.syndesis.connector.sql;

import java.sql.SQLException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.stream.Collectors;

import io.syndesis.common.model.integration.Step;
import io.syndesis.connector.sql.common.DbEnum;
import io.syndesis.connector.sql.common.JSONBeanUtil;
import io.syndesis.connector.sql.util.SqlConnectorTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -40,10 +37,12 @@ public class SqlStartConnectorTest extends SqlConnectorTestSupport {

private final String sqlQuery;
private final List<Map<String, String[]>> expectedResults;
private final Map<String, Object> parameters;

public SqlStartConnectorTest(String sqlQuery, List<Map<String, String[]>> expectedResults) {
public SqlStartConnectorTest(String sqlQuery, List<Map<String, String[]>> expectedResults, Map<String, Object> parameters) {
this.sqlQuery = sqlQuery;
this.expectedResults = expectedResults;
this.parameters = parameters;
}

@Override
Expand All @@ -53,9 +52,38 @@ protected List<String> cleanupStatements() {

@Override
protected List<String> setupStatements() {
return Arrays.asList("CREATE TABLE NAME (id INTEGER PRIMARY KEY, firstName VARCHAR(255), lastName VARCHAR(255))",
"INSERT INTO NAME VALUES (1, 'Joe', 'Jackson')",
"INSERT INTO NAME VALUES (2, 'Roger', 'Waters')");
String dbProductName = null;
try {
dbProductName = db.connection.getMetaData().getDatabaseProductName();
} catch (SQLException e) {
e.printStackTrace();
Assert.fail(e.getMessage());
}
if (DbEnum.POSTGRESQL.equals(DbEnum.fromName(dbProductName))) {
return Arrays.asList("CREATE TABLE NAME ("
+ "ID SERIAL PRIMARY KEY, "
+ "firstName VARCHAR(255), lastName VARCHAR(255))",
"INSERT INTO NAME (firstname, lastname) VALUES ('Joe', 'Jackson')",
"INSERT INTO NAME (firstname, lastname) VALUES ('Roger', 'Waters')");
} else if (DbEnum.MYSQL.equals(DbEnum.fromName(dbProductName))) {
return Arrays.asList("CREATE TABLE NAME ("
+ "ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY, "
+ "firstName VARCHAR(255), lastName VARCHAR(255))",
"INSERT INTO NAME (firstname, lastname) VALUES ('Joe', 'Jackson')",
"INSERT INTO NAME (firstname, lastname) VALUES ('Roger', 'Waters')");
} else if (DbEnum.APACHE_DERBY.equals(DbEnum.fromName(dbProductName))) {
return Arrays.asList("CREATE TABLE NAME (ID INTEGER NOT NULL "
+ "GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), "
+ "firstName VARCHAR(255), lastName VARCHAR(255))",
"INSERT INTO NAME (firstname, lastname) VALUES ('Joe', 'Jackson')",
"INSERT INTO NAME (firstname, lastname) VALUES ('Roger', 'Waters')");
} else {
return Arrays.asList("CREATE TABLE NAME ("
+ "ID NUMBER GENERATED ALWAYS AS IDENTITY, "
+ "firstName VARCHAR(255), lastName VARCHAR(255))",
"INSERT INTO NAME (firstname, lastname) VALUES ('Joe', 'Jackson')",
"INSERT INTO NAME (firstname, lastname) VALUES ('Roger', 'Waters')");
}
}

@Override
Expand Down Expand Up @@ -85,11 +113,16 @@ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][] {
{ "SELECT * FROM NAME ORDER BY id", Arrays.asList(Collections.singletonMap("ID", new String[] { "1", "2" }),
Collections.singletonMap("FIRSTNAME", new String[] { "Joe", "Roger" }),
Collections.singletonMap("LASTNAME", new String[] { "Jackson", "Waters" }))},
Collections.singletonMap("LASTNAME", new String[] { "Jackson", "Waters" })),
Collections.emptyMap()},
{ "SELECT * FROM NAME WHERE id = 2", Arrays.asList(Collections.singletonMap("ID", new String[] { "2" }),
Collections.singletonMap("FIRSTNAME", new String[] { "Roger" }),
Collections.singletonMap("LASTNAME", new String[] { "Waters" }))},
{ "SELECT * FROM NAME WHERE id = 99", Collections.emptyList()}
Collections.singletonMap("LASTNAME", new String[] { "Waters" })),
Collections.emptyMap()},
{ "SELECT * FROM NAME WHERE id = 99", Collections.emptyList(), Collections.emptyMap()},
{ "INSERT INTO NAME (firstname, lastname) VALUES ('Kurt', 'Cobain')",
Collections.singletonList(Collections.singletonMap("ID", new String[]{"3"})),
Collections.emptyMap()}
});
}

Expand All @@ -99,26 +132,22 @@ public static Collection<Object[]> data() {

@Test
public void sqlStartConnectorTest() throws Exception {
MockEndpoint mock = context.getEndpoint("mock:result", MockEndpoint.class);
mock.expectedMessageCount(1);

ProducerTemplate template = context.createProducerTemplate();
template.sendBody("direct:start", null);

mock.assertIsSatisfied();

Exchange exchange = mock.getExchanges().get(0);
List<?> body = exchange.getIn().getBody(List.class);
List<Properties> jsonBeans = body.stream()
.map(Object::toString)
.map(JSONBeanUtil::parsePropertiesFromJSONBean)
.collect(Collectors.toList());
String body;
if (parameters.isEmpty()) {
body = null;
} else {
body = JSONBeanUtil.toJSONBean(parameters);
}

@SuppressWarnings("unchecked")
List<String> jsonBeans = template.requestBody("direct:start", body, List.class);

Assert.assertEquals(expectedResults.isEmpty(), jsonBeans.isEmpty());

for (Map<String, String[]> result : expectedResults) {
for (Map.Entry<String, String[]> resultEntry : result.entrySet()) {
validateProperty(jsonBeans, resultEntry.getKey(), resultEntry.getValue());
validateJson(jsonBeans, resultEntry.getKey(), resultEntry.getValue());
}
}
}
Expand Down

0 comments on commit e14633a

Please sign in to comment.