[castle-commits] [hammett commit: 1931]: /trunk/ActiveRecord/Generator/Castle.ActiveRecord.Generator.Components/

[<sv...@ca...>]

User: hammett
Date: 2006/05/28 05:28 PM

Modified:
 /trunk/ActiveRecord/Generator/Castle.ActiveRecord.Generator.Components/
  NamingService.cs

Log:
 Applied patch by Nick Hemsley
 (AR-51 replace invalid property names (only 1-9,a-z,A_Z))

File Changes:

Directory: /trunk/ActiveRecord/Generator/Castle.ActiveRecord.Generator.Components/
==================================================================================

File [modified]: NamingService.cs
Delta lines: +2 -0
===================================================================
--- trunk/ActiveRecord/Generator/Castle.ActiveRecord.Generator.Components/NamingService.cs	2006-05-28 21:10:01 UTC (rev 1930)
+++ trunk/ActiveRecord/Generator/Castle.ActiveRecord.Generator.Components/NamingService.cs	2006-05-28 21:28:14 UTC (rev 1931)
@@ -80,6 +80,7 @@
 			columnName = Regex.Replace(columnName, "([a-z])_([a-z])", UpCaser);
 			columnName = Regex.Replace(columnName, "(tb_|_)", "");
 			columnName = Regex.Replace(columnName, "^[a-z]", UpCaser);
+			columnName = Regex.Replace(columnName, "[^1-9a-zA-Z]", "");
 
 			return columnName;
 		}
@@ -92,6 +93,7 @@
 			columnName = Regex.Replace(columnName, "([a-z])_([a-z])", UpCaser);
 			columnName = Regex.Replace(columnName, "(tb_|_)", "");
 			columnName = Regex.Replace(columnName, "^[A-Z]",  DownCaser);
+			columnName = Regex.Replace(columnName, "[^1-9a-zA-Z]", "");
 
 			return String.Format("_{0}", columnName);
 		}