mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base new query wizard: fix confusion between display name and field name

Browse Source 
Change-Id: I75354ffea2daede55b34e4cf3321d57196be3d9b
This commit is contained in:
Lionel Elie Mamane 2015-10-28 17:41:44 +01:00
parent 189c3a553e
commit 0bc79eef36
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wizards/com/sun/star/wizards/db/SQLQueryComposer.java
View File

@ -77,7 +77,7 @@ public class SQLQueryComposer
int iAggregate = CurDBMetaData.getAggregateIndex(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
if (iAggregate > -1)
{
sSelectClause += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + getComposedAliasFieldName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + ")";
sSelectClause += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + getComposedAliasDisplayName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + ")";
if (_baddAliasFieldNames)
{
sSelectClause += getAliasFieldNameClause(CurDBMetaData.AggregateFieldNames[iAggregate][0]);
@ -85,7 +85,7 @@ public class SQLQueryComposer
}
else
{
sSelectClause += getComposedAliasFieldName(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
sSelectClause += getComposedAliasDisplayName(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
if (_baddAliasFieldNames)
{
sSelectClause += getAliasFieldNameClause(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
@ -181,7 +181,7 @@ public class SQLQueryComposer
{
sOrder += ", ";
}
sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + getComposedAliasFieldName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + ")";
sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + getComposedAliasDisplayName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + ")";
sOrder += " " + CurDBMetaData.getSortFieldNames()[i][1];
m_queryComposer.setOrder(sOrder);
}
@ -307,7 +307,7 @@ public class SQLQueryComposer
}
}
private String getComposedAliasFieldName(String _fieldname)
private String getComposedAliasDisplayName(String _fieldname)
{
FieldColumn CurFieldColumn = CurDBMetaData.getFieldColumnByDisplayName(_fieldname);
final String curCommandName = CurFieldColumn.getCommandName();
@ -325,6 +325,24 @@ public class SQLQueryComposer
return quoteName(curAliasName) + "." + quoteName(curFieldName);
}
private String getComposedAliasFieldName(String _fieldname)
{
FieldColumn CurFieldColumn = CurDBMetaData.getFieldColumnByFieldName(_fieldname);
final String curCommandName = CurFieldColumn.getCommandName();
final String curFieldName = CurFieldColumn.getFieldName();
CommandName curComposedCommandName = getComposedCommandByDisplayName(curCommandName);
if (curComposedCommandName == null)
{
//return _fieldname;
if ( curCommandName.length() > 0 )
return quoteName(curCommandName) + "." + quoteName(curFieldName);
else
return quoteName(curFieldName);
}
String curAliasName = curComposedCommandName.getAliasName();
return quoteName(curAliasName) + "." + quoteName(curFieldName);
}
private CommandName getComposedCommandByAliasName(String _AliasName)
{
if (composedCommandNames != null)

4
wizards/com/sun/star/wizards/ui/FilterComponent.java
View File

@ -119,7 +119,7 @@ public class FilterComponent
String sControlNameSuffix = sIncSuffix + "_" + getIndexNumber(sControlName);
XListBox xCurFieldListBox = UnoRuntime.queryInterface(XListBox.class, CurUnoDialog.xDlgContainer.getControl(sControlName));
String CurDisplayFieldName = xCurFieldListBox.getSelectedItem();
FieldColumn CurFieldColumn = new FieldColumn(oQueryMetaData, CurDisplayFieldName);
FieldColumn CurFieldColumn = oQueryMetaData.getFieldColumnByDisplayName(CurDisplayFieldName);
String sControlNameTextValue = "txtValue" + sControlNameSuffix;
XControl xValueControl = CurUnoDialog.xDlgContainer.getControl(sControlNameTextValue);
@ -303,7 +303,7 @@ public class FilterComponent
String FieldName;
if (_CurDBMetaData != null)
{
FieldColumn CurDBFieldColumn = _CurDBMetaData.getFieldColumnByDisplayName(_filtercondition.Name);
FieldColumn CurDBFieldColumn = _CurDBMetaData.getFieldColumnByFieldName(_filtercondition.Name);
FieldName = CurDBFieldColumn.getFieldTitle();
}
else