Author: [log in to unmask]
Date: Mon Jul 6 14:39:25 2015
New Revision: 3227
Log:
Make sure Connectio and TableMetaData are set on object. Fix custom delimiter not using headers.
Modified:
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java Mon Jul 6 14:39:25 2015
@@ -360,6 +360,8 @@
insertStatement = this.connection.prepareStatement(this.buildInsertStatement(),
Statement.RETURN_GENERATED_KEYS);
for (final ObjectType object : this) {
+ object.setConnection(this.connection);
+ object.setTableMetaData(this.tableMetaData);
ConditionsObjectUtilities.setupPreparedStatement(insertStatement, object);
insertStatement.executeUpdate();
final ResultSet resultSet = insertStatement.getGeneratedKeys();
@@ -452,7 +454,7 @@
csvFileFormat = CSVFormat.TDF.withHeader();
} else {
// Custom delimiter was provided.
- csvFileFormat = CSVFormat.newFormat(delimiter);
+ csvFileFormat = CSVFormat.newFormat(delimiter).withHeader();
}
}
|