Merge pull request #474 from rsafier/master

Further refinements on POCO and SP templates

Author: mythz

src/T4/OrmLite.Core.ttinclude

@@ -1007,13 +1007,19 @@ class SqlServerSchemaReader : SchemaReader
 					{
 						SPOutputColumn param=new SPOutputColumn();
 						param.Name = rdr["name"].ToString();
-						if (rdr["is_nullable"] == "0")
-						{
-							param.DotNetType = GetPropertyType(rdr["system_type_name"].ToString());
+
+						var sqlType = rdr["system_type_name"].ToString();
+						var index = sqlType.IndexOf('('); //Trim off size data
+						if (index > 0) sqlType = sqlType.Substring(0,index);
+
+						var nullable = rdr["is_nullable"].ToString() ; 
+						if (nullable == "0")
+						{ 
+							param.DotNetType = GetPropertyType(sqlType);
 						}
 						else
 						{ 
-							param.DotNetType = GetNullablePropertyType(rdr["system_type_name"].ToString());
+							param.DotNetType = GetNullablePropertyType(sqlType);
 						}
 					if (!result.Any(t=>t.Name == param.Name)) result.Add(param);
 					}   

src/T4/OrmLite.Poco.tt

@@ -71,8 +71,14 @@ manager.StartNewFile(tbl.Name + ".cs");
 		}
 
 <# }
+var priorProperyNames = new List<string>();
 foreach(Column col in from c in tbl.Columns where !c.Ignore select c)
 {
+if (priorProperyNames.Contains(col.PropertyName)) //Change duplicate style names
+{
+	col.PropertyName = "_" + col.PropertyName;
+}
+priorProperyNames.Add(col.PropertyName);
  if ((col.Name!=col.PropertyName) || (col.IsPK && UseIdAsPK)) { #>
         [Alias("<#=col.Name#>")]
 <# }  if (col.PropertyType == "string" && col.Size > 0) { #>
@@ -101,5 +107,3 @@ foreach(Column col in from c in tbl.Columns where !c.Ignore select c)
 <#manager.EndBlock(); #>
 <#manager.Process(SplitIntoMultipleFiles); #>
 <#  }   #>
-
-

src/T4/OrmLite.SP.tt

@@ -47,7 +47,7 @@ namespace <#=SPNamespace#>
 <#if (sp.Parameters.Count > 0) { foreach(var param in sp.Parameters){#>
 			dbCmd.Parameters.Add(CreateNewParameter(dbCmd,"<#=param.Name#>",@<#=Inflector.MakeInitialLowerCase(param.Name)#>,<#=GetParamDirection(param.Direction)#>,<#=param.DbType#>));
 <#}#> <#}#>
-dbCmd.Parameters.Add(CreateNewParameter(dbCmd,"__ReturnValue",0,ParameterDirection.ReturnValue,DbType.Int32));
+			dbCmd.Parameters.Add(CreateNewParameter(dbCmd,"__ReturnValue",0,ParameterDirection.ReturnValue,DbType.Int32));
 			return new OrmLiteSPStatement(db, dbCmd);
 		}
 
@@ -59,13 +59,14 @@ dbCmd.Parameters.Add(CreateNewParameter(dbCmd,"__ReturnValue",0,ParameterDirecti
 	if (!sp.SPOutputColumns.Any()) continue; #>
 		public class <#=sp.CleanName#>_Result
 		{ 
-		<# foreach(var prop in sp.SPOutputColumns){ if (char.IsDigit(prop.Name[0])) { #>
-			[Alias("<#=prop.Name#>")]
-			public <#=prop.DotNetType#> _<#=prop.Name#> { get; set; }	
-			<#} else {#>
-			public <#=prop.DotNetType#> <#=prop.Name#> { get; set; }			
-		<#}}#>
-		}
+		<# foreach(var prop in sp.SPOutputColumns) { var alias = false; var propName = prop.Name;  if (propName.Contains(' ') || propName.Contains('$') || propName.Contains('+')) { propName = propName.Replace(' ','_').Replace("$","_Dollar").Replace("+","_Plus"); alias = true; }; if (char.IsDigit(propName[0])) { propName = "_" + propName; alias = true; };
+			
+		if (alias) {#>		[Alias("<#=prop.Name#>")]
+		<#}#>
+		public <#=prop.DotNetType#> <#=propName#> { get; set; }			
+		<#}
+		#>
+}
 <#}#>
 
 }