Skip to content

Commit 8666055

Browse files
ThatRendleThatRendle
committed
Code cleanup
1 parent f46c369 commit 8666055

34 files changed

Lines changed: 165 additions & 222 deletions

‎Simple.Data.IntegrationTest/DatabaseTest.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ static dynamic TestDatabase
2424
static Database CreateDatabase()
2525
{
2626
MockSchemaProvider.SetTables(new[] { "dbo", "Users", "BASE TABLE" });
27-
MockSchemaProvider.SetColumns(new[] { "dbo", "Users", "Name" },
27+
MockSchemaProvider.SetColumns(new[] { "dbo", "Users", "Id" },
28+
new[] { "dbo", "Users", "Name" },
2829
new[] { "dbo", "Users", "Password" },
2930
new[] { "dbo", "Users", "Age" });
3031
return new Database(new MockConnectionProvider(new MockDbConnection()));
@@ -59,7 +60,7 @@ public void TestFindAllByDynamic()
5960
public void TestInsertWithNamedArguments()
6061
{
6162
TestDatabase.Users.Insert(Name: "Steve", Age: 50);
62-
Assert.AreEqual("insert into Users (Name,Age) values (@p0,@p1)", MockDatabase.Sql, true);
63+
Assert.AreEqual("insert into [Users] ([Name],[Age]) values (@p0,@p1)", MockDatabase.Sql, true);
6364
Assert.AreEqual("Steve", MockDatabase.Parameters[0]);
6465
Assert.AreEqual(50, MockDatabase.Parameters[1]);
6566
}
@@ -68,7 +69,7 @@ public void TestInsertWithNamedArguments()
6869
public void TestUpdateWithNamedArguments()
6970
{
7071
TestDatabase.Users.UpdateById(Id: 1, Name: "Steve", Age: 50);
71-
Assert.AreEqual("update Users set Name = @p0, Age = @p1 where Id = @p2", MockDatabase.Sql, true);
72+
Assert.AreEqual("update [Users] set [Name] = @p0, [Age] = @p1 where [Id] = @p2", MockDatabase.Sql, true);
7273
Assert.AreEqual("Steve", MockDatabase.Parameters[0]);
7374
Assert.AreEqual(50, MockDatabase.Parameters[1]);
7475
Assert.AreEqual(1, MockDatabase.Parameters[2]);
@@ -78,7 +79,7 @@ public void TestUpdateWithNamedArguments()
7879
public void TestDeleteWithNamedArguments()
7980
{
8081
TestDatabase.Users.Delete(Id: 1);
81-
Assert.AreEqual("delete from Users where Id = @p0", MockDatabase.Sql, true);
82+
Assert.AreEqual("delete from [Users] where [Id] = @p0", MockDatabase.Sql, true);
8283
Assert.AreEqual(1, MockDatabase.Parameters[0]);
8384
}
8485

@@ -89,7 +90,7 @@ public void TestInsertOnTable()
8990
person.Name = "Phil";
9091
person.Age = 42;
9192
TestDatabase.Users.Insert(person);
92-
Assert.AreEqual("insert into Users (Name,Age) values (@p0,@p1)", MockDatabase.Sql, true);
93+
Assert.AreEqual("insert into [Users] ([Name],[Age]) values (@p0,@p1)", MockDatabase.Sql, true);
9394
Assert.AreEqual("Phil", MockDatabase.Parameters[0]);
9495
Assert.AreEqual(42, MockDatabase.Parameters[1]);
9596
}

‎Simple.Data.IntegrationTest/NameResolutionTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void NaturalJoinCreatesCorrectCommand()
2929
{
3030
// Arrange
3131
dynamic database = CreateDatabaseWithSingularNames();
32-
DateTime orderDate = new DateTime(2010, 1, 1);
32+
var orderDate = new DateTime(2010, 1, 1);
3333
const string expectedSql = "select [Customer].* from [Customer] join [Orders] on ([Customer].[CustomerId] = [Orders].[CustomerId]) where [Orders].[OrderDate] = @p1";
3434

3535
// Act
@@ -59,7 +59,7 @@ public void NaturalJoinWithShoutyCaseCreatesCorrectCommand()
5959
{
6060
// Arrange
6161
dynamic database = CreateDatabaseWithShoutyNames();
62-
DateTime orderDate = new DateTime(2010, 1, 1);
62+
var orderDate = new DateTime(2010, 1, 1);
6363
const string expectedSql = "select [CUSTOMER].* from [CUSTOMER] join [ORDER] on ([CUSTOMER].[CUSTOMER_ID] = [ORDER].[CUSTOMER_ID])"
6464
+ " where [ORDER].[ORDER_DATE] = @p1";
6565

‎Simple.Data.IntegrationTest/NaturalJoinTest.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ public void NaturalJoinCreatesCorrectCommand()
2929
{
3030
// Arrange
3131
dynamic database = CreateDatabase();
32-
DateTime orderDate = new DateTime(2010, 1, 1);
33-
var expectedSql =
34-
"select [Customer].* from [Customer] join [Orders] on ([Customer].[CustomerId] = [Orders].[CustomerId]) where [Orders].[OrderDate] = @p1";
32+
var orderDate = new DateTime(2010, 1, 1);
33+
const string expectedSql = "select [Customer].* from [Customer] join [Orders] on ([Customer].[CustomerId] = [Orders].[CustomerId]) where [Orders].[OrderDate] = @p1";
3534

3635
// Act
3736
database.Customer.Find(database.Customer.Orders.OrderDate == orderDate);

‎Simple.Data.Mocking.Test/MockConnectionSchemaTest.cs‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -14,47 +14,5 @@ public class MockConnectionSchemaTest
1414
public void TestMethod1()
1515
{
1616
}
17-
18-
private static DataSet DummySchema()
19-
{
20-
var dataSet = new DataSet();
21-
22-
dataSet.Tables.Add(CreateTables());
23-
dataSet.Tables.Add(CreateColumns());
24-
25-
return dataSet;
26-
}
27-
28-
private static DataTable CreateTables()
29-
{
30-
var tables = new DataTable("Tables");
31-
tables.Columns.Add("table_schema", typeof (string));
32-
tables.Columns.Add("table_name", typeof(string));
33-
tables.Columns.Add("table_type", typeof(string));
34-
tables.Rows.Add("dbo", "Customer", "BASE TABLE");
35-
tables.Rows.Add("dbo", "Orders", "BASE TABLE");
36-
return tables;
37-
}
38-
39-
private static DataTable CreateColumns()
40-
{
41-
var columns = new DataTable("Columns");
42-
43-
columns.Columns.Add("table_schema", typeof(string));
44-
columns.Columns.Add("table_name", typeof(string));
45-
columns.Columns.Add("column_name", typeof(string));
46-
columns.Columns.Add("is_nullable", typeof(string));
47-
columns.Columns.Add("data_type", typeof(string));
48-
columns.Columns.Add("character_maximum_length", typeof(int));
49-
50-
columns.Rows.Add("dbo", "Customer", "CustomerId", "NO", "integer", null);
51-
columns.Rows.Add("dbo", "Customer", "Name", "NO", "varchar", 100);
52-
53-
columns.Rows.Add("dbo", "Orders", "OrderId", "NO", "integer", null);
54-
columns.Rows.Add("dbo", "Orders", "CustomerId", "NO", "integer", null);
55-
columns.Rows.Add("dbo", "Orders", "Date", "NO", "datetime", null);
56-
57-
return columns;
58-
}
5917
}
6018
}

‎Simple.Data.Mocking/Ado/MockDataReader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public override char GetChar(int ordinal)
145145
}
146146

147147
/// <summary>
148-
/// Reads a stream of characters from the specified column, starting at location indicated by <paramref name="dataIndex"/>, into the buffer, starting at the location indicated by <paramref name="bufferIndex"/>.
148+
/// Reads a stream of characters from the specified column, starting at location indicated by <paramref name="dataOffset"/>, into the buffer, starting at the location indicated by <paramref name="bufferOffset"/>.
149149
/// </summary>
150150
/// <returns>
151151
/// The actual number of characters read.

‎Simple.Data.Mocking/Ado/MockDbCommand.cs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,6 @@ public override int ExecuteNonQuery()
5353
return 1;
5454
}
5555

56-
public IDataReader arse(CommandBehavior behavior)
57-
{
58-
return ExecuteReader();
59-
}
60-
61-
public IDataReader arse()
62-
{
63-
MockDatabase.Record(this);
64-
if (_connection != null && _connection.DummyDataTable != null)
65-
{
66-
return _connection.DummyDataTable.CreateDataReader();
67-
}
68-
return new MockDataReader(Enumerable.Empty<IDataRecord>());
69-
}
70-
7156
public override object ExecuteScalar()
7257
{
7358
MockDatabase.Record(this);

‎Simple.Data.Mocking/XmlMockAdapter.cs‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,14 @@ public XmlMockAdapter(string xml)
2424
_data = new Lazy<XElement>(() => XElement.Parse(xml));
2525
}
2626

27-
public IDictionary<string, object> Find(string tableName, SimpleExpression criteria)
28-
{
29-
return FindAll(tableName, criteria).FirstOrDefault();
30-
}
31-
32-
public IEnumerable<IDictionary<string, object>> FindAll(string tableName)
27+
private IEnumerable<IDictionary<string, object>> FindAll(string tableName)
3328
{
3429
return GetTableElement(tableName).Elements().Select(e => e.AttributesToDictionary());
3530
}
3631

37-
public IEnumerable<IDictionary<string, object>> FindAll(string tableName, IDictionary<string, object> criteria)
38-
{
39-
var query = GetTableElement(tableName).Elements();
40-
foreach (var criterion in criteria)
41-
{
42-
var column = criterion.Key;
43-
var value = criterion.Value;
44-
query = query.Where(xe => xe.TryGetAttributeValue(column).Equals(value.ToString()));
45-
}
46-
47-
return query.Select(e => e.AttributesToDictionary());
48-
}
49-
50-
public IEnumerable<IDictionary<string, object>> FindAll(string tableName, SimpleExpression criteria)
32+
public IEnumerable<IDictionary<string, object>> Find(string tableName, SimpleExpression criteria)
5133
{
34+
if (criteria == null) return FindAll(tableName);
5235
return
5336
GetTableElement(tableName).Elements().Where(GetPredicate(criteria)).Select(
5437
e => e.AttributesToDictionary());
@@ -61,7 +44,7 @@ private static Func<XElement, bool> GetPredicate(SimpleExpression criteria)
6144
var leftPredicate = GetPredicate((SimpleExpression) criteria.LeftOperand);
6245
var rightPredicate = GetPredicate((SimpleExpression)criteria.LeftOperand);
6346
return criteria.Type == SimpleExpressionType.And
64-
? new Func<XElement, bool>(xml => leftPredicate(xml) && rightPredicate(xml))
47+
? (xml => leftPredicate(xml) && rightPredicate(xml))
6548
: new Func<XElement, bool>(xml => leftPredicate(xml) || rightPredicate(xml));
6649
}
6750
if (criteria.LeftOperand is DynamicReference)

‎Simple.Data.SqlCe35/Simple.Data.SqlCe35.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<EmbeddedResource Include="Properties\Resources.resx">
9090
<Generator>ResXFileCodeGenerator</Generator>
9191
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
92+
<SubType>Designer</SubType>
9293
</EmbeddedResource>
9394
</ItemGroup>
9495
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Simple.Data.SqlCe35/SqlCeSchemaProvider.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public SqlCeSchemaProvider(IConnectionProvider connectionProvider)
2121

2222
public IEnumerable<Table> GetTables()
2323
{
24-
foreach (var row in _GetTables().AsEnumerable())
24+
foreach (var row in GetTablesDataTable().AsEnumerable())
2525
{
2626
yield return new Table(row["TABLE_NAME"].ToString(), null,
2727
row["TABLE_TYPE"].ToString() == "BASE TABLE" ? TableType.Table : TableType.View);
@@ -30,7 +30,7 @@ public IEnumerable<Table> GetTables()
3030

3131
public IEnumerable<Column> GetColumns(Table table)
3232
{
33-
foreach (var row in _GetColumns(table).AsEnumerable())
33+
foreach (var row in GetColumnsDataTable(table).AsEnumerable())
3434
{
3535
yield return new Column(row["COLUMN_NAME"].ToString(), table);
3636
}
@@ -60,12 +60,12 @@ public IEnumerable<ForeignKey> GetForeignKeys(Table table)
6060
}
6161
}
6262

63-
private DataTable _GetTables()
63+
private DataTable GetTablesDataTable()
6464
{
6565
return SelectToDataTable("SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES");
6666
}
6767

68-
private DataTable _GetColumns(Table table)
68+
private DataTable GetColumnsDataTable(Table table)
6969
{
7070
return SelectToDataTable("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" + table.ActualName + "'");
7171
}

‎Simple.Data.UnitTest/DynamicStringExtensionsTest.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Linq;
44
using System.Text;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
6+
using Simple.Data.Extensions;
67

78
namespace Simple.Data.UnitTest
89
{

0 commit comments

Comments
 (0)