- Summary:

Fix an issue Data Set Editor's Max Rows Preference should have been
passed to ODA Driver[48508].

- Bug (s) Resolved:
48508

Description:.
When the fetching rows limit in the data set settings page is set to
default, say no limit is set, then we pass the value of maximum rows to
display to ODA driver.

- Code Reviewer: 
Bin Feng

- Tests Description: 

- Notes to Build Team: 
N/A
- Notes to Developers: 
N/A
- Notes to QA: 
N/A
- Notes to Documentation

1 files changed, 24 insertions, 1 deletions

diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/DataSourceQuery.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/DataSourceQuery.java
index 74d6391..f76acbf 100644
--- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/DataSourceQuery.java
+++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/DataSourceQuery.java
@@ -290,7 +290,16 @@ public class DataSourceQuery extends BaseQuery implements IDataSourceQuery, IPre
         addParameterDefns();
      
         //Here the "max rows" means the max number of rows that can fetch from data source.
-      	odaStatement.setMaxRows( this.getRowFetchLimit( ) );
+        int maxRows = this.getRowFetchLimit( );
+		if ( maxRows <= 0 )
+		{
+			if ( this.getQueryDefinition( ) instanceof IQueryDefinition )
+			{
+				IQueryDefinition qd = (IQueryDefinition) this.getQueryDefinition( );
+				maxRows = qd.getMaxRows( );
+			}
+		}
+      	odaStatement.setMaxRows( maxRows );
       		
         IOdaDataSetDesign design = null;
     	if( session.getDataSetCacheManager( ).getCurrentDataSetDesign( ) instanceof IOdaDataSetDesign )
@@ -883,6 +892,7 @@ public class DataSourceQuery extends BaseQuery implements IDataSourceQuery, IPre
     	IOdaDataSetDesign design = null;
     	if( session.getDataSetCacheManager( ).getCurrentDataSetDesign( ) instanceof IOdaDataSetDesign )
     		design = (IOdaDataSetDesign)session.getDataSetCacheManager( ).getCurrentDataSetDesign( );
+    	
 
 		if ( session.getDataSetCacheManager( ).doesSaveToCache( ) )
 		{
@@ -900,6 +910,19 @@ public class DataSourceQuery extends BaseQuery implements IDataSourceQuery, IPre
 				cacheCountConfig = session.getDataSetCacheManager( )
 						.getCacheCountConfig( );
 			}
+			
+			if( fetchRowLimit <= 0 )
+			{
+		    	int displayMaxRows = -1;
+		    	if( this.getQueryDefinition( ) instanceof IQueryDefinition )
+		    	{
+		    		IQueryDefinition qd = (IQueryDefinition) this.getQueryDefinition( );
+		    		displayMaxRows = qd.getMaxRows();
+		    	}
+		    	
+				fetchRowLimit = displayMaxRows;
+			}
+			
 			if ( cacheCountConfig > 0 )
 			{
 				if ( fetchRowLimit != 0 && fetchRowLimit < cacheCountConfig )