Fix for T4 template where column names conflict with other methods/pr…

…operties
kohenkatz · Apr 26, 2011 · c8239ed · c8239ed
1 parent 0dc8915
commit c8239ed
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/PetaPoco.DevBed/Program.cs b/PetaPoco.DevBed/Program.cs
@@ -11,12 +11,8 @@ namespace PetaPoco.DevBed
 
 	class Program
 	{
-
 		static void Main(string[] args)
 		{
-			var db = new PetaPoco.Database("mysql");
-
-			Console.WriteLine(db.SingleOrDefault<string>("SELECT title FROM articles WHERE article_id=@0", 270));
 		}
 	}
 }
diff --git a/PetaPoco.Tests/Tests.cs b/PetaPoco.Tests/Tests.cs
@@ -33,7 +33,7 @@ public void CreateDB()
 		[TestFixtureTearDown]
 		public void DeleteDB()
 		{
-			//db.Execute(Utils.LoadTextResource(string.Format("PetaPoco.Tests.{0}_done.sql", _connectionStringName)));
+			db.Execute(Utils.LoadTextResource(string.Format("PetaPoco.Tests.{0}_done.sql", _connectionStringName)));
 		}
 
 		long GetRecordCount()

diff --git a/PetaPoco.Tests/petapoco.sdf b/PetaPoco.Tests/petapoco.sdf
diff --git a/PetaPoco/Models/Generated/Database.cs b/PetaPoco/Models/Generated/Database.cs
@@ -100,6 +100,16 @@ public class Record<T> where T:new()
 
 
 
+	[TableName("petapoco2")]
+	[PrimaryKey("email", autoIncrement=false)]
+	[ExplicitColumns]
+    public partial class petapoco2 : postgresqlDB.Record<petapoco2>  
+    {
+        [Column] public string email { get; set; }
+        [Column] public string name { get; set; }
+	}
+
+
 	[TableName("petapoco")]
 	[PrimaryKey("id")]
 	[ExplicitColumns]
@@ -115,16 +125,6 @@ public partial class petapoco : postgresqlDB.Record<petapoco>
         [Column("col w space")] public int? col_w_space { get; set; }
 	}
 
-
-	[TableName("petapoco2")]
-	[PrimaryKey("email", autoIncrement=false)]
-	[ExplicitColumns]
-    public partial class petapoco2 : postgresqlDB.Record<petapoco2>  
-    {
-        [Column] public string email { get; set; }
-        [Column] public string name { get; set; }
-	}
-
 }
 
 
diff --git a/PetaPoco/Models/Generated/PetaPoco.Core.ttinclude b/PetaPoco/Models/Generated/PetaPoco.Core.ttinclude
@@ -383,6 +383,15 @@ Tables LoadTables()
 
 			conn.Close();
 
+			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)
+			{
+				foreach (var c in t.Columns)
+				{
+					c.PropertyName = rxClean.Replace(c.PropertyName, "_$1");
+				}
+			}
+
 		    return result;
 		}
 	}