diff --git a/.classpath b/.classpath
index e43402f..f619a53 100644
--- a/.classpath
+++ b/.classpath
@@ -6,22 +6,12 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..c5f3f6b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e5a666b..b762169 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
-
+
4.0.0
at.compax.tools
frog-runner
0.0.1-SNAPSHOT
UTF-8
-
2.3.2
2.9
@@ -21,7 +21,6 @@
11.2.0.2.0
2.5.0
-
@@ -38,7 +37,6 @@
**/*Test.java
-
org.apache.maven.plugins
@@ -49,9 +47,22 @@
1.7
+
+ maven-assembly-plugin
+ 3.1.0
+
+
+ jar-with-dependencies
+
+
+
+ at.compax.tools.sql.main.Main
+
+
+
+
-
oracle
@@ -84,27 +95,4 @@
test
-
-
-
- public
- http://nexus.int.compax.at:8081/nexus/content/groups/public/
-
-
- compax
- http://nexus.int.compax.at:8081/nexus/content/repositories/compax
-
-
-
-
- compax-snapshot
- http://nexus.int.compax.at:8081/nexus/content/repositories/compax-snapshot
-
-
-
-
- compax-thirdparty
- http://nexus.int.compax.at:8081/nexus/content/repositories/thirdparty
-
-
\ No newline at end of file
diff --git a/src/main/java/at/compax/tools/sql/main/Main.java b/src/main/java/at/compax/tools/sql/main/Main.java
index 7b68bd5..2a4ca52 100644
--- a/src/main/java/at/compax/tools/sql/main/Main.java
+++ b/src/main/java/at/compax/tools/sql/main/Main.java
@@ -3,6 +3,7 @@ package at.compax.tools.sql.main;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.nio.charset.Charset;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
@@ -94,22 +95,59 @@ public class Main {
return sb.toString();
}
+ public static void runTests() {
+ try {
+ // String stdInSql = readFromStdIn();
+
+ @Cleanup
+ Connection conn = getConnection("172.19.13.66", 1521L, "aax2qc", "aax2qc", "aax2qc");
+
+ ObjectMapper mapper = new ObjectMapper();
+
+ System.out.println(mapper.writeValueAsString(compileExampleSpec(conn)));
+ System.out.println(mapper.writeValueAsString(compileExampleSpecWithErrors(conn)));
+ System.out.println(mapper.writeValueAsString(executeExampleQueryWithException(conn)));
+ System.out.println(mapper.writeValueAsString(executeExampleQueryWithoutParameter(conn)));
+ System.out.println(mapper.writeValueAsString(executeExampleQueryWithParameter(conn)));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
public static void main(String[] args) throws Exception {
BasicConfigurator.configure();
LogManager.getLogger("at.compax.tools.sql.main").setLevel(Level.ALL);
LogManager.getLogger("at.compax.tools.sql").setLevel(Level.ALL);
-
- // String stdInSql = readFromStdIn();
-
- @Cleanup
- Connection conn = getConnection("172.19.13.66", 1521L, "aax2qc", "aax2qc", "aax2qc");
-
ObjectMapper mapper = new ObjectMapper();
+
+ if (args.length == 0) {
+ runTests();
+ } else {
+ if (args.length < 4)
+ throw new IllegalArgumentException("Arguments: Host Port sid username password");
+
+ String host = args[0];
+ long port = Long.parseLong(args[1]);
+ String sid = args[2];
+ String username = args[3];
+ String password = args[4];
+
+ @Cleanup
+ Connection conn = getConnection(host, port, sid, username, password);
+
+ BufferedReader br = new BufferedReader(new InputStreamReader(System.in, Charset.forName("UTF-8")));
+ String line;
+ StringBuffer commandBuffer = new StringBuffer();
+
+ while ((line = br.readLine()) != null) {
+ if (!"--- END ---".equals(line)) {
+ commandBuffer.append(line);
+ } else {
+ System.out.println(mapper.writeValueAsString(SqlExecutor.executeQuery(conn, commandBuffer.toString())));
+ commandBuffer.setLength(0);
+ }
+ }
- System.out.println(mapper.writeValueAsString(compileExampleSpec(conn)));
- System.out.println(mapper.writeValueAsString(compileExampleSpecWithErrors(conn)));
- System.out.println(mapper.writeValueAsString(executeExampleQueryWithException(conn)));
- System.out.println(mapper.writeValueAsString(executeExampleQueryWithoutParameter(conn)));
- System.out.println(mapper.writeValueAsString(executeExampleQueryWithParameter(conn)));
+ }
}
}