diff options
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 26 | ||||
| -rw-r--r-- | wizards/com/sun/star/wizards/ui/FilterComponent.java | 4 |
2 files changed, 24 insertions, 6 deletions
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java index 8305f0980b95..4a7a679f3479 100644 --- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java +++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java @@ -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) diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index ab6fa7a506cc..38af3bc0f802 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -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 |