Merge pull request #12 from djunglas/master

Support username/password and slightly improve write performance.

Author: vlkong

lib/jdbc-custom-data-source.jar

@@ -30,6 +30,23 @@ public class JdbcConfiguration {
     private String _url = null;
     private String _user = null;
     private String _password = null;
+
+    /** Resolve <code>s</code> using environment variables.
+     * If <code>s</code> starts with "$" and is the name of an existing
+     * environment variable then return the value of that variable, otherwise
+     * return <code>s</code>.
+     * @param s The string to resolve.
+     * @return The value of environment variable <code>s</code> if such a
+     *         variable exists, <code>s</code> otherwise.
+     */
+    private static String resolveString(String s) {
+        if ( s == null || s.length() < 2 || s.charAt(0) != '$' )
+            return s;
+        final String value = System.getenv(s.substring(1));
+        if ( value != null )
+            return value;
+        return s;
+    }
 
     /**
      * Creates a new JDBC configuration.
@@ -46,11 +63,19 @@ public void setUrl(String url) {
     }
 
     public String getUser() {
-        return _user;
+        return resolveString(_user);
+    }
+
+    public void setUser(String user) {
+        _user = user;
     }
 
     public String getPassword() {
-        return _password;
+        return resolveString(_password);
+    }
+
+    public void setPassword(String password) {
+        _password = password;
     }
 
     public Properties getReadQueries() {

src/main/java/com/ibm/opl/customdatasource/JdbcConfiguration.java

@@ -102,16 +102,14 @@ String getInsertQuery(IloTupleSchema schema, String table) {
       return query;
     }
 
-    void updateValues(IloTuple tuple, IloTupleSchema schema, 
-                      IloOplTupleSchemaDefinition tupleSchemaDef, PreparedStatement stmt) throws SQLException {
-      for (int i = 0; i < schema.getSize(); i++) {
+    void updateValues(IloTuple tuple, PreparedStatement stmt, Type[] columnType) throws SQLException {
+      for (int i = 0; i < columnType.length; i++) {
           int index = i+1;  // index in PreparedStatement
-          Type columnType = tupleSchemaDef.getComponent(i).getElementDefinitionType();
-          if (columnType == Type.INTEGER)
+          if (columnType[i] == Type.INTEGER)
               stmt.setInt(index, tuple.getIntValue(i));
-          else if (columnType == Type.FLOAT)
+          else if (columnType[i] == Type.FLOAT)
               stmt.setDouble(index, tuple.getNumValue(i));
-          else if (columnType == Type.STRING)
+          else if (columnType[i] == Type.STRING)
               stmt.setString(index, tuple.getStringValue(i));
       }
     }
@@ -149,14 +147,17 @@ void customWrite(String name, String table) {
             try {
               IloOplElementDefinition tupleDef = _def.getElementDefinition(schema.getName());
               IloOplTupleSchemaDefinition tupleSchemaDef = tupleDef.asTupleSchema();
+              final Type[] columnType = new Type[schema.getSize()];
+              for (int i = 0; i < columnType.length; ++i)
+                  columnType[i] = tupleSchemaDef.getComponent(i).getElementDefinitionType();
 
               conn.setAutoCommit(false); // begin transaction
               String psql = getInsertQuery(schema, table);
               PreparedStatement pstmt = conn.prepareStatement(psql);
               // iterate the set and create the final insert statement
               for (java.util.Iterator it1 = tupleSet.iterator(); it1.hasNext();) {
                   IloTuple tuple = (IloTuple) it1.next();
-                  updateValues(tuple, schema, tupleSchemaDef, pstmt);
+                  updateValues(tuple, pstmt, columnType);
                   pstmt.executeUpdate();
               }
               conn.commit();
@@ -175,4 +176,4 @@ void customWrite(String name, String table) {
             }
         }
     }
-}
+}