Merge branch 'v2' of github.com:markrendle/Simple.Data into v2

ThatRendle · ThatRendle · commit fe411e84866a · 2014-03-31T13:57:12.000+01:00
diff --git a/src/Simple.Data.Ado/AdoAdapterQueryRunner.cs b/src/Simple.Data.Ado/AdoAdapterQueryRunner.cs
@@ -183,13 +183,14 @@ private void ApplyPaging(SimpleQuery query, List<ICommandBuilder> commandBuilder
             else
             {
                 var table = _adapter.GetSchema().FindTable(query.TableName);
-                if (table.PrimaryKey == null || table.PrimaryKey.Length == 0)
+                var keys = new string[0];
+                if (table.PrimaryKey != null && table.PrimaryKey.Length > 0)
                 {
-                    throw new AdoAdapterException(string.Format("Cannot apply paging to table '{0}' with no primary key.", table.ActualName));
+                    keys = table.PrimaryKey.AsEnumerable()
+                        .Select(k => string.Format("{0}.{1}", table.QualifiedName, _adapter.GetSchema().QuoteObjectName(k)))
+                        .ToArray();
                 }
-                var keys = table.PrimaryKey.AsEnumerable()
-                     .Select(k => string.Format("{0}.{1}", table.QualifiedName, _adapter.GetSchema().QuoteObjectName(k)))
-                     .ToArray();
+
                 int skip = skipClause == null ? 0 : skipClause.Count;
                 int take = takeClause == null ? maxInt : takeClause.Count;
                 commandTexts = queryPager.ApplyPaging(mainCommandBuilder.Text, keys,  skip, take);
diff --git a/src/Simple.Data.SqlServer/SqlQueryPager.cs b/src/Simple.Data.SqlServer/SqlQueryPager.cs
@@ -20,8 +20,13 @@ public IEnumerable<string> ApplyLimit(string sql, int take)
             yield return SelectMatch.Replace(sql, match => match.Value + " TOP " + take + " ");
         }
 
-        public IEnumerable<string> ApplyPaging(string sql, string[] keys, int skip, int take)
-        {
+        public IEnumerable<string> ApplyPaging(string sql, string[] keys, int skip, int take)
+        {
+            if (keys == null || keys.Length == 0)
+            {
+                throw new AdoAdapterException("Cannot apply paging to table with no primary key.");
+            }
+
             sql = sql.Replace(Environment.NewLine, " ");
             var builder = new StringBuilder("WITH __Data AS (SELECT ");
 
diff --git a/src/Simple.Data.SqlTest/SqlQueryPagerTest.cs b/src/Simple.Data.SqlTest/SqlQueryPagerTest.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using NUnit.Framework;
+using Simple.Data.Ado;
 using Simple.Data.SqlServer;
 
 namespace Simple.Data.SqlTest
@@ -112,5 +113,15 @@ public void ShouldExcludeLeftJoinedTablesFromSubSelect()
             var modified = Normalize.Replace(pagedSql, " ").ToLowerInvariant();
             Assert.AreEqual(expected, modified);
         }
+
+        [Test]
+        public void ShouldThrowIfTableHasNoPrimaryKey([Values(null, new string[0])]string[] keys)
+        {
+            var sql = "select [dbo].[d].[a] from [dbo].[b]";
+
+            Assert.Throws<AdoAdapterException>(
+                () => new SqlQueryPager().ApplyPaging(sql, keys, 5, 10).ToList()
+            );
+        }
     }
 }
diff --git a/src/Simple.Data/MefHelper.cs b/src/Simple.Data/MefHelper.cs
@@ -96,7 +96,14 @@ private static CompositionContainer CreateAppDomainContainer()
 
         private static bool IsSimpleDataAssembly(Assembly assembly)
         {
-            return assembly.GetFullName().StartsWith("Simple.Data.", StringComparison.OrdinalIgnoreCase);
+            try
+            {
+                return assembly.GetFullName().StartsWith("Simple.Data.", StringComparison.OrdinalIgnoreCase);
+            }
+            catch
+            {
+                return false;
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,14 @@ private static CompositionContainer CreateAppDomainContainer()`
`96`	`96`
`97`	`97`	`private static bool IsSimpleDataAssembly(Assembly assembly)`
`98`	`98`	`{`
`99`		`- return assembly.GetFullName().StartsWith("Simple.Data.", StringComparison.OrdinalIgnoreCase);`
	`99`	`+ try`
	`100`	`+ {`
	`101`	`+ return assembly.GetFullName().StartsWith("Simple.Data.", StringComparison.OrdinalIgnoreCase);`
	`102`	`+ }`
	`103`	`+ catch`
	`104`	`+ {`
	`105`	`+ return false;`
	`106`	`+ }`
`100`	`107`	`}`
`101`	`108`	`}`
`102`	`109`	`}`