From 596887443c4178afcf88e64b6de75984749f8b88 Mon Sep 17 00:00:00 2001
From: Thorsten Muerell <thorsten@muerell.de>
Date: Mon, 30 Oct 2017 10:58:45 +0100
Subject: [PATCH] Made runner configurable

---
 .classpath                                    | 10 ----
 .vscode/settings.json                         |  3 +
 pom.xml                                       | 46 ++++++--------
 .../java/at/compax/tools/sql/main/Main.java   | 60 +++++++++++++++----
 4 files changed, 69 insertions(+), 50 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.classpath b/.classpath
index e43402f..f619a53 100644
--- a/.classpath
+++ b/.classpath
@@ -6,22 +6,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
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 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project 
+	xmlns="http://maven.apache.org/POM/4.0.0" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.compax.tools</groupId>
 	<artifactId>frog-runner</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
 		<!-- PLUGINS -->
 		<compiler.plugin.version>2.3.2</compiler.plugin.version>
 		<surefire.version>2.9</surefire.version>
@@ -21,7 +21,6 @@
 		<oracleDriver.version>11.2.0.2.0</oracleDriver.version>
 		<xmlbeans.version>2.5.0</xmlbeans.version>
 	</properties>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -38,7 +37,6 @@
 						<include>**/*Test.java</include>
 					</includes>
 				</configuration>
-
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -49,9 +47,22 @@
 					<target>1.7</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+					<archive>
+						<manifest>
+							<mainClass>at.compax.tools.sql.main.Main</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
-
 	<dependencies>
 		<dependency>
 			<groupId>oracle</groupId>
@@ -84,27 +95,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-
-	<repositories>
-		<repository>
-			<id>public</id>
-			<url>http://nexus.int.compax.at:8081/nexus/content/groups/public/</url>
-		</repository>
-		<repository>
-			<id>compax</id>
-			<url>http://nexus.int.compax.at:8081/nexus/content/repositories/compax</url>
-			<releases>
-			</releases>
-		</repository>
-		<repository>
-			<id>compax-snapshot</id>
-			<url>http://nexus.int.compax.at:8081/nexus/content/repositories/compax-snapshot</url>
-			<snapshots>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>compax-thirdparty</id>
-			<url>http://nexus.int.compax.at:8081/nexus/content/repositories/thirdparty</url>
-		</repository>
-	</repositories>
 </project>
\ 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)));
+		}
 	}
 }