projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix of human readable size and media info
[mir.git]
/
source
/
mir
/
producer
/
ExternalDbProducerNode.java
diff --git
a/source/mir/producer/ExternalDbProducerNode.java
b/source/mir/producer/ExternalDbProducerNode.java
index
301ed80
..
69f5a45
100755
(executable)
--- a/
source/mir/producer/ExternalDbProducerNode.java
+++ b/
source/mir/producer/ExternalDbProducerNode.java
@@
-29,13
+29,18
@@
*/
package mir.producer;
*/
package mir.producer;
-import mir.util.ExceptionRoutines;
import mir.util.ParameterExpander;
import mir.util.ParameterExpander;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.Statement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
public class ExternalDbProducerNode extends ProducerNodeDecorator {
private String key;
public class ExternalDbProducerNode extends ProducerNodeDecorator {
private String key;
@@
-71,12
+76,13
@@
public class ExternalDbProducerNode extends ProducerNodeDecorator {
String expandedPassword = ParameterExpander.expandExpression(aProductionContext.getValueSet(), password);
String expandedQuery = ParameterExpander.expandExpression(aProductionContext.getValueSet(), query);
String expandedPassword = ParameterExpander.expandExpression(aProductionContext.getValueSet(), password);
String expandedQuery = ParameterExpander.expandExpression(aProductionContext.getValueSet(), query);
- if (
expandedDriver.equals("postgresql"
)) {
+ if (
"postgresql".equals(expandedDriver
)) {
Class.forName("org.postgresql.Driver");
}
Class.forName("org.postgresql.Driver");
}
- if (
expandedDriver.equals("mysql"
)) {
+ if (
"mysql".equals(expandedDriver
)) {
Class.forName("com.mysql.jdbc.Driver");
Class.forName("com.mysql.jdbc.Driver");
- } else {
+ }
+ else {
throw new Exception("Unsupported DB Driver:" + expandedDriver);
}
throw new Exception("Unsupported DB Driver:" + expandedDriver);
}
@@
-88,13
+94,13
@@
public class ExternalDbProducerNode extends ProducerNodeDecorator {
ResultSet rs = st.executeQuery(expandedQuery);
ResultSetMetaData rsmd = rs.getMetaData();
int numberOfColumns = rsmd.getColumnCount();
ResultSet rs = st.executeQuery(expandedQuery);
ResultSetMetaData rsmd = rs.getMetaData();
int numberOfColumns = rsmd.getColumnCount();
-
Array
List fieldNames = new ArrayList(numberOfColumns);
+ List fieldNames = new ArrayList(numberOfColumns);
for (int i = 0; i < numberOfColumns; i++) {
fieldNames.add(rsmd.getColumnName(i + 1));
}
while (rs.next() && !isAborted(aProductionContext)) {
for (int i = 0; i < numberOfColumns; i++) {
fieldNames.add(rsmd.getColumnName(i + 1));
}
while (rs.next() && !isAborted(aProductionContext)) {
-
Hash
Map result = new HashMap();
+ Map result = new HashMap();
Iterator fields = fieldNames.iterator();
while (fields.hasNext()) {
String field = (String) fields.next();
Iterator fields = fieldNames.iterator();
while (fields.hasNext()) {
String field = (String) fields.next();