diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2015-10-28 17:41:44 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2015-10-28 17:53:48 +0100 |
| commit | 0bc79eef361334040b41385953aaebb81e82b33c (patch) | |
| tree | 24f38ff71b91fbb4febce565d5cec52b078a8e4d /wizards/com/sun/star/wizards/db | |
| parent | 189c3a553ed962ed6d024f3a7c920e2f0c8f7138 (diff) | |
base new query wizard: fix confusion between display name and field name
Change-Id: I75354ffea2daede55b34e4cf3321d57196be3d9b
Diffstat (limited to 'wizards/com/sun/star/wizards/db')
| -rw-r--r-- | wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 26 |
1 files changed, 22 insertions, 4 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) |