Merge remote-tracking branch 'upstream/master'

Author: vlkong

examples/embedded_in_dat/README.md

@@ -1,4 +1,4 @@
-# Example using IloOplCallJava
+# Example using IloOplCallJava in .dat files
 
 This sample is basically the same as [ilo_opl_call_java](../ilo_opl_call_java).
 

lib/jdbc-custom-data-source.jar

@@ -54,6 +54,23 @@ public OutputParameters(boolean autodrop,
     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.
@@ -70,17 +87,17 @@ 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;
     }

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

@@ -112,19 +112,19 @@ 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++) {
-          int index = i+1;  // index in PreparedStatement
-          Type columnType = tupleSchemaDef.getComponent(i).getElementDefinitionType();
-          if (columnType == Type.INTEGER)
-              stmt.setInt(index, tuple.getIntValue(i));
-          else if (columnType == Type.FLOAT)
-              stmt.setDouble(index, tuple.getNumValue(i));
-          else if (columnType == Type.STRING)
-              stmt.setString(index, tuple.getStringValue(i));
-      }
+  void updateValues(IloTuple tuple, IloTupleSchema schema,
+      IloOplTupleSchemaDefinition tupleSchemaDef, PreparedStatement stmt) throws SQLException {
+    for (int i = 0; i < schema.getSize(); i++) {
+      int index = i + 1; // index in PreparedStatement
+      Type columnType = tupleSchemaDef.getComponent(i).getElementDefinitionType();
+      if (columnType == Type.INTEGER)
+        stmt.setInt(index, tuple.getIntValue(i));
+      else if (columnType == Type.FLOAT)
+        stmt.setDouble(index, tuple.getNumValue(i));
+      else if (columnType == Type.STRING)
+        stmt.setString(index, tuple.getStringValue(i));
     }
+  }
 
     static final String DROP_QUERY = "DROP TABLE %";
 
@@ -173,6 +173,9 @@ void customWrite(String name, OutputParameters op) {
             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();
 
               String psql = null;
               if (op.outputTable != null && op.insertStatement == null) {
@@ -222,4 +225,4 @@ void customWrite(String name, OutputParameters op) {
             }
         }
     }
-}
+}