Skip to content

Commit c8cd622

Browse files
ThatRendleThatRendle
committed
Updated to 0.11.2
1 parent b01fd5e commit c8cd622

9 files changed

Lines changed: 39 additions & 24 deletions

File tree

‎CommonAssemblyInfo.cs‎

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

22-
[assembly: AssemblyVersion("0.11.1.1")]
23-
[assembly: AssemblyFileVersion("0.11.1.1")]
22+
[assembly: AssemblyVersion("0.11.2.1")]
23+
[assembly: AssemblyFileVersion("0.11.2.1")]
2424

‎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.11.1.1</version>
5+
<version>0.11.2.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.11.1.1" />
15+
<dependency id="Simple.Data.Core" version="0.11.2.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.InMemoryTest/InMemoryTests.cs‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ public class InMemoryTests
1111
[Test]
1212
public void InsertAndGetShouldWork()
1313
{
14-
var adapter = new InMemoryAdapter();
15-
adapter.SetKeyColumn("Test", "Id");
16-
Database.UseMockAdapter(adapter);
17-
var db = Database.Open();
18-
db.Test.Insert(Id: 1, Name: "Alice");
19-
var record = db.Test.Get(1);
20-
Assert.IsNotNull(record);
21-
Assert.AreEqual(1, record.Id);
22-
Assert.AreEqual("Alice", record.Name);
14+
var adapter = new InMemoryAdapter();
15+
adapter.SetKeyColumn("Test", "Id");
16+
Database.UseMockAdapter(adapter);
17+
var db = Database.Open();
18+
db.Test.Insert(Id: 1, Name: "Alice");
19+
var record = db.Test.Get(1);
20+
Assert.IsNotNull(record);
21+
Assert.AreEqual(1, record.Id);
22+
Assert.AreEqual("Alice", record.Name);
2323
}
2424

2525
[Test]
@@ -156,6 +156,21 @@ public void TestUpdateBy()
156156
Assert.AreEqual("Allyce", record.Name);
157157
}
158158

159+
[Test]
160+
public void TestUpdate()
161+
{
162+
var adapter = new InMemoryAdapter();
163+
adapter.SetKeyColumn("Test", "Id");
164+
Database.UseMockAdapter(adapter);
165+
var db = Database.Open();
166+
var alice = db.Test.Insert(Id: 1, Name: "Alice");
167+
var allyce = new {Id = 1, Name = "Allyce"};
168+
int updated = db.Test.Update(allyce);
169+
Assert.AreEqual(1, updated);
170+
var record = db.Test.FindById(1);
171+
Assert.AreEqual("Allyce", record.Name);
172+
}
173+
159174
[Test]
160175
public void TestDeleteBy()
161176
{

‎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.11.1.1</version>
5+
<version>0.11.2.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.11.1.1" />
15+
<dependency id="Simple.Data.Ado" version="0.11.2.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.11.1.1</version>
5+
<version>0.11.2.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.11.1.1" />
15+
<dependency id="Simple.Data.Ado" version="0.11.2.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎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.11.1.1</version>
5+
<version>0.11.2.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.11.1.1" />
15+
<dependency id="Simple.Data.Ado" version="0.11.2.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data/InMemoryAdapter.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,18 @@ private static void UpdateRecord(IDictionary<string, object> data, IDictionary<s
149149
public override int Update(string tableName, IDictionary<string, object> data)
150150
{
151151
if (!_keyColumns.ContainsKey(tableName)) throw new InvalidOperationException("No key column(s) specified.");
152-
IDictionary<string, object> row = null;
152+
IDictionary<string, object> row;
153153
if (_keyColumns[tableName].Length == 1)
154154
{
155155
row =
156156
GetTable(tableName).Single(
157-
d => d[_keyColumns[tableName][0]] == data[_keyColumns[tableName][0]]);
157+
d => Equals(d[_keyColumns[tableName][0]], data[_keyColumns[tableName][0]]));
158158
}
159159
else
160160
{
161161
IEnumerable<IDictionary<string, object>> rows = GetTable(tableName);
162162
row = _keyColumns[tableName]
163-
.Aggregate(rows, (current, keyColumn) => current.Where(d => d[keyColumn] == data[keyColumn]))
163+
.Aggregate(rows, (current, keyColumn) => current.Where(d => Equals(d[keyColumn], data[keyColumn])))
164164
.Single();
165165
}
166166
UpdateRecord(data, row);

‎Simple.Data/Simple.Data.nuspec‎

Lines changed: 1 addition & 1 deletion
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.Core</id>
5-
<version>0.11.1.1</version>
5+
<version>0.11.2.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>

‎Simple.Data/SimpleQuery.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ public T SingleOrDefault<T>(Func<T, bool> predicate)
565565

566566
public int Count()
567567
{
568-
return Select(new CountSpecialReference()).ToScalar();
568+
return (int)Select(new CountSpecialReference()).ToScalar();
569569
}
570570

571571
/// <summary>

0 commit comments

Comments
 (0)