Skip to content

125 Return column names in original case from .csv file #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simoc merged 3 commits into from
Aug 10, 2016
Merged

125 Return column names in original case from .csv file #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
953c35d
125 Return column names in original case from .csv file
barogi Aug 8, 2016
9e0b9a4
Fix: compilation under jdk 1.7
barogi Aug 8, 2016
e37829e
Remove drafts
barogi Aug 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/org/relique/jdbc/csv/CsvReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,10 @@ private String[] getUpperColumnNames()
{
if (upperColumnNames == null)
{
upperColumnNames = getColumnNames();
String columnNames[] = getColumnNames();
upperColumnNames = new String[ columnNames.length ];
for (int i = 0; i < upperColumnNames.length; i++)
upperColumnNames[i] = upperColumnNames[i].toUpperCase();
upperColumnNames[i] = columnNames[i].toUpperCase();
}
return upperColumnNames;
}
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/org/relique/jdbc/csv/CsvResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,12 +1417,14 @@ public ResultSetMetaData getMetaData() throws SQLException
*/
HashSet<String> allReaderColumns = new HashSet<String>();
HashMap<String, Object> env = new HashMap<String, Object>();
Map<String, String> originalColumnNames = new HashMap();
for(int i=0; i<readerTypeNames.length; i++)
{
Object literal = StringConverter.getLiteralForTypeName(readerTypeNames[i]);
String columnName = readerColumnNames[i].toUpperCase();
env.put(columnName, literal);
allReaderColumns.add(columnName);
originalColumnNames.put(columnName, readerColumnNames[i]);
if (tableName != null)
{
env.put(tableName.toUpperCase() + "." + columnName, literal);
Expand All @@ -1441,7 +1443,12 @@ public ResultSetMetaData getMetaData() throws SQLException
for(int i=0; i<columnCount; i++)
{
Object[] o = queryEnvironment.get(i);
columnNames[i] = (String)o[0];
String originalName = originalColumnNames.get(((String)o[0]).toUpperCase());
columnNames[i] = originalName != null
? originalName
: (String)o[0];

//TODO: The suggested title is usually specified by the SQL AS clause.
columnLabels[i] = columnNames[i];

/*
Expand Down
22 changes: 11 additions & 11 deletions src/test/java/org/relique/jdbc/csv/TestCsvDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,8 @@ public void testMetadataColumnLabels() throws SQLException

assertEquals("name of column 1 is incorrect", "XID", metadata.getColumnName(1));
assertEquals("label of column 1 is incorrect", "XID", metadata.getColumnLabel(1));
assertEquals("name of column 2 is incorrect", "NAME", metadata.getColumnName(2));
assertEquals("label of column 2 is incorrect", "NAME", metadata.getColumnLabel(2));
assertEquals("name of column 2 is incorrect", "Name", metadata.getColumnName(2));
assertEquals("label of column 2 is incorrect", "Name", metadata.getColumnLabel(2));
assertEquals("name of column 3 is incorrect", "DEPT", metadata.getColumnName(3));
assertEquals("label of column 3 is incorrect", "DEPT", metadata.getColumnLabel(3));

Expand Down Expand Up @@ -1880,13 +1880,13 @@ public void testFromIndexedTable() throws SQLException
"test"));

assertEquals("Incorrect Column Name 1", metadata.getColumnName(1),
"LOCATION");
"location");
assertEquals("Incorrect Column Name 2", metadata.getColumnName(2),
"STATION");
"Station");
assertEquals("Incorrect Column Name 3", metadata.getColumnName(3),
"DATUM");
"Datum");
assertEquals("Incorrect Column Name 4", metadata.getColumnName(4),
"TIJD");
"Tijd");

assertTrue(results.next());
for (int i = 1; i < 12; i++)
Expand Down Expand Up @@ -1939,15 +1939,15 @@ public void testFromIndexedTablePrepend() throws SQLException
"test"));

assertEquals("Incorrect Column Name 1", metadata.getColumnName(1),
"LOCATION");
"location");
assertEquals("Incorrect Column Name 1", metadata.getColumnName(2),
"FILE_DATE");
"file_date");
assertEquals("Incorrect Column Name 1", metadata.getColumnName(3),
"DATUM");
"Datum");
assertEquals("Incorrect Column Name 2", metadata.getColumnName(4),
"TIJD");
"Tijd");
assertEquals("Incorrect Column Name 3", metadata.getColumnName(5),
"STATION");
"Station");

assertTrue(results.next());
for (int i = 1; i < 12; i++)
Expand Down