From b06e62f3ab6914053db875dde7a68814936bf3dc Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Wed, 6 Apr 2011 15:24:14 +1000 Subject: [PATCH] remove reject files --- PerformanceTests.cs.rej | 38 ----------------------------------- Program.cs.rej | 11 ----------- SqlMapper.csproj.rej | 44 ----------------------------------------- 3 files changed, 93 deletions(-) delete mode 100644 PerformanceTests.cs.rej delete mode 100644 Program.cs.rej delete mode 100644 SqlMapper.csproj.rej diff --git a/PerformanceTests.cs.rej b/PerformanceTests.cs.rej deleted file mode 100644 index e0d1d1f7..00000000 --- a/PerformanceTests.cs.rej +++ /dev/null @@ -1,38 +0,0 @@ ---- PerformanceTests.cs -+++ PerformanceTests.cs -@@ -1,13 +1,13 @@ - using System; - using System.Collections.Generic; -+using System.Data.Linq; -+using System.Data.SqlClient; -+using System.Diagnostics; - using System.Linq; --using System.Text; --using System.Data.SqlClient; --using SqlMapper.Linq2Sql; --using System.Data.Linq; --using System.Diagnostics; - using Massive; - using Simple.Data; -+using SqlMapper.Linq2Sql; -+using SqlMapper.NHibernate; - - namespace SqlMapper - { -@@ -113,6 +113,16 @@ - var simpleDataDb5 = Database.OpenConnection(Program.connectionString); - tests.Add(id => simpleDataDb5.Posts.FindAllById(id).ToList(), "Simple.Data FindAllBy ToList"); - -+ var nhSession1 = NHibernateHelper.OpenSession(); -+ tests.Add(id => nhSession1.CreateSQLQuery(@"select * from Posts where Id = :id") -+ .SetInt32("id", id) -+ .List(), "NHibernate SQL"); -+ -+ var nhSession2 = NHibernateHelper.OpenSession(); -+ tests.Add(id => nhSession2.CreateQuery(@"from Post as p where p.Id = :id") -+ .SetInt32("id", id) -+ .List(), "NHibernate HQL"); -+ - // HAND CODED - var connection = Program.GetOpenConnection(); - diff --git a/Program.cs.rej b/Program.cs.rej deleted file mode 100644 index 88ae5290..00000000 --- a/Program.cs.rej +++ /dev/null @@ -1,11 +0,0 @@ ---- Program.cs -+++ Program.cs -@@ -32,7 +32,7 @@ - class Program - { - -- public static readonly string connectionString = @"Data Source=.\sql2k8r2;Initial Catalog=tempdb;Integrated Security=True"; -+ public static readonly string connectionString = @"Data Source=.;Initial Catalog=tempdb;Integrated Security=True"; - - public static SqlConnection GetOpenConnection() - { diff --git a/SqlMapper.csproj.rej b/SqlMapper.csproj.rej deleted file mode 100644 index ba253cab..00000000 --- a/SqlMapper.csproj.rej +++ /dev/null @@ -1,44 +0,0 @@ ---- SqlMapper.csproj -+++ SqlMapper.csproj -@@ -35,6 +35,18 @@ - 4 - - -+ -+ Dependencies\Iesi.Collections.dll -+ -+ -+ Dependencies\LinFu.DynamicProxy.dll -+ -+ -+ Dependencies\NHibernate.dll -+ -+ -+ Dependencies\NHibernate.ByteCode.LinFu.dll -+ - - False - Dependencies\Simple.Data.dll -@@ -72,6 +84,7 @@ - - - -+ - - - -@@ -107,6 +120,14 @@ - DataClasses.dbml - - -+ -+ -+ -+ -+ -+ Always -+ -+ - -