Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updated to 0.11.2
  • Loading branch information
markrendle committed Nov 25, 2011
1 parent b01fd5e commit c8cd622
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 24 deletions.
4 changes: 2 additions & 2 deletions CommonAssemblyInfo.cs
Expand Up @@ -19,6 +19,6 @@
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

[assembly: AssemblyVersion("0.11.1.1")]
[assembly: AssemblyFileVersion("0.11.1.1")]
[assembly: AssemblyVersion("0.11.2.1")]
[assembly: AssemblyFileVersion("0.11.2.1")]

4 changes: 2 additions & 2 deletions Simple.Data.Ado/Simple.Data.Ado.nuspec
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Simple.Data.Ado</id>
<version>0.11.1.1</version>
<version>0.11.2.1</version>
<authors>Mark Rendle</authors>
<owners>Mark Rendle</owners>
<description>ADO Adapter for the Simple.Data data access library.</description>
Expand All @@ -12,7 +12,7 @@
<tags>sqlserver database data ado .net40</tags>
<language>en-us</language>
<dependencies>
<dependency id="Simple.Data.Core" version="0.11.1.1" />
<dependency id="Simple.Data.Core" version="0.11.2.1" />
</dependencies>
</metadata>
</package>
33 changes: 24 additions & 9 deletions Simple.Data.InMemoryTest/InMemoryTests.cs
Expand Up @@ -11,15 +11,15 @@ public class InMemoryTests
[Test]
public void InsertAndGetShouldWork()
{
var adapter = new InMemoryAdapter();
adapter.SetKeyColumn("Test", "Id");
Database.UseMockAdapter(adapter);
var db = Database.Open();
db.Test.Insert(Id: 1, Name: "Alice");
var record = db.Test.Get(1);
Assert.IsNotNull(record);
Assert.AreEqual(1, record.Id);
Assert.AreEqual("Alice", record.Name);
var adapter = new InMemoryAdapter();
adapter.SetKeyColumn("Test", "Id");
Database.UseMockAdapter(adapter);
var db = Database.Open();
db.Test.Insert(Id: 1, Name: "Alice");
var record = db.Test.Get(1);
Assert.IsNotNull(record);
Assert.AreEqual(1, record.Id);
Assert.AreEqual("Alice", record.Name);
}

[Test]
Expand Down Expand Up @@ -156,6 +156,21 @@ public void TestUpdateBy()
Assert.AreEqual("Allyce", record.Name);
}

[Test]
public void TestUpdate()
{
var adapter = new InMemoryAdapter();
adapter.SetKeyColumn("Test", "Id");
Database.UseMockAdapter(adapter);
var db = Database.Open();
var alice = db.Test.Insert(Id: 1, Name: "Alice");
var allyce = new {Id = 1, Name = "Allyce"};
int updated = db.Test.Update(allyce);
Assert.AreEqual(1, updated);
var record = db.Test.FindById(1);
Assert.AreEqual("Allyce", record.Name);
}

[Test]
public void TestDeleteBy()
{
Expand Down
4 changes: 2 additions & 2 deletions Simple.Data.Mocking/Simple.Data.Mocking.nuspec
Expand Up @@ -2,7 +2,7 @@
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Simple.Data.Mocking</id>
<version>0.11.1.1</version>
<version>0.11.2.1</version>
<authors>Mark Rendle</authors>
<owners>Mark Rendle</owners>
<description>XML-based Mocking adapter for the Simple.Data data access library.</description>
Expand All @@ -12,7 +12,7 @@
<tags>database data .net40</tags>
<language>en-us</language>
<dependencies>
<dependency id="Simple.Data.Ado" version="0.11.1.1" />
<dependency id="Simple.Data.Ado" version="0.11.2.1" />
</dependencies>
</metadata>
</package>
4 changes: 2 additions & 2 deletions Simple.Data.SqlCe40/Simple.Data.SqlCe40.nuspec
Expand Up @@ -2,7 +2,7 @@
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Simple.Data.SqlCompact40</id>
<version>0.11.1.1</version>
<version>0.11.2.1</version>
<authors>Mark Rendle</authors>
<owners>Mark Rendle</owners>
<description>SQL Server Compact 4.0 ADO provider for the Simple.Data data access library.</description>
Expand All @@ -12,7 +12,7 @@
<tags>sqlserver compact sqlce database data ado .net40</tags>
<language>en-us</language>
<dependencies>
<dependency id="Simple.Data.Ado" version="0.11.1.1" />
<dependency id="Simple.Data.Ado" version="0.11.2.1" />
</dependencies>
</metadata>
</package>
4 changes: 2 additions & 2 deletions Simple.Data.SqlServer/Simple.Data.SqlServer.nuspec
Expand Up @@ -2,7 +2,7 @@
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Simple.Data.SqlServer</id>
<version>0.11.1.1</version>
<version>0.11.2.1</version>
<authors>Mark Rendle</authors>
<owners>Mark Rendle</owners>
<description>SQL Server ADO provider for the Simple.Data data access library.</description>
Expand All @@ -12,7 +12,7 @@
<tags>sqlserver database data ado .net40</tags>
<language>en-us</language>
<dependencies>
<dependency id="Simple.Data.Ado" version="0.11.1.1" />
<dependency id="Simple.Data.Ado" version="0.11.2.1" />
</dependencies>
</metadata>
</package>
6 changes: 3 additions & 3 deletions Simple.Data/InMemoryAdapter.cs
Expand Up @@ -149,18 +149,18 @@ private static void UpdateRecord(IDictionary<string, object> data, IDictionary<s
public override int Update(string tableName, IDictionary<string, object> data)
{
if (!_keyColumns.ContainsKey(tableName)) throw new InvalidOperationException("No key column(s) specified.");
IDictionary<string, object> row = null;
IDictionary<string, object> row;
if (_keyColumns[tableName].Length == 1)
{
row =
GetTable(tableName).Single(
d => d[_keyColumns[tableName][0]] == data[_keyColumns[tableName][0]]);
d => Equals(d[_keyColumns[tableName][0]], data[_keyColumns[tableName][0]]));
}
else
{
IEnumerable<IDictionary<string, object>> rows = GetTable(tableName);
row = _keyColumns[tableName]
.Aggregate(rows, (current, keyColumn) => current.Where(d => d[keyColumn] == data[keyColumn]))
.Aggregate(rows, (current, keyColumn) => current.Where(d => Equals(d[keyColumn], data[keyColumn])))
.Single();
}
UpdateRecord(data, row);
Expand Down
2 changes: 1 addition & 1 deletion Simple.Data/Simple.Data.nuspec
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Simple.Data.Core</id>
<version>0.11.1.1</version>
<version>0.11.2.1</version>
<authors>Mark Rendle</authors>
<owners>Mark Rendle</owners>
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
Expand Down
2 changes: 1 addition & 1 deletion Simple.Data/SimpleQuery.cs
Expand Up @@ -565,7 +565,7 @@ public T SingleOrDefault<T>(Func<T, bool> predicate)

public int Count()
{
return Select(new CountSpecialReference()).ToScalar();
return (int)Select(new CountSpecialReference()).ToScalar();
}

/// <summary>
Expand Down

0 comments on commit c8cd622

Please sign in to comment.