Browse Source

Fix http://community.sharpdevelop.net/forums/t/10738.aspx

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5810 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Peter Forstmeier 15 years ago
parent
commit
6919ac965a
  1. 2
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ConnectionObject.cs
  2. 13
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/DataManager/SqlDataAccess.cs

2
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ConnectionObject.cs

@ -66,6 +66,8 @@ namespace ICSharpCode.Reports.Core { @@ -66,6 +66,8 @@ namespace ICSharpCode.Reports.Core {
#endregion
public string QueryString {get;set;}
public IDbDataAdapter CreateDataAdapter(IDbCommand command)
{
DbDataAdapter adapter = providerFactory.CreateDataAdapter();

13
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/DataManager/SqlDataAccess.cs

@ -64,10 +64,17 @@ namespace ICSharpCode.Reports.Core @@ -64,10 +64,17 @@ namespace ICSharpCode.Reports.Core
}
IDbCommand command = this.connectionObject.Connection.CreateCommand();
command.CommandText = reportSettings.CommandText;
if (String.IsNullOrEmpty(this.connectionObject.QueryString)) {
command.CommandText = reportSettings.CommandText;
} else {
command.CommandText = this.connectionObject.QueryString;
}
command.CommandType = reportSettings.CommandType;
// We have to check if there are parameters for this Query, if so
// add them to the command
BuildQueryParameters(command,reportSettings.ParameterCollection);

Loading…
Cancel
Save