details: https://code.openbravo.com/erp/devel/pi/rev/84a2a4d680e1 changeset: 20073:84a2a4d680e1 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Wed Apr 10 07:32:00 2013 +0530 summary: Fixes Issue 23124, Related to Issue 23267 : Selectors as Identifiers
When comparing selector columns in ComboData the column name in the table was used to compare with the selector table. This results in exception when the column names are different. In case the selector has the column field, that column is used for comparison avoiding this error. details: https://code.openbravo.com/erp/devel/pi/rev/acc7b1648fdf changeset: 20074:acc7b1648fdf user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Apr 08 11:55:43 2013 +0530 summary: Fixes Issue 0023500 : Added missing fields in Copy Fields and Copy Window Tabs. details: https://code.openbravo.com/erp/devel/pi/rev/8a61ab52b20b changeset: 20075:8a61ab52b20b user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Sun Apr 07 13:56:44 2013 +0530 summary: Fixes Issue 0022304: Ignoring computed columns for foreign key validation Computed columns are ignored when columns are checked for foreign key constraints diffstat: modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java | 11 ++++++--- src-db/database/model/functions/AD_TAB_COPY.xml | 8 +++++- src-db/database/model/functions/AD_WINDOW_COPY.xml | 8 +++++- src/org/openbravo/service/system/DatabaseValidator.java | 6 +++++ 4 files changed, 25 insertions(+), 8 deletions(-) diffs (87 lines): diff -r 6b34ef9b837f -r 8a61ab52b20b modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java --- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java Tue Apr 09 16:38:21 2013 +0200 +++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java Sun Apr 07 13:56:44 2013 +0530 @@ -202,10 +202,13 @@ String parentFieldName = fieldName; String name = ((fieldName != null && !fieldName.equals("")) ? fieldName : comboTableData .getObjectName()); - if (name.startsWith("EM_")) { - // For external module fields use the column field in selector to avoid comparing - // fields with EM_fieldname which will not be present in the current table. - // Refer issue https://issues.openbravo.com/view.php?id=23267 + /* + * if the column name is available in selector use that for comparison as it is the column + * that is going to be saved. Solves issues + * https://issues.openbravo.com/view.php?id=23267, + * https://issues.openbravo.com/view.php?id=23124 + */ + if (selector.getColumn() != null) { name = selector.getColumn().getDBColumnName(); } String tableDirName; diff -r 6b34ef9b837f -r 8a61ab52b20b src-db/database/model/functions/AD_TAB_COPY.xml --- a/src-db/database/model/functions/AD_TAB_COPY.xml Tue Apr 09 16:38:21 2013 +0200 +++ b/src-db/database/model/functions/AD_TAB_COPY.xml Sun Apr 07 13:56:44 2013 +0530 @@ -141,7 +141,9 @@ DISPLAYLOGIC, DISPLAYLENGTH, ISREADONLY, SEQNO, SORTNO, ISSAMELINE, ISFIELDONLY, ISENCRYPTED, AD_MODULE_ID, - ShowInRelation, Grid_Seqno + ShowInRelation, Grid_Seqno, property, + ignoreinwad, isfirstfocusedfield, startinoddcolumn, + startnewline,isshowninstatusbar,onchangefunction,clientclass ) VALUES ( @@ -152,7 +154,9 @@ Cur_Fields.DISPLAYLOGIC, Cur_Fields.DISPLAYLENGTH, Cur_Fields.ISREADONLY, Cur_Fields.SEQNO, Cur_Fields.SORTNO, Cur_Fields.ISSAMELINE, Cur_Fields.ISFIELDONLY, Cur_Fields.ISENCRYPTED, v_dest_ad_module_id, - Cur_Fields.ShowInRelation, Cur_Fields.Grid_Seqno + Cur_Fields.ShowInRelation, Cur_Fields.Grid_Seqno, Cur_Fields.property, + Cur_Fields.ignoreinwad, Cur_Fields.isfirstfocusedfield, Cur_Fields.startinoddcolumn, + Cur_Fields.startnewline,Cur_Fields.isshowninstatusbar,Cur_Fields.onchangefunction,Cur_Fields.clientclass ); -- update translations from source translations diff -r 6b34ef9b837f -r 8a61ab52b20b src-db/database/model/functions/AD_WINDOW_COPY.xml --- a/src-db/database/model/functions/AD_WINDOW_COPY.xml Tue Apr 09 16:38:21 2013 +0200 +++ b/src-db/database/model/functions/AD_WINDOW_COPY.xml Sun Apr 07 13:56:44 2013 +0530 @@ -204,7 +204,9 @@ ShowInRelation, Grid_Seqno, startinoddcolumn,startnewline, em_obuisel_outfield_id, isfirstfocusedfield, isshowninstatusbar, onchangefunction, - em_obuiapp_colspan,em_obuiapp_rowspan + em_obuiapp_colspan, em_obuiapp_rowspan, property, + ignoreinwad, clientclass, em_obuiapp_validator, + em_obuiapp_showsummary, em_obuiapp_summaryfn ) VALUES ( @@ -218,7 +220,9 @@ Cur_Fields.ShowInRelation, Cur_Fields.Grid_Seqno, Cur_Fields.Startinoddcolumn, Cur_Fields.Startnewline, Cur_Fields.EM_Obuisel_Outfield_ID, Cur_Fields.isFirstFocusedField, Cur_Fields.isShownInStatusBar, Cur_Fields.onchangefunction, - Cur_Fields.em_obuiapp_colspan,Cur_Fields.em_obuiapp_rowspan + Cur_Fields.em_obuiapp_colspan,Cur_Fields.em_obuiapp_rowspan, Cur_Fields.property, + Cur_Fields.ignoreinwad, Cur_Fields.clientclass, Cur_Fields.em_obuiapp_validator, + Cur_Fields.em_obuiapp_showsummary, Cur_Fields.em_obuiapp_summaryfn ); -- update dest translations from source translations diff -r 6b34ef9b837f -r 8a61ab52b20b src/org/openbravo/service/system/DatabaseValidator.java --- a/src/org/openbravo/service/system/DatabaseValidator.java Tue Apr 09 16:38:21 2013 +0200 +++ b/src/org/openbravo/service/system/DatabaseValidator.java Sun Apr 07 13:56:44 2013 +0530 @@ -374,6 +374,12 @@ return; } for (Property property : entity.getProperties()) { + + // ignore computed columns + if (property.getSqlLogic() != null) { + continue; + } + if (!property.isPrimitive() && !property.isOneToMany() && !property.isAuditInfo()) { // check if the property column is present in a foreign key ------------------------------------------------------------------------------ Precog is a next-generation analytics platform capable of advanced analytics on semi-structured data. The platform includes APIs for building apps and a phenomenal toolset for data science. Developers can use our toolset for easy data analysis & visualization. Get a free account! http://www2.precog.com/precogplatform/slashdotnewsletter _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
