Fixes for EF

mcintyre321 · mcintyre321 · commit d307de066f5b · 2013-04-26T10:08:20.000+01:00
diff --git a/Mvc.JQuery.Datatables.sln.DotSettings.user b/Mvc.JQuery.Datatables.sln.DotSettings.user
@@ -5,4 +5,4 @@
 	<s:Boolean x:Key="/Default/Housekeeping/SolutionSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionPersistentData/=98F4BC003F814C2BA87B6120AD0009E9/@KeyIndexDefined">True</s:Boolean>
 	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionPersistentData/=98F4BC003F814C2BA87B6120AD0009E9/Name/@EntryValue">ThingsAreCalledCorrectly</s:String>
-	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionPersistentData/=98F4BC003F814C2BA87B6120AD0009E9/XmlSerializedElements/@EntryValue">&lt;Session&gt;&lt;Elements&gt;&lt;UnitTestElement Provider="nUnit" Id="Mvc.JQuery.DataTables.Tests.EF.EntityFramework" type="NUnitTestFixtureElement" Project="53671C41-666D-4269-A12A-BA6C2F209E7A" /&gt;&lt;UnitTestElement Provider="nUnit" Id="Mvc.JQuery.DataTables.Tests.EF.EntityFramework.I" ParentId="Mvc.JQuery.DataTables.Tests.EF.EntityFramework" type="NUnitTestElement" TypeName="Mvc.JQuery.DataTables.Tests.EF.EntityFramework" MethodName="I" Project="53671C41-666D-4269-A12A-BA6C2F209E7A" /&gt;&lt;/Elements&gt;&lt;/Session&gt;</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionPersistentData/=98F4BC003F814C2BA87B6120AD0009E9/XmlSerializedElements/@EntryValue">&lt;Session&gt;&lt;Elements&gt;&lt;UnitTestElement Provider="nUnit" Id="Mvc.JQuery.DataTables.Tests.EntityFrameworkCe" type="NUnitTestFixtureElement" Project="53671C41-666D-4269-A12A-BA6C2F209E7A" /&gt;&lt;UnitTestElement Provider="nUnit" Id="Mvc.JQuery.DataTables.Tests.Linq" type="NUnitTestFixtureElement" Project="53671C41-666D-4269-A12A-BA6C2F209E7A" /&gt;&lt;UnitTestElement Provider="nUnit" Id="Mvc.JQuery.DataTables.Tests.EntityFrameworkCe.Linq.SimpleOrder" ParentId="Mvc.JQuery.DataTables.Tests.EntityFrameworkCe" type="NUnitTestElement" TypeName="Mvc.JQuery.DataTables.Tests.Linq" MethodName="SimpleOrder" Project="53671C41-666D-4269-A12A-BA6C2F209E7A" /&gt;&lt;UnitTestElement Provider="nUnit" Id="Mvc.JQuery.DataTables.Tests.EntityFrameworkCe.Linq.SimpleOrderAndTransform" ParentId="Mvc.JQuery.DataTables.Tests.EntityFrameworkCe" type="NUnitTestElement" TypeName="Mvc.JQuery.DataTables.Tests.Linq" MethodName="SimpleOrderAndTransform" Project="53671C41-666D-4269-A12A-BA6C2F209E7A" /&gt;&lt;UnitTestElement Provider="nUnit" Id="Mvc.JQuery.DataTables.Tests.EntityFrameworkCe.Linq.SingleRecordSearch" ParentId="Mvc.JQuery.DataTables.Tests.EntityFrameworkCe" type="NUnitTestElement" TypeName="Mvc.JQuery.DataTables.Tests.Linq" MethodName="SingleRecordSearch" Project="53671C41-666D-4269-A12A-BA6C2F209E7A" /&gt;&lt;UnitTestElement Provider="nUnit" Id="Mvc.JQuery.DataTables.Tests.EntityFrameworkCe.Linq.SortFilterPage" ParentId="Mvc.JQuery.DataTables.Tests.EntityFrameworkCe" type="NUnitTestElement" TypeName="Mvc.JQuery.DataTables.Tests.Linq" MethodName="SortFilterPage" Project="53671C41-666D-4269-A12A-BA6C2F209E7A" /&gt;&lt;UnitTestElement Provider="nUnit" Id="Mvc.JQuery.DataTables.Tests.Linq.SimpleOrder" ParentId="Mvc.JQuery.DataTables.Tests.Linq" type="NUnitTestElement" TypeName="Mvc.JQuery.DataTables.Tests.Linq" MethodName="SimpleOrder" Project="53671C41-666D-4269-A12A-BA6C2F209E7A" /&gt;&lt;UnitTestElement Provider="nUnit" Id="Mvc.JQuery.DataTables.Tests.Linq.SimpleOrderAndTransform" ParentId="Mvc.JQuery.DataTables.Tests.Linq" type="NUnitTestElement" TypeName="Mvc.JQuery.DataTables.Tests.Linq" MethodName="SimpleOrderAndTransform" Project="53671C41-666D-4269-A12A-BA6C2F209E7A" /&gt;&lt;UnitTestElement Provider="nUnit" Id="Mvc.JQuery.DataTables.Tests.Linq.SingleRecordSearch" ParentId="Mvc.JQuery.DataTables.Tests.Linq" type="NUnitTestElement" TypeName="Mvc.JQuery.DataTables.Tests.Linq" MethodName="SingleRecordSearch" Project="53671C41-666D-4269-A12A-BA6C2F209E7A" /&gt;&lt;UnitTestElement Provider="nUnit" Id="Mvc.JQuery.DataTables.Tests.Linq.SortFilterPage" ParentId="Mvc.JQuery.DataTables.Tests.Linq" type="NUnitTestElement" TypeName="Mvc.JQuery.DataTables.Tests.Linq" MethodName="SortFilterPage" Project="53671C41-666D-4269-A12A-BA6C2F209E7A" /&gt;&lt;/Elements&gt;&lt;/Session&gt;</s:String></wpf:ResourceDictionary>
diff --git a/Mvc.JQuery.Datatables/DataTablesResult.cs b/Mvc.JQuery.Datatables/DataTablesResult.cs
@@ -101,11 +101,11 @@ DataTablesData GetResults(IQueryable<T> data, DataTablesParam param)
 
             var filters = new DataTablesFilter();
 
-            var filteredData = data.Select(_transform).AsQueryable();
+            var filteredData = (IQueryable) data.Select(_transform).AsQueryable();
 
             var searchColumns = TypeExtensions.GetSortedProperties<TRes>().Select(p => new ColInfo(p.Name, p.PropertyType)).ToArray();
             
-            filteredData = filters.FilterPagingSortingSearch(param, filteredData, searchColumns).Cast<TRes>();
+            filteredData = filters.FilterPagingSortingSearch(param, filteredData, searchColumns);
 
             var page = filteredData.Skip(param.iDisplayStart);
             if (param.iDisplayLength > -1)
@@ -118,7 +118,7 @@ DataTablesData GetResults(IQueryable<T> data, DataTablesParam param)
 
             var properties = TypeExtensions.GetSortedProperties<TRes>();
 
-            var transformedPage = from i in page.ToArray()
+            var transformedPage = from i in ((IQueryable<object>)page).ToArray()
                                   let pairs = properties.Select(p => new { p.PropertyType, Value = (p.GetGetMethod().Invoke(i, null)) })
                                   let values = pairs.Select(p => GetTransformedValue(p.PropertyType, p.Value))
                                   select values;
diff --git a/Mvc.JQuery.Datatables/TypeFilters.cs b/Mvc.JQuery.Datatables/TypeFilters.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace Mvc.JQuery.Datatables
 {
@@ -45,7 +46,15 @@ public static string NumericFilter(string query, string columnname, Type columnT
             }
             else
             {
-                return string.Format("({1} == null ? \"\" : {1}.ToString()).{0}", FilterMethod(query), columnname);
+                try
+                {
+                    parametersForLinqQuery.Add(Convert.ChangeType(query, columnType));
+                    return string.Format("{0} == @{1}", columnname, parametersForLinqQuery.Count - 1);
+                }
+                catch (FormatException)
+                {
+                }
+                return "false";
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.ComponentModel;`
`3`	`4`
`4`	`5`	`namespace Mvc.JQuery.Datatables`
`5`	`6`	`{`
`@@ -45,7 +46,15 @@ public static string NumericFilter(string query, string columnname, Type columnT`
`45`	`46`	`}`
`46`	`47`	`else`
`47`	`48`	`{`
`48`		`- return string.Format("({1} == null ? \"\" : {1}.ToString()).{0}", FilterMethod(query), columnname);`
	`49`	`+ try`
	`50`	`+ {`
	`51`	`+ parametersForLinqQuery.Add(Convert.ChangeType(query, columnType));`
	`52`	`+ return string.Format("{0} == @{1}", columnname, parametersForLinqQuery.Count - 1);`
	`53`	`+ }`
	`54`	`+ catch (FormatException)`
	`55`	`+ {`
	`56`	`+ }`
	`57`	`+ return "false";`
`49`	`58`	`}`
`50`	`59`	`}`
`51`	`60`