thorsten.muerell/frog-runner
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed input format to JSON

Browse Source
This commit is contained in:
Thorsten Muerell
2017-11-01 22:45:39 +01:00
parent a31b0c9286
commit 3848496c5c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/at/compax/tools/sql/main/Main.java
View File

@@ -19,6 +19,7 @@ import at.compax.tools.sql.ConnectionParameters;
import at.compax.tools.sql.FrogConnection; import at.compax.tools.sql.FrogConnection;
import at.compax.tools.sql.SqlExecutionException; import at.compax.tools.sql.SqlExecutionException;
import at.compax.tools.sql.SqlExecutor; import at.compax.tools.sql.SqlExecutor;
import at.compax.tools.sql.model.QueryParameter;
import at.compax.tools.sql.model.QueryResult; import at.compax.tools.sql.model.QueryResult;
import at.compax.tools.sql.model.Result; import at.compax.tools.sql.model.Result;
import at.compax.tools.sql.model.UserError; import at.compax.tools.sql.model.UserError;
@@ -185,10 +186,13 @@ public class Main {
if (!"--- END ---".equals(line)) { if (!"--- END ---".equals(line)) {
commandBuffer.append(line).append("\n"); commandBuffer.append(line).append("\n");
} else { } else {
String query = commandBuffer.toString().trim(); ObjectMapper mapper = new ObjectMapper();
QueryParameter queryParameter = mapper.readValue(commandBuffer.toString(), QueryParameter.class);
String query = queryParameter.getSql();
String result; String result;
if (query.toLowerCase().startsWith("select")) { if (query.toLowerCase().startsWith("select")) {
result = formatJsonObject(SqlExecutor.executeQuery(conn, query, null)); result = formatJsonObject(SqlExecutor.executeQuery(conn, query, queryParameter.getRowLimit()));
} else if (query.toLowerCase().startsWith("update") || query.toLowerCase().startsWith("insert")) { } else if (query.toLowerCase().startsWith("update") || query.toLowerCase().startsWith("insert")) {
result = formatJsonObject(SqlExecutor.executeUpdate(conn, query)); result = formatJsonObject(SqlExecutor.executeUpdate(conn, query));
} else { } else {

1
src/main/java/at/compax/tools/sql/model/QueryParameter.java
View File

@@ -14,5 +14,6 @@ import lombok.ToString;
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class QueryParameter { public class QueryParameter {
private String sql; private String sql;
private Long rowLimit;
private List<Object> parameters; private List<Object> parameters;
} }