Skip to content

case sensitive column support #33

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

Open
rajputkalyan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

case sensitive column support #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/org/relique/jdbc/csv/ColumnName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ColumnName extends Expression

public ColumnName(String columnName)
{
this.columnName = columnName.toUpperCase();
this.columnName = columnName;
}

public String getColumnName()
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -158,7 +158,7 @@ private String[] getUpperColumnNames()
String columnNames[] = getColumnNames();
upperColumnNames = new String[columnNames.length];
for (int i = 0; i < upperColumnNames.length; i++)
upperColumnNames[i] = columnNames[i].toUpperCase();
upperColumnNames[i] = columnNames[i];
}
return upperColumnNames;
}
Expand Down
12 changes: 6 additions & 6 deletions 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 @@ -272,7 +272,7 @@ protected CsvResultSet(CsvStatement statement,
HashSet<String> allReaderColumns = new HashSet<String>();
for (int i = 0; i < columnNames.length; i++)
{
String columnName = columnNames[i].toUpperCase();
String columnName = columnNames[i];
allReaderColumns.add(columnName);
if (tableName != null)
allReaderColumns.add(tableName.toUpperCase() + "." + columnName);
Expand Down Expand Up @@ -504,7 +504,7 @@ protected CsvResultSet(CsvStatement statement,
List<String> copy = new LinkedList<String>();
for (String usedColumn : exprUsedColumns)
{
if (allReaderColumns.contains(usedColumn.toUpperCase()))
if (allReaderColumns.contains(usedColumn))
copy.add(usedColumn);
}
exprUsedColumns = copy;
Expand Down Expand Up @@ -1014,12 +1014,12 @@ private Map<String, Object> updateRecordEnvironment(boolean thereWasAnAnswer) th
Object[] o = queryEnvironment.get(i);
String key = (String) o[0];
Object value = ((Expression) o[1]).eval(recordEnvironment);
objectEnvironment.put(key.toUpperCase(), value);
objectEnvironment.put(key, value);
}
for (int i=0; i<usedColumns.size(); i++)
{
String key = usedColumns.get(i);
key = key.toUpperCase();
//key = key.toUpperCase();
if (recordEnvironment.containsKey(key))
objectEnvironment.put(key, recordEnvironment.get(key));
}
Expand Down Expand Up @@ -1436,7 +1436,7 @@ public ResultSetMetaData getMetaData() throws SQLException
for(int i=0; i<readerTypeNames.length; i++)
{
Object literal = StringConverter.getLiteralForTypeName(readerTypeNames[i]);
String columnName = readerColumnNames[i].toUpperCase();
String columnName = readerColumnNames[i];
env.put(columnName, literal);
allReaderColumns.add(columnName);
if (tableName != null)
Expand All @@ -1460,7 +1460,7 @@ public ResultSetMetaData getMetaData() throws SQLException
columnNames[i] = (String)o[0];
for (int j = 0; j < readerColumnNames.length; j++)
{
if (columnNames[i].equalsIgnoreCase(readerColumnNames[j]))
if (columnNames[i].equals(readerColumnNames[j]))
{
/*
* Use original case of column name in CSV file.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/relique/jdbc/csv/QueryEnvEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class QueryEnvEntry extends Expression

public QueryEnvEntry(String fieldName, Expression exp)
{
this.key = fieldName.toUpperCase();
this.key = fieldName;
this.expression = exp;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/relique/jdbc/csv/SQLUserFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class SQLUserFunction extends Expression

public SQLUserFunction(String name, List<Expression> expressions)
{
this.name = name.toUpperCase();
this.name = name;
this.expressions = expressions;
}

Expand Down