Skip to content

Commit 152a74e

Browse files
ThatRendleThatRendle
committed
Merge branch 'master' of github.com:markrendle/Simple.Data
2 parents ff89ce1 + 8a672db commit 152a74e

15 files changed

Lines changed: 134 additions & 106 deletions

‎CommonAssemblyInfo.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
// COM, set the ComVisible attribute to true on that type.
2020
[assembly: ComVisible(false)]
2121

22-
[assembly: AssemblyVersion("0.9.3.2")]
23-
[assembly: AssemblyFileVersion("0.9.3.2")]
22+
[assembly: AssemblyVersion("0.9.4.1")]
23+
[assembly: AssemblyFileVersion("0.9.4.1")]
24+

‎Simple.Data.Ado/ProviderHelper.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Simple.Data.Ado
1313
using Schema;
1414

1515
public class ProviderHelper
16-
{
16+
{
1717
private readonly ConcurrentDictionary<ConnectionToken, IConnectionProvider> _connectionProviderCache = new ConcurrentDictionary<ConnectionToken,IConnectionProvider>();
1818
private readonly ConcurrentDictionary<Type, object> _customProviderCache = new ConcurrentDictionary<Type, object>();
1919

@@ -31,7 +31,7 @@ public IConnectionProvider GetProviderByFilename(string filename)
3131

3232
private IConnectionProvider LoadProviderByConnectionString(ConnectionToken token)
3333
{
34-
var dataSource = GetDataSourceName(token.ConnectionString);
34+
var dataSource = GetDataSourceName(token.ConnectionString);
3535
if (dataSource.EndsWith("sdf", StringComparison.CurrentCultureIgnoreCase) && File.Exists(dataSource))
3636
{
3737
return GetProviderByFilename(dataSource);
@@ -41,16 +41,16 @@ private IConnectionProvider LoadProviderByConnectionString(ConnectionToken token
4141
provider.SetConnectionString(token.ConnectionString);
4242
return provider;
4343
}
44-
45-
internal static string GetDataSourceName(string connectionString)
46-
{
47-
var match = Regex.Match(connectionString, @"data source=(.*?)(;|\z)");
48-
if (match != null && match.Groups.Count > 1)
49-
{
50-
return match.Groups[1].Value;
51-
}
52-
return string.Empty;
53-
}
44+
45+
internal static string GetDataSourceName(string connectionString)
46+
{
47+
var match = Regex.Match(connectionString, @"data source=(.*?)(;|\z)");
48+
if (match != null && match.Groups.Count > 1)
49+
{
50+
return match.Groups[1].Value;
51+
}
52+
return string.Empty;
53+
}
5454

5555
private static IConnectionProvider LoadProviderByFilename(ConnectionToken token)
5656
{
@@ -218,5 +218,5 @@ public string ProviderName
218218
get { return _providerName; }
219219
}
220220
}
221-
}
221+
}
222222
}

‎Simple.Data.Ado/Simple.Data.Ado.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Simple.Data.Ado</id>
5-
<version>0.9.3.2</version>
5+
<version>0.9.4.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>ADO Adapter for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>sqlserver database data ado .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Core" version="0.9.3.2" />
15+
<dependency id="Simple.Data.Core" version="0.9.4.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.Mocking/Simple.Data.Mocking.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Simple.Data.Mocking</id>
5-
<version>0.9.3.2</version>
5+
<version>0.9.4.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>XML-based Mocking adapter for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>database data .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Ado" version="0.9.3.2" />
15+
<dependency id="Simple.Data.Ado" version="0.9.4.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.SqlCe40/Simple.Data.SqlCe40.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Simple.Data.SqlCompact40</id>
5-
<version>0.9.3.2</version>
5+
<version>0.9.4.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>SQL Server Compact 4.0 ADO provider for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>sqlserver compact sqlce database data ado .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Ado" version="0.9.3.2" />
15+
<dependency id="Simple.Data.Ado" version="0.9.4.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.SqlCe40/SqlCe40ConnectionProvider.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace Simple.Data.SqlCe40
1212
[Export(typeof(IConnectionProvider))]
1313
[Export("sdf", typeof(IConnectionProvider))]
1414
[Export("System.Data.SqlServerCe", typeof(IConnectionProvider))]
15+
[Export("System.Data.SqlServerCe.4.0", typeof(IConnectionProvider))]
1516
public class SqlCe40ConnectionProvider : IConnectionProvider
1617
{
1718
private string _connectionString;

‎Simple.Data.SqlServer/Simple.Data.SqlServer.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Simple.Data.SqlServer</id>
5-
<version>0.9.3.2</version>
5+
<version>0.9.4.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>SQL Server ADO provider for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>sqlserver database data ado .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Ado" version="0.9.3.2" />
15+
<dependency id="Simple.Data.Ado" version="0.9.4.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.SqlTest/DatabaseOpenerTests.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
namespace Simple.Data.SqlTest
88
{
9+
using Ado;
10+
using SqlServer;
11+
912
[TestFixture]
1013
public class DatabaseOpenerTests
1114
{
@@ -17,5 +20,28 @@ public void OpenNamedConnectionTest()
1720
var user = db.Users.FindById(1);
1821
Assert.AreEqual(1, user.Id);
1922
}
23+
24+
[Test]
25+
public void TestProviderIsSqlProvider()
26+
{
27+
var provider = new ProviderHelper().GetProviderByConnectionString(Properties.Settings.Default.ConnectionString);
28+
Assert.IsInstanceOf(typeof(SqlConnectionProvider), provider);
29+
}
30+
31+
[Test]
32+
public void TestProviderIsSqlProviderFromOpen()
33+
{
34+
Database db = DatabaseHelper.Open();
35+
Assert.IsInstanceOf(typeof(AdoAdapter), db.GetAdapter());
36+
Assert.IsInstanceOf(typeof(SqlConnectionProvider), ((AdoAdapter)db.GetAdapter()).ConnectionProvider);
37+
}
38+
39+
[Test]
40+
public void TestProviderIsSqlProviderFromOpenConnection()
41+
{
42+
Database db = Database.OpenConnection(Properties.Settings.Default.ConnectionString);
43+
Assert.IsInstanceOf(typeof(AdoAdapter), db.GetAdapter());
44+
Assert.IsInstanceOf(typeof(SqlConnectionProvider), ((AdoAdapter)db.GetAdapter()).ConnectionProvider);
45+
}
2046
}
2147
}

‎Simple.Data.SqlTest/FindTests.cs‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,6 @@ public void Setup()
2222
DatabaseHelper.Reset();
2323
}
2424

25-
[Test]
26-
public void TestProviderIsSqlProvider()
27-
{
28-
var provider = new ProviderHelper().GetProviderByConnectionString(Properties.Settings.Default.ConnectionString);
29-
Assert.IsInstanceOf(typeof(SqlConnectionProvider), provider);
30-
}
31-
32-
[Test]
33-
public void TestProviderIsSqlProviderFromOpen()
34-
{
35-
Database db = DatabaseHelper.Open();
36-
Assert.IsInstanceOf(typeof(AdoAdapter), db.GetAdapter());
37-
Assert.IsInstanceOf(typeof(SqlConnectionProvider), ((AdoAdapter)db.GetAdapter()).ConnectionProvider);
38-
}
39-
4025
[Test]
4126
public void TestFindById()
4227
{
@@ -69,6 +54,14 @@ public void TestFindAllByName()
6954
Assert.AreEqual(1, users.Count());
7055
}
7156

57+
[Test]
58+
public void TestFindAllByNameAsIEnumerableOfDynamic()
59+
{
60+
var db = DatabaseHelper.Open();
61+
IEnumerable<dynamic> users = db.Users.FindAllByName("Bob");
62+
Assert.AreEqual(1, users.Count());
63+
}
64+
7265
[Test]
7366
public void TestFindAllByPartialName()
7467
{

‎Simple.Data.SqlTest/QueryTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ public void WithTotalCountShouldGiveCount()
124124
Promise<int> count;
125125
var db = DatabaseHelper.Open();
126126
var list = db.PagingTest.QueryById(1.to(50))
127-
.WithTotalCount(out count)
128127
.Take(10)
128+
.WithTotalCount(out count)
129129
.ToList();
130130

131131
Assert.AreEqual(10, list.Count);

0 commit comments

Comments
 (0)