@@ -2589,7 +2589,7 @@ SELECT SERVERPROPERTY('Edition') AS Edition,
25892589
25902590 // Tidy up parameters
25912591 foreach (var p in proc.Parameters)
2592- p.NameHumanCase = Regex.Replace(p.NameHumanCase, @"[^A-Za-z0-9@\s]*", "");
2592+ p.NameHumanCase = CleanUp( Regex.Replace(p.NameHumanCase, @"[^A-Za-z0-9@\s]*", "") );
25932593
25942594 for(var count = 0; count < ds.Tables.Count; count++)
25952595 {
@@ -3660,9 +3660,16 @@ SELECT SERVERPROPERTY('Edition') AS Edition,
36603660 return name;
36613661 };
36623662
3663- public static readonly Func<DataColumn, string> WriteStoredProcReturnColumn = col =>
3664- string.Format("public {0} {1} {{ get; set; }}",
3665- StoredProcedure.WrapTypeIfNullable((col.DataType.Name.Equals("SqlHierarchyId") ? "Microsoft.SqlServer.Types." : "System.") + col.DataType.Name, col), col.ColumnName);
3663+ public static readonly Func<DataColumn, string> WriteStoredProcReturnColumn = col =>
3664+ {
3665+ var columnName = ReservedKeywords.Contains(col.ColumnName) ? "@" + col.ColumnName : col.ColumnName;
3666+
3667+ return string.Format("public {0} {1} {{ get; set; }}",
3668+ StoredProcedure.WrapTypeIfNullable(
3669+ (col.DataType.Name.Equals("SqlHierarchyId") ? "Microsoft.SqlServer.Types." : "System.") +
3670+ col.DataType.Name, col),
3671+ columnName);
3672+ };
36663673
36673674 public static readonly Func<StoredProcedure, string> WriteStoredProcReturnType = (sp) =>
36683675 {
0 commit comments