Summary:
Backward compatibility on
'resultset' property.
ModelOdaAdapter sometimes
may lost user-defined datasetParameter.
Bugzilla Bug (s)
Resolved: 155958, 156495
Description:
1. Modify
rule of merging DataSetDesign and DataSetHandle. If value only defined in DataSetHandle,
should hold it.
2. Clear ‘resultSet’
property before version 3.2.2
3. Check Test Case.
Tests Description : Junit
test.
Files Edited:
/org.eclipse.birt.report.model.adapter.oda/src/org/eclipse/birt/report/model/adapter/oda/ResultSetsAdapter.java
/org.eclipse.birt.report.model.adapter.oda/src/org/eclipse/birt/report/model/adapter/oda/ModelOdaAdapter.java
/org.eclipse.birt.report.model.adapter.oda/src/org/eclipse/birt/report/model/adapter/oda/DataSetParameterAdapter.java
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/api/OdaDataSetAdapterTest.java
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/api/DataSetParameterAdapterTest.java
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/api/golden/OdaDataSetConvertReportParamTest_2_golden.xml
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/api/golden/DataSetParamConvertTest_golden_1.xml
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/api/golden/OdaDataSetConvertReportParamTest_golden.xml
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/api/golden/OdaDataSetConvertReportParamTest_3_golden.xml
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/api/golden/OdaDataSetConvertReportParamTest_1_golden.xml
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/api/golden/DataSetParamConvertTest_golden_3.xml
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/api/golden/OdaDataSetEmptyProps_golden_1.xml
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/api/golden/DataSetParamConvertTest_golden_2.xml
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/AllTests.java,
/org.eclipse.birt.report.model/test/org/eclipse/birt/report/model/parser/golden/OdaDataSetParseTest_obsolete_golden.xml
/org.eclipse.birt.report.model/test/org/eclipse/birt/report/model/parser/golden/OdaDataSetParseTest_golden.xml
/org.eclipse.birt.report.model/test/org/eclipse/birt/report/model/parser/OdaDataSetParserTest.java
/org.eclipse.birt.report.model/test/org/eclipse/birt/report/model/parser/ParserCompatibilityTest.java
/org.eclipse.birt.report.model/test/org/eclipse/birt/report/model/parser/input/CompatibleResultSetHintClearTest.xml
/org.eclipse.birt.report.model/test/org/eclipse/birt/report/model/parser/input/CompatibleResultSetClearTest.xml
/org.eclipse.birt.report.model/test/org/eclipse/birt/report/model/api/DataSetHandleTest.java
/org.eclipse.birt.report.model/src/org/eclipse/birt/report/model/parser/OdaDataSetState.java
Files Added:
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/api/input/DataSetMergeTest.xml
/org.eclipse.birt.report.model.adapter.oda/test/org/eclipse/birt/report/model/adapter/oda/api/input/DataSetParamConvertTest_1.xml
Notes to Developers:
Notes to QA
Mark He XingJie
Actuate Software
Shanghai
Center
Tel: (86)21-58826388
Fax: (86)21-58826002
Email: xhe@xxxxxxxxxxx