Skip to content

Commit ed86628

Browse files
committed
Remove any TVF functions that have non-scalar parameters, such as DataTable
1 parent 8c29de4 commit ed86628

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.Core.ttinclude

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,7 @@
699699
}
700700

701701
// Remove stored procs where the return model type contains spaces and cannot be mapped
702+
// Also need to remove any TVF functions with parameters that are non scalar types, such as DataTable
702703
var validStoredProcedures = new List<StoredProcedure>();
703704
foreach (var sp in storedProcs)
704705
{
@@ -707,8 +708,14 @@
707708
validStoredProcedures.Add(sp);
708709
continue;
709710
}
710-
if(!sp.ReturnModels.Any(returnColumns => returnColumns.Any(c => c.ColumnName.Contains(" "))))
711-
validStoredProcedures.Add(sp);
711+
712+
if (sp.ReturnModels.Any(returnColumns => returnColumns.Any(c => c.ColumnName.Contains(" "))))
713+
continue;
714+
715+
if (sp.IsTVF && sp.ReturnModels.Any(returnColumns => returnColumns.Any(c => c.DataType.IsClass)))
716+
continue;
717+
718+
validStoredProcedures.Add(sp);
712719
}
713720
return validStoredProcedures;
714721
}

0 commit comments

Comments
 (0)