midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BF [ 2549128 ] Report View Column not working at all 

https://sourceforge.net/tracker/index.php?func=detail&aid=2549128&group_id=176962&atid=879332

Please help me with a review ;)
This commit is contained in:
teo_sarca 2009-01-30 15:20:13 +00:00
parent ece8b5ce20
commit d1d67a8d65
1 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
base/src/org/compiere/print/DataEngine.java
View File

@ -51,6 +51,7 @@ import org.compiere.util.ValueNamePair;
* @author Teo Sarca, SC ARHIPAC SERVICE SRL * @author Teo Sarca, SC ARHIPAC SERVICE SRL
* <li>BF [ 1761891 ] Included print format with report view attached issue * <li>BF [ 1761891 ] Included print format with report view attached issue
* <li>BF [ 1807368 ] DataEngine does not close DB connection * <li>BF [ 1807368 ] DataEngine does not close DB connection
* <li>BF [ 2549128 ] Report View Column not working at all
* @author victor.perez@e-evolution.com * @author victor.perez@e-evolution.com
* <li>FR [ 2011569 ] Implementing new Summary flag in Report View http://sourceforge.net/tracker/index.php?func=detail&aid=2011569&group_id=176962&atid=879335 * <li>FR [ 2011569 ] Implementing new Summary flag in Report View http://sourceforge.net/tracker/index.php?func=detail&aid=2011569&group_id=176962&atid=879335
*/ */
@ -205,9 +206,8 @@ public class DataEngine
// Direct SQL w/o Reference Info // Direct SQL w/o Reference Info
StringBuffer sqlSELECT = new StringBuffer("SELECT "); StringBuffer sqlSELECT = new StringBuffer("SELECT ");
StringBuffer sqlFROM = new StringBuffer(" FROM "); StringBuffer sqlFROM = new StringBuffer(" FROM ").append(tableName);
sqlFROM.append(tableName); ArrayList<String> groupByColumns = new ArrayList<String>();
StringBuffer sqlGROUP = new StringBuffer(" GROUP BY ");
// //
boolean IsGroupedBy = false; boolean IsGroupedBy = false;
// //
@ -303,11 +303,14 @@ public class DataEngine
{ {
// => Table.Column, // => Table.Column,
sqlSELECT.append(tableName).append(".").append(ColumnName).append(","); sqlSELECT.append(tableName).append(".").append(ColumnName).append(",");
sqlGROUP.append(tableName).append(".").append(ColumnName).append(","); groupByColumns.add(tableName+"."+ColumnName);
pdc = new PrintDataColumn(AD_Column_ID, ColumnName, AD_Reference_ID, FieldLength, KEY, isPageBreak); // KeyColumn pdc = new PrintDataColumn(AD_Column_ID, ColumnName, AD_Reference_ID, FieldLength, KEY, isPageBreak); // KeyColumn
} }
else if (!IsPrinted) // not printed Sort Columns // not printed Sort Columns
else if (!IsPrinted)
{
; ;
}
// -- Parent, TableDir (and unqualified Search) -- // -- Parent, TableDir (and unqualified Search) --
else if (IsParent else if (IsParent
|| AD_Reference_ID == DisplayType.TableDir || AD_Reference_ID == DisplayType.TableDir
@ -332,8 +335,8 @@ public class DataEngine
// => (..) AS AName, Table.ID, // => (..) AS AName, Table.ID,
sqlSELECT.append("(").append(eSql).append(") AS ").append(m_synonym).append(display).append(",") sqlSELECT.append("(").append(eSql).append(") AS ").append(m_synonym).append(display).append(",")
.append(tableName).append(".").append(ColumnName).append(","); .append(tableName).append(".").append(ColumnName).append(",");
sqlGROUP.append(m_synonym).append(display).append(",") groupByColumns.add(m_synonym+display);
.append(tableName).append(".").append(ColumnName).append(","); groupByColumns.add(tableName+"."+ColumnName);
orderName = m_synonym + display; orderName = m_synonym + display;
// //
pdc = new PrintDataColumn(AD_Column_ID, ColumnName, AD_Reference_ID, FieldLength, orderName, isPageBreak); pdc = new PrintDataColumn(AD_Column_ID, ColumnName, AD_Reference_ID, FieldLength, orderName, isPageBreak);
@ -358,8 +361,8 @@ public class DataEngine
sqlSELECT.append(m_synonym).append(".").append(display); sqlSELECT.append(m_synonym).append(".").append(display);
sqlSELECT.append(" AS ").append(m_synonym).append(display).append(",") sqlSELECT.append(" AS ").append(m_synonym).append(display).append(",")
.append(tableName).append(".").append(ColumnName).append(","); .append(tableName).append(".").append(ColumnName).append(",");
sqlGROUP.append(m_synonym).append(".").append(display).append(",") groupByColumns.add(m_synonym+display);
.append(tableName).append(".").append(ColumnName).append(","); groupByColumns.add(tableName+"."+ColumnName);
orderName = m_synonym + display; orderName = m_synonym + display;
// => x JOIN table A ON (x.KeyColumn=A.Key) // => x JOIN table A ON (x.KeyColumn=A.Key)
@ -388,7 +391,7 @@ public class DataEngine
{ {
// => A.Name AS AName, // => A.Name AS AName,
sqlSELECT.append(m_synonym).append(".Name AS ").append(m_synonym).append("Name,"); sqlSELECT.append(m_synonym).append(".Name AS ").append(m_synonym).append("Name,");
sqlGROUP.append(m_synonym).append(".Name,"); groupByColumns.add(m_synonym+".Name");
orderName = m_synonym + "Name"; orderName = m_synonym + "Name";
// => x JOIN AD_Ref_List A ON (x.KeyColumn=A.Value AND A.AD_Reference_ID=123) // => x JOIN AD_Ref_List A ON (x.KeyColumn=A.Value AND A.AD_Reference_ID=123)
if (IsMandatory) if (IsMandatory)
@ -403,7 +406,7 @@ public class DataEngine
{ {
// => A.Name AS AName, // => A.Name AS AName,
sqlSELECT.append(m_synonym).append(".Name AS ").append(m_synonym).append("Name,"); sqlSELECT.append(m_synonym).append(".Name AS ").append(m_synonym).append("Name,");
sqlGROUP.append(m_synonym).append(".Name,"); groupByColumns.add(m_synonym+".Name");
orderName = m_synonym + "Name"; orderName = m_synonym + "Name";
// LEFT OUTER JOIN AD_Ref_List XA ON (AD_Table.EntityType=XA.Value AND XA.AD_Reference_ID=245) // LEFT OUTER JOIN AD_Ref_List XA ON (AD_Table.EntityType=XA.Value AND XA.AD_Reference_ID=245)
@ -483,8 +486,8 @@ public class DataEngine
sqlSELECT.append(m_synonym).append(".").append(display).append(" AS ") sqlSELECT.append(m_synonym).append(".").append(display).append(" AS ")
.append(m_synonym).append(synonym).append(",") .append(m_synonym).append(synonym).append(",")
.append(tableName).append(".").append(ColumnName).append(","); .append(tableName).append(".").append(ColumnName).append(",");
sqlGROUP.append(m_synonym).append(".").append(synonym).append(",") groupByColumns.add(m_synonym+"."+synonym);
.append(tableName).append(".").append(ColumnName).append(","); groupByColumns.add(tableName+"."+ColumnName);
orderName = m_synonym + synonym; orderName = m_synonym + synonym;
// => x JOIN table A ON (table.ID=A.Key) // => x JOIN table A ON (table.ID=A.Key)
if (IsMandatory) if (IsMandatory)
@ -503,35 +506,33 @@ public class DataEngine
else else
{ {
int index = FunctionColumn.indexOf('@'); int index = FunctionColumn.indexOf('@');
StringBuffer sb = new StringBuffer();
if (ColumnSQL != null && ColumnSQL.length() > 0) if (ColumnSQL != null && ColumnSQL.length() > 0)
{ {
// => ColumnSQL AS ColumnName // => ColumnSQL AS ColumnName
sb.append(ColumnSQL); sqlSELECT.append(ColumnSQL).append(" AS ").append(ColumnName).append(",");
sqlSELECT.append(sb).append(" AS ").append(ColumnName).append(",");
if (!IsGroupFunction) if (!IsGroupFunction)
sqlGROUP.append(sb).append(","); groupByColumns.add(ColumnSQL);
orderName = ColumnName; // no prefix for synonym orderName = ColumnName; // no prefix for synonym
} }
else if (index == -1) else if (index == -1)
{ {
// => Table.Column, // => Table.Column,
sb.append(tableName).append(".").append(ColumnName).append(","); StringBuffer sb = new StringBuffer();
sqlSELECT.append(sb); sb.append(tableName).append(".").append(ColumnName);
sqlSELECT.append(sb).append(",");
if (!IsGroupFunction) if (!IsGroupFunction)
sqlGROUP.append(sb).append(","); groupByColumns.add(sb.toString());
} }
else else
{ {
// => Function(Table.Column) AS Column -- function has @ where column name goes // => Function(Table.Column) AS Column -- function has @ where column name goes
StringBuffer sb = new StringBuffer();
sb.append(FunctionColumn.substring(0, index)) sb.append(FunctionColumn.substring(0, index))
// If I eg entered sum(amount) as function column in the report view the query would look like: .append(tableName).append(".").append(ColumnName)
// Tablename.amountsum(amount), after removing the line below I get the wanted result. The original query column (tablename.column) is replaced by the function column entered in the report view window.
// .append(tableName).append(".").append(ColumnName) // xxxxxx
.append(FunctionColumn.substring(index+1)); .append(FunctionColumn.substring(index+1));
sqlSELECT.append(sb).append(" AS ").append(ColumnName).append(","); sqlSELECT.append(sb).append(" AS ").append(ColumnName).append(",");
if (!IsGroupFunction) if (!IsGroupFunction)
sqlGROUP.append(sb).append(","); groupByColumns.add(sb.toString());
orderName = ColumnName; // no prefix for synonym orderName = ColumnName; // no prefix for synonym
} }
pdc = new PrintDataColumn(AD_Column_ID, ColumnName, pdc = new PrintDataColumn(AD_Column_ID, ColumnName,
@ -544,6 +545,11 @@ public class DataEngine
if (AD_Column_ID == orderAD_Column_IDs[i]) if (AD_Column_ID == orderAD_Column_IDs[i])
{ {
orderColumns.set(i, orderName); orderColumns.set(i, orderName);
// We need to GROUP BY even is not printed, because is used in ORDER clause
if (!IsPrinted && !IsGroupFunction)
{
groupByColumns.add(tableName+"."+ColumnName);
}
break; break;
} }
} }
@ -560,9 +566,9 @@ public class DataEngine
{ {
log.log(Level.SEVERE, "SQL=" + sql + " - ID=" + format.get_ID(), e); log.log(Level.SEVERE, "SQL=" + sql + " - ID=" + format.get_ID(), e);
} }
finally { finally
DB.close(rs); {
DB.close(pstmt); DB.close(rs, pstmt);
rs = null; rs = null;
pstmt = null; pstmt = null;
} }
@ -619,9 +625,18 @@ public class DataEngine
tableName, MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO)); tableName, MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO));
} }
// Group By // Add GROUP BY clause
if (IsGroupedBy) if (IsGroupedBy)
finalSQL.append(sqlGROUP.substring(0, sqlGROUP.length()-1)); // last , {
for (int i = 0; i < groupByColumns.size(); i++)
{
if (i == 0)
finalSQL.append(" GROUP BY ");
else
finalSQL.append(",");
finalSQL.append(groupByColumns.get(i));
}
}
// Add ORDER BY clause // Add ORDER BY clause
if (orderColumns != null) if (orderColumns != null)