Skip to content

Commit 093b955

Browse files
committed
2015-12-21
- Moving input paramerer of IResultWriter.BeforeExecureReader to IResultWriter.Begin - Executing command from line - Fixing endFill, writeEnd callback handling - Changing order of tab pages from (Messages, Results) to (Results, Messages) - Enhancing text result writer tabpage - OpenAsync
1 parent 4c11251 commit 093b955

File tree

99 files changed

+2395
-2409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+2395
-2409
lines changed

DataCommander.Foundation/DataCommander.Foundation.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,6 @@
284284
<Name>System.Data</Name>
285285
</Reference>
286286
<Reference Include="System.Data.DataSetExtensions" />
287-
<Reference Include="System.Data.SQLite.Linq, Version=1.0.98.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
288-
<HintPath>..\packages\System.Data.SQLite.Linq.1.0.98.1\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
289-
<Private>True</Private>
290-
</Reference>
291287
<Reference Include="System.Drawing">
292288
<Name>System.Drawing</Name>
293289
</Reference>
@@ -988,12 +984,13 @@
988984
</BootstrapperPackage>
989985
</ItemGroup>
990986
<ItemGroup>
991-
<None Include="app.config" />
987+
<None Include="app.config">
988+
<SubType>Designer</SubType>
989+
</None>
992990
<None Include="Collections\IndexableCollection\ClassDiagram.cd" />
993991
<None Include="Collections\ObjectPool\ClassDiagram.cd" />
994992
<None Include="Configuration\ClassDiagram.cd" />
995993
<None Include="Diagnostics\Log\ClassDiagram.cd" />
996-
<None Include="packages.config" />
997994
<None Include="Text\ClassDiagram.cd" />
998995
</ItemGroup>
999996
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

DataCommander.Foundation/Linq/Extensions.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,6 @@
1313
/// </summary>
1414
public static class Extensions
1515
{
16-
/// <summary>
17-
///
18-
/// </summary>
19-
/// <typeparam name="TSource"></typeparam>
20-
/// <typeparam name="TResult"></typeparam>
21-
/// <param name="t"></param>
22-
/// <param name="selector"></param>
23-
/// <returns></returns>
24-
public static TResult IfNotNull<TSource, TResult>(this TSource t, Func<TSource, TResult> selector)
25-
{
26-
Contract.Requires<ArgumentNullException>(selector != null);
27-
28-
return t != null
29-
? selector(t)
30-
: default(TResult);
31-
}
32-
3316
/// <summary>
3417
///
3518
/// </summary>

DataCommander.Foundation/Windows/Forms/ControlExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ public static class ControlExtensions
1313
/// </summary>
1414
/// <param name="control"></param>
1515
/// <param name="action"></param>
16-
public static void Invoke( this Control control, Action action )
16+
public static void Invoke(this Control control, Action action)
1717
{
18-
control.Invoke( action );
18+
control.Invoke(action);
1919
}
2020
}
2121
}

DataCommander.Foundation/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

DataCommander.Providers.Msi/DataCommander.Providers.Msi.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@
108108
<Install>true</Install>
109109
</BootstrapperPackage>
110110
</ItemGroup>
111-
<ItemGroup>
112-
<None Include="app.config" />
113-
<None Include="packages.config" />
114-
</ItemGroup>
115111
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
116112
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
117113
Other similar extension points exist, see Microsoft.Common.targets.

DataCommander.Providers.Msi/MsiProvider.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,15 @@ DataTable IProvider.GetSchemaTable(IDataReader dataReader)
189189
return dataReader.GetSchemaTable();
190190
}
191191

192-
List<string> IProvider.GetStatements(string commandText)
192+
List<Statement> IProvider.GetStatements(string commandText)
193193
{
194-
return new List<string>
194+
return new List<Statement>
195195
{
196-
commandText
196+
new Statement
197+
{
198+
LineIndex = 0,
199+
CommandText = commandText
200+
}
197201
};
198202
}
199203

DataCommander.Providers.Msi/MsiProviderConnection.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{
33
using System;
44
using System.Data;
5+
using System.Threading;
6+
using System.Threading.Tasks;
57

68
internal sealed class MsiProviderConnection : ConnectionBase
79
{
@@ -16,12 +18,12 @@ public MsiProviderConnection( string connectionString )
1618
this.Connection = this.msiConnection;
1719
}
1820

19-
public override void Open()
20-
{
21-
this.msiConnection.Open();
22-
}
21+
public override Task OpenAsync(CancellationToken cancellationToken)
22+
{
23+
return Task.Factory.StartNew(this.msiConnection.Open);
24+
}
2325

24-
public override IDbCommand CreateCommand()
26+
public override IDbCommand CreateCommand()
2527
{
2628
return this.msiConnection.CreateCommand();
2729
}

DataCommander.Providers.Msi/app.config

Lines changed: 0 additions & 16 deletions
This file was deleted.

DataCommander.Providers.Msi/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

DataCommander.Providers.MySql/Connection.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
namespace DataCommander.Providers.MySql
22
{
33
using System;
4+
using System.Threading;
5+
using System.Threading.Tasks;
46
using DataCommander.Providers;
57
using global::MySql.Data.MySqlClient;
68

@@ -17,9 +19,9 @@ public Connection(string connectionString)
1719
this.Connection = this.mySqlConnection;
1820
}
1921

20-
public override void Open()
22+
public override Task OpenAsync(CancellationToken cancellationToken)
2123
{
22-
this.mySqlConnection.Open();
24+
return this.mySqlConnection.OpenAsync(cancellationToken);
2325
}
2426

2527
public override System.Data.IDbCommand CreateCommand()

0 commit comments

Comments
 (0)