Merge pull request #182 from WimAtIHomer/patch-1

Added 3 new options to OrmLite.Poco.tt

Author: gkathire

src/T4/OrmLite.Core.ttinclude

@@ -150,10 +150,7 @@ public class Column
 		{
 		  if(IsNullable)
 		  {
-			if(PropertyType.Equals("string") == false)
-			{
-				return PropertyType +"?";
-			}			
+			return PropertyType + CheckNullable(this);		
 		  }
 		  return PropertyType;
 		}
@@ -270,7 +267,7 @@ static Func<string, string> CleanUp = (str) =>
     return str;
 };
 
-string CheckNullable(Column col)
+static string CheckNullable(Column col)
 {
     string result="";
     if(col.IsNullable && 
@@ -448,7 +445,7 @@ public string GetColumnDefaultValue(Column col)
         return sysType;	
 }
 
-Tables LoadTables()
+Tables LoadTables(bool makeSingular)
 {
 	InitConnectionString();
 
@@ -547,7 +544,12 @@ Tables LoadTables()
 			var rxClean = new Regex("^(Equals|GetHashCode|GetType|ToString|repo|Save|IsNew|Insert|Update|Delete|Exists|SingleOrDefault|Single|First|FirstOrDefault|Fetch|Page|Query)$");
 			foreach (var t in result)
 			{
+				if (!makeSingular)
+				{
+					t.ClassName = t.CleanName;
+				}
 				t.ClassName = ClassPrefix + t.ClassName + ClassSuffix;
+				
 				foreach (var c in t.Columns)
 				{
 					c.PropertyName = rxClean.Replace(c.PropertyName, "_$1");
@@ -956,13 +958,26 @@ class SqlServerSchemaReader : SchemaReader
 			p.Value=table;
 			cmd.Parameters.Add(p);
 
-			var result=cmd.ExecuteScalar();
-
-			if(result!=null)
-				return result.ToString();    
+			var result = "";
+			DbDataReader reader = cmd.ExecuteReader();
+			try
+			{
+				if (reader.Read())
+				{
+					result = reader[0].ToString();
+					if (reader.Read())
+					{
+						result = "";
+					}
+				}
+			}
+			finally
+			{
+				// Always call Close when done reading.
+				reader.Close();
+			}
+			return result;    
 		}	         
-		
-		return "";
 	}
 
 	string GetPropertyType(string sqlType)
@@ -1274,13 +1289,26 @@ class SqlServerCeSchemaReader : SchemaReader
 			p.Value=table;
 			cmd.Parameters.Add(p);
 
-			var result=cmd.ExecuteScalar();
-
-			if(result!=null)
-				return result.ToString();    
+			var result = "";
+			DbDataReader reader = cmd.ExecuteReader();
+			try
+			{
+				if (reader.Read())
+				{
+					result = reader[0].ToString();
+					if (reader.Read())
+					{
+						result = "";
+					}
+				}
+			}
+			finally
+			{
+				// Always call Close when done reading.
+				reader.Close();
+			}
+			return result;    
 		}	         
-		
-		return "";
 	}
 
 	string GetPropertyType(string sqlType)
@@ -1467,13 +1495,26 @@ class PostGreSqlSchemaReader : SchemaReader
 			p.Value=table;
 			cmd.Parameters.Add(p);
 
-			var result=cmd.ExecuteScalar();
-
-			if(result!=null)
-				return result.ToString();    
+			var result = "";
+			DbDataReader reader = cmd.ExecuteReader();
+			try
+			{
+				if (reader.Read())
+				{
+					result = reader[0].ToString();
+					if (reader.Read())
+					{
+						result = "";
+					}
+				}
+			}
+			finally
+			{
+				// Always call Close when done reading.
+				reader.Close();
+			}
+			return result;   
 		}	         
-		
-		return "";
 	}
 
 	string GetPropertyType(string sqlType)
@@ -1781,13 +1822,26 @@ and ucc.position = 1";
 			p.Value=table;
 			cmd.Parameters.Add(p);
 
-			var result=cmd.ExecuteScalar();
-
-			if(result!=null)
-				return result.ToString();    
+			var result = "";
+			DbDataReader reader = cmd.ExecuteReader();
+			try
+			{
+				if (reader.Read())
+				{
+					result = reader[0].ToString();
+					if (reader.Read())
+					{
+						result = "";
+					}
+				}
+			}
+			finally
+			{
+				// Always call Close when done reading.
+				reader.Close();
+			}
+			return result;   
 		}	         
-		
-		return "";
 	}
 
 	string GetPropertyType(string sqlType, string dataScale)

src/T4/OrmLite.Poco.tt

@@ -5,10 +5,13 @@
 	Namespace = "";
 	ClassPrefix = "";
 	ClassSuffix = "";
-	bool SplitIntoMultipleFiles = false;
+	bool SplitIntoMultipleFiles = false;		// if true: Generates one file for every class
+	bool MakeSingular = true;			// if true: Changes the classname to singular if tablename is not singular
+	bool UseIdAsPK = true;				// if true: Changes the primary key property name to Id
+	bool GenerateConstructor = false;		// if true: Generates the default empty constructor 
 
     // Read schema
-	var tables = LoadTables();
+	var tables = LoadTables(MakeSingular);
 
 
 /*
@@ -53,14 +56,20 @@ foreach(Table tbl in from t in tables where !t.Ignore select t)
 {
 manager.StartNewFile(tbl.Name + ".cs");
 #>
-
+<# if (MakeSingular) {#>
 	[Alias("<#=tbl.Name#>")]
-    public partial class <#=tbl.ClassName#><#if (tbl.HasPK()) { #> : IHasId<<#=tbl.PK.PropertyType#>><#}#>
+<#}#>
+    public partial class <#=tbl.ClassName#><#if (tbl.HasPK() && UseIdAsPK) { #> : IHasId<<#=tbl.PK.PropertyType#>><#}#> 
     {
-<#
+<# if (GenerateConstructor) { #>
+		public <#=tbl.ClassName#>()
+		{
+		}
+
+<# }
 foreach(Column col in from c in tbl.Columns where !c.Ignore select c)
 {
- if ((col.Name!=col.PropertyName) || (col.IsPK)) { #>
+ if ((col.Name!=col.PropertyName) || (col.IsPK && UseIdAsPK)) { #>
         [Alias("<#=col.Name#>")]
 <# }  if (col.PropertyType == "string" && col.Size > 0) { #>
         [StringLength(<#=col.Size#>)]
@@ -70,9 +79,12 @@ foreach(Column col in from c in tbl.Columns where !c.Ignore select c)
         [Required]
 <# } if (!col.IsPK){#>
         public <#=col.ProperPropertyType#> <#=col.PropertyName#> { get; set;}
-<#} else {#>
+<# } if (col.IsPK && UseIdAsPK) { #>
         public <#=col.ProperPropertyType#> Id { get; set;}
-<#}#>
+<# } if (col.IsPK && !UseIdAsPK) { #>
+		[PrimaryKey]
+        public <#=col.ProperPropertyType#> <#=col.PropertyName#> { get; set;}
+<# } #>
 <# } #>
     }
 <#  manager.EndBlock(); #>