SqlParameters, remove dead code

samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs

@@ -41,17 +41,20 @@ namespace SharpReportSamples
 			System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("PushModel-IList");
 			System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("Provider Independent");
 			System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("Customized");
-			System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("Sample Reports", new System.Windows.Forms.TreeNode[] {
+			System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("StoredProcedure");
+			System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("Sample Reports", new System.Windows.Forms.TreeNode[] {
 									treeNode1,
 									treeNode2,
 									treeNode3,
 									treeNode4,
-									treeNode5});
+									treeNode5,
+									treeNode6});
 			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
 			this.treeView1 = new System.Windows.Forms.TreeView();
 			this.label1 = new System.Windows.Forms.Label();
 			this.previewControl1 = new ICSharpCode.Reports.Core.ReportViewer.PreviewControl();
 			this.menuStrip2 = new System.Windows.Forms.MenuStrip();
+			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
 			this.splitContainer1.Panel1.SuspendLayout();
 			this.splitContainer1.Panel2.SuspendLayout();
 			this.splitContainer1.SuspendLayout();
@@ -93,10 +96,12 @@ namespace SharpReportSamples
 			treeNode4.Text = "Provider Independent";
 			treeNode5.Name = "CustomizedNode";
 			treeNode5.Text = "Customized";
-			treeNode6.Name = "Customized";
-			treeNode6.Text = "Sample Reports";
+			treeNode6.Name = "StoredProcedure";
+			treeNode6.Text = "StoredProcedure";
+			treeNode7.Name = "Customized";
+			treeNode7.Text = "Sample Reports";
 			this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
-									treeNode6});
+									treeNode7});
 			this.treeView1.Size = new System.Drawing.Size(148, 444);
 			this.treeView1.TabIndex = 0;
 			this.treeView1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.TreeView1MouseDoubleClick);
@@ -144,6 +149,7 @@ namespace SharpReportSamples
 			this.Text = "SharpReportSamples";
 			this.splitContainer1.Panel1.ResumeLayout(false);
 			this.splitContainer1.Panel2.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
 			this.splitContainer1.ResumeLayout(false);
 			this.ResumeLayout(false);
 			this.PerformLayout();

samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs

@@ -28,6 +28,7 @@ namespace SharpReportSamples
 		private TreeNode iListNode;
 		private TreeNode providerIndependent;
 		private TreeNode customized;
+		private TreeNode storedProcedure;
 		private ImageList imageList;
 		
 		public MainForm()
@@ -59,12 +60,15 @@ namespace SharpReportSamples
 			this.iListNode = this.treeView1.Nodes[0].Nodes[2];
 			this.providerIndependent = this.treeView1.Nodes[0].Nodes[3];
 			this.customized = this.treeView1.Nodes[0].Nodes[4];
+			this.storedProcedure = this.treeView1.Nodes[0].Nodes[5];
+			
 			
 			AddNodesToTree (this.formNode,startPath + @"FormSheet\" );
 			AddNodesToTree (this.pullNode,startPath + @"PullModel\" );
 			AddNodesToTree (this.iListNode,startPath + @"IList\" );
 			AddNodesToTree (this.providerIndependent,startPath + @"ProviderIndependent\" );
 			AddNodesToTree (this.customized,startPath + @"Customized\" );
+			AddNodesToTree (this.storedProcedure,startPath + @"StoredProcedure\" );
 		}
 		
 		
@@ -100,7 +104,12 @@ namespace SharpReportSamples
 			else if (s == "ContributorsListWithParameters"){
 				this.RunContributorsWithParameters(reportName);
 			}
-			         
+			
+			else if (s == "SalesByYear_2Params") {
+				{
+					StoredProcedureWithParam(reportName);
+				}
+			}
 			else if (s == "NoConnectionReport") {
 				this.RunProviderIndependent(reportName);
 			} else if (s =="EventLog")
@@ -301,8 +310,24 @@ namespace SharpReportSamples
 		}
 		
 		
+		void StoredProcedureWithParam(string fileName)
+		{
+			var model = ReportEngine.LoadReportModel(fileName);
+			ReportParameters parameters =  ReportEngine.LoadParameters(fileName);
+			
+			parameters.SqlParameters[0].ParameterValue = new System.DateTime(1997,11,01).ToString();
+			parameters.SqlParameters[1].ParameterValue = new System.DateTime(1997,12,31).ToString();
+
+			this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e)
+			{
+				this.previewControl1.RunReport(fileName,parameters);
+			};
+			this.previewControl1.RunReport(fileName,parameters);
+		}
+		
+		
 		//Handles  SectionRenderEvent
-		int hour = 0;
+//		int hour = 0;
 		
 		private void PushPrinting (object sender, SectionRenderEventArgs e )
 		{
@@ -407,32 +432,5 @@ namespace SharpReportSamples
 				RunStandardReport(selectedNode.Tag.ToString());
 			}
 		}
-		
-		/*
-		void Button2Click(object sender, EventArgs e)
-		{
-			// get Filename to save *.pdf
-			string saveTo = this.SelectFilename();
-			
-			// Create connectionobject
-			parameters =  ReportEngine.LoadParameters(reportName);
-			ConnectionObject con = ConnectionObject.CreateInstance(this.conOleDbString,
-			                                                       System.Data.Common.DbProviderFactories.GetFactory("System.Data.OleDb") );
-			
-			parameters.ConnectionObject = con;
-			
-			
-			// create a Pagebuilder
-			pageBuilder = ReportEngine.CreatePageBuilder(reportName,parameters);
-			pageBuilder.BuildExportList();
-		
-			using (PdfRenderer pdfRenderer = PdfRenderer.CreateInstance(pageBuilder,saveTo,true)){
-				pdfRenderer.Start();
-				pdfRenderer.RenderOutput();
-				pdfRenderer.End();
-			}
-		}
-		
-		 */
 	}
 }

samples/SharpDevelopReports/src/SharpReportSamples/MainForm.resx

@@ -112,15 +112,15 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>237, 17</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>25</value>
   </metadata>
 </root>

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs

@@ -8,7 +8,7 @@ using System.Drawing.Printing;
 using System.IO;
 using System.Windows.Forms;
 using System.Xml;
-
+using ICSharpCode.Reports.Core.BaseClasses;
 using ICSharpCode.Reports.Core.Exporter;
 using ICSharpCode.Reports.Core.Factories;
 using ICSharpCode.Reports.Core.Globals;
@@ -43,7 +43,7 @@ namespace ICSharpCode.Reports.Core {
 		#endregion
 		
 		#region create Connection handle Sql Parameter's
-		
+		/*
 		public static ConnectionObject PrepareConnectionFromParameters (ReportSettings settings,
 		                                                                ReportParameters reportParameters)
 		{
@@ -62,7 +62,7 @@ namespace ICSharpCode.Reports.Core {
 			}
 			return conObj;
 		}
-	
+	*/
 		#endregion
 		
 		
@@ -102,19 +102,38 @@ namespace ICSharpCode.Reports.Core {
 					model.ReportSettings.SortColumnsCollection.AddRange(reportParameters.SortColumnCollection);
 				}
 				
-				if (reportParameters.Parameters.Count > 0) {
-					foreach (BasicParameter bp in reportParameters.Parameters) {
-						BasicParameter p = model.ReportSettings.ParameterCollection.Find(bp.ParameterName);
-						Console.WriteLine("CheckForParameters {0} - {1}",p.ParameterName,p.ParameterValue);
-						if (p != null) {
-							p.ParameterValue = bp.ParameterValue;
-						}
-					}
+				if (reportParameters.Parameters.Count > 0)
+				{
+					reportParameters.Parameters.ForEach(item => SetReportParam(model,item));
+				}
+				
+				if (reportParameters.SqlParameters.Count > 0)
+				{
+					reportParameters.SqlParameters.ForEach(item => SetSqlParam(model,item));
 				}
 			}
 		}
+	
 		
+		private static void SetReportParam (IReportModel model,BasicParameter param)
+		{
+			var p = model.ReportSettings.ParameterCollection.Find(param.ParameterName);
+			if (p != null) {
+				p.ParameterValue = param.ParameterValue;
+			}
+		}
+			
 		
+		private static void SetSqlParam (IReportModel model,SqlParameter param)
+		{
+			var p = model.ReportSettings.SqlParameters.Find(param.ParameterName);
+			if (p != null) {
+				p.ParameterValue = param.ParameterValue;
+			}
+		}
+		
+
+		/*
 		protected static ColumnCollection CollectFieldsFromModel(ReportModel model){
 			if (model == null) {
 				throw new ArgumentNullException("model");
@@ -132,7 +151,7 @@ namespace ICSharpCode.Reports.Core {
 			}
 			return col;
 		}
-		
+		*/
 		
 		/// <summary>
 		/// Creates an <see cref="AbstractRenderer"></see>
@@ -238,6 +257,7 @@ namespace ICSharpCode.Reports.Core {
 				model = LoadReportModel (fileName);
 				ReportParameters pars = new ReportParameters();
 				pars.Parameters.AddRange (model.ReportSettings.ParameterCollection);
+				pars.SqlParameters.AddRange(model.ReportSettings.SqlParameters);
 				return pars;
 			} catch (Exception) {
 				throw;
@@ -282,24 +302,6 @@ namespace ICSharpCode.Reports.Core {
 		#endregion
 		
 		#region Preview to Windows PreviewDialog
-		///<summary>
-		/// Opens the PreviewDialog as standalone, so, no need for Designer
-		/// </summary>
-		///<param name="fileName">Report's Filenema</param>
-		/// <param name="/// <summary>
-		/// send report to printer
-		/// </summary>
-		/// <param name="fileName">Path to ReportFile</param>
-		
-		[Obsolete ("use public void PreviewStandardReport (string fileName,null)")]
-		public void PreviewStandardReport (string fileName) 
-		{
-			if (String.IsNullOrEmpty(fileName)) {
-				throw new ArgumentNullException("fileName");
-			}
-			PreviewStandardReport (fileName,null);
-		}
-		
 		
 		public void PreviewStandardReport (string fileName,ReportParameters reportParameters)
 		{
@@ -320,25 +322,6 @@ namespace ICSharpCode.Reports.Core {
 			}
 		}
 		
-		
-		/// <summary>
-		/// Preview a "PushModel - Report"
-		/// </summary>
-		/// <param name="fileName">Filename to the location of the ReportFile</param>
-		/// <param name="dataTable">a Datatable, containing the data</param>
-		
-		[Obsolete("use public void PreviewPushDataReport (string fileName,DataTable dataTable,null)")]
-//		public void PreviewPushDataReport (string fileName,DataTable dataTable)
-//		{
-//			if (String.IsNullOrEmpty(fileName)) {
-//				throw new ArgumentNullException("fileName");
-//			}
-//			if (dataTable == null) {
-//				throw new ArgumentNullException("dataTable");
-//			}
-//			this.PreviewPushDataReport(fileName,dataTable,null);
-//		}
-		
 
 		public void PreviewPushDataReport (string fileName,DataTable dataTable,ReportParameters reportParameters)
 		{
@@ -361,19 +344,6 @@ namespace ICSharpCode.Reports.Core {
 			}
 		}
 		
-		
-		[Obsolete ("use public void PreviewPushDataReport (string fileName,IList list,null)")]
-//		public void PreviewPushDataReport (string fileName,IList list)
-//		{
-//			if (String.IsNullOrEmpty(fileName)) {
-//				throw new ArgumentNullException("fileName");
-//			}
-//			if (list == null) {
-//				throw new ArgumentNullException("list");
-//			}
-//			this.PreviewPushDataReport(fileName,list,null);
-//		}
-		
 	
 		public void PreviewPushDataReport (string fileName,IList list,ReportParameters reportParameters)
 		{
@@ -433,7 +403,7 @@ namespace ICSharpCode.Reports.Core {
 		/// </summary>
 		/// <param name="reportModel"></param>
 		/// <returns></returns>
-		
+		/*
 		internal static IReportCreator CreatePageBuilder (IReportModel reportModel) 
 		{
 			if (reportModel == null) {
@@ -443,7 +413,7 @@ namespace ICSharpCode.Reports.Core {
 			IReportCreator builder = DataPageBuilder.CreateInstance(reportModel, dataMan);
 			return builder;
 		}
-		
+		*/
 
 		/// <summary>
 		/// 
@@ -558,15 +528,15 @@ namespace ICSharpCode.Reports.Core {
 		/// </summary>
 		/// <param name="fileName">Path to ReportFile</param>
 		/// <param name="renderTo">Type of renderer currently only "ToText" is implemented</param>
-		[Obsolete("use PrintStandardReport (fileName,null)")]
-		public void PrintStandardReport (string fileName) {
-			if (String.IsNullOrEmpty(fileName)) {
-				throw new ArgumentNullException("fileName");
-			}
-			PrintStandardReport (fileName,null);
-			
-		}
-		
+//		[Obsolete("use PrintStandardReport (fileName,null)")]
+//		public void PrintStandardReport (string fileName) {
+//			if (String.IsNullOrEmpty(fileName)) {
+//				throw new ArgumentNullException("fileName");
+//			}
+//			PrintStandardReport (fileName,null);
+//			
+//		}
+//		
 		
 		public void PrintStandardReport (string fileName,ReportParameters reportParameters) {
 			if (String.IsNullOrEmpty(fileName)) {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

@@ -86,8 +86,9 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 			if (reportModel.DataModel == GlobalEnums.PushPullModel.FormSheet) {
 				RunFormSheet(reportModel);
 			} else {
-				var dataManager = DataManagerFactory.CreateDataManager(reportModel, parameters);
 				ReportEngine.CheckForParameters(reportModel, parameters);
+				var dataManager = DataManagerFactory.CreateDataManager(reportModel, parameters);
+				
 				RunReport(reportModel,dataManager);
 				
 			}