Minor bug fixes and nuget publish

Samples/DataLayer.cs

@@ -42,7 +42,7 @@ public CategoryRepository(DataService DataService) : base(DataService)
 		{
 		}
 
-		public new DataService DataService  
+		public new NorthwindDataService  DataService  
 		{
 			get { return (NorthwindDataService) base.DataService; }
 			set { base.DataService = value; }
@@ -141,7 +141,7 @@ public CustomerRepository(DataService DataService) : base(DataService)
 		{
 		}
 
-		public new DataService DataService  
+		public new NorthwindDataService  DataService  
 		{
 			get { return (NorthwindDataService) base.DataService; }
 			set { base.DataService = value; }
@@ -275,7 +275,7 @@ public EmployeeRepository(DataService DataService) : base(DataService)
 		{
 		}
 
-		public new DataService DataService  
+		public new NorthwindDataService  DataService  
 		{
 			get { return (NorthwindDataService) base.DataService; }
 			set { base.DataService = value; }
@@ -380,7 +380,7 @@ public OrderDetailRepository(DataService DataService) : base(DataService)
 		{
 		}
 
-		public new DataService DataService  
+		public new NorthwindDataService  DataService  
 		{
 			get { return (NorthwindDataService) base.DataService; }
 			set { base.DataService = value; }
@@ -520,7 +520,7 @@ public OrderRepository(DataService DataService) : base(DataService)
 		{
 		}
 
-		public new DataService DataService  
+		public new NorthwindDataService  DataService  
 		{
 			get { return (NorthwindDataService) base.DataService; }
 			set { base.DataService = value; }
@@ -639,7 +639,7 @@ public ProductRepository(DataService DataService) : base(DataService)
 		{
 		}
 
-		public new DataService DataService  
+		public new NorthwindDataService  DataService  
 		{
 			get { return (NorthwindDataService) base.DataService; }
 			set { base.DataService = value; }
@@ -725,7 +725,7 @@ public ShipperRepository(DataService DataService) : base(DataService)
 		{
 		}
 
-		public new DataService DataService  
+		public new NorthwindDataService  DataService  
 		{
 			get { return (NorthwindDataService) base.DataService; }
 			set { base.DataService = value; }
@@ -827,7 +827,7 @@ public SupplierRepository(DataService DataService) : base(DataService)
 		{
 		}
 
-		public new DataService DataService  
+		public new NorthwindDataService  DataService  
 		{
 			get { return (NorthwindDataService) base.DataService; }
 			set { base.DataService = value; }
@@ -918,7 +918,7 @@ public ProductSaleRepository(DataService DataService) : base(DataService)
 		{
 		}
 
-		public new DataService DataService  
+		public new NorthwindDataService  DataService  
 		{
 			get { return (NorthwindDataService) base.DataService; }
 			set { base.DataService = value; }
@@ -943,19 +943,28 @@ namespace Samples.Entities
 {
 	public partial class NorthwindDataService : DataService
 	{
+		partial void OnCreated();
+
+		private void Init()
+		{
+			EntityNameToEntityViewTransform = TextTransform.None;
+			EntityLiteProvider.DefaultSchema = "dbo";
+			OnCreated();
+		}
+
         public NorthwindDataService() : base("Northwind")
         {
-			EntityNameToEntityViewTransform = TextTransform.None;
+			Init();
         }
 
         public NorthwindDataService(string connectionStringName) : base(connectionStringName)
         {
-			EntityNameToEntityViewTransform = TextTransform.None;
+			Init();
         }
 
         public NorthwindDataService(string connectionString, string providerName) : base(connectionString, providerName)
         {
-			EntityNameToEntityViewTransform = TextTransform.None;
+			Init();
         }
 
 		private Samples.Entities.CategoryRepository _CategoryRepository;

Samples/EntityLite.ttinclude/DataLayerGeneration.ttinclude

@@ -20,10 +20,11 @@ public class DataLayerGeneration : IDisposable
 
     public DataLayerGeneration()
     {
-        DataServiceName = "DataService";
+        DataServiceName = "AppDataService";
         RootNamespace = "inercya.Entities";
         ProceduresClassName = "StoredProcedures";
 		EntityNameToEntityViewTransform = TextTransform.None;
+		ConnectionStringName = "AppConnectionString";
     }
 
 	private  DbProviderFactory _factory;

Samples/EntityLite.ttinclude/DataServiceGeneration.ttinclude

@@ -7,21 +7,30 @@ namespace <#= generation.RootNamespace #>
 {
 	public partial class <#= generation.DataServiceName #> : DataService
 	{
-<#+	if (!string.IsNullOrEmpty(generation.ConnectionStringName)) { #>
+		partial void OnCreated();
+
+		private void Init()
+		{
+			EntityNameToEntityViewTransform = TextTransform.<#= generation.EntityNameToEntityViewTransform #>;
+<#+	if (! string.IsNullOrEmpty(generation.DefaultSchema)) { #>
+			EntityLiteProvider.DefaultSchema = "<#= generation.DefaultSchema #>";
+<#+	} #>
+			OnCreated();
+		}
+
         public <#= generation.DataServiceName #>() : base("<#= generation.ConnectionStringName #>")
         {
-			EntityNameToEntityViewTransform = TextTransform.<#= generation.EntityNameToEntityViewTransform #>;
+			Init();
         }
-<#+ } #>
 
         public <#= generation.DataServiceName #>(string connectionStringName) : base(connectionStringName)
         {
-			EntityNameToEntityViewTransform = TextTransform.<#= generation.EntityNameToEntityViewTransform #>;
+			Init();
         }
 
         public <#= generation.DataServiceName #>(string connectionString, string providerName) : base(connectionString, providerName)
         {
-			EntityNameToEntityViewTransform = TextTransform.<#= generation.EntityNameToEntityViewTransform #>;
+			Init();
         }
 <#+
 	foreach (var entity in generation.EntitySettings)

inercya.EntityLite/AssemblyInfo.cs

@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.0.7.0")]
-[assembly: AssemblyFileVersion("1.0.7.0")]
+[assembly: AssemblyVersion("1.0.9.0")]
+[assembly: AssemblyFileVersion("1.0.9.0")]

inercya.EntityLite/DataService.cs

@@ -300,7 +300,7 @@ public DataService()
             Initialize();
         }
 
-        protected virtual void Initialize()
+        private void Initialize()
         {
             this.EntityNameToEntityViewTransform = TextTransform.None;
             this.commandBuilder = new CommandBuilder(this);
@@ -309,15 +309,17 @@ protected virtual void Initialize()
             this.InitialMillisecondsRetryDelay = 20;
         }
 
-        public DataService(string connectionStringName) : this()
+        public DataService(string connectionStringName)
         {
             this.ConnectionStringName = connectionStringName;
+            Initialize();
         }
 
-        public DataService(string connectionString, string providerName) :this()
+        public DataService(string connectionString, string providerName)
         {
             this._connectionString = connectionString;
             this._providerName = providerName;
+            Initialize();
         }
 
 
@@ -467,12 +469,12 @@ protected internal virtual void Insert(object entity)
             });
 		}
 
-        protected internal virtual int Update(object entity)
+        protected internal int Update(object entity)
         {
             return Update(entity, GetValidatedForUpdateSortedFields(entity));
         }
 
-        public int Update(object entity, params string[] fieldsToUpdate)
+        protected internal int Update(object entity, params string[] fieldsToUpdate)
         {
             return Update(entity, GetValidatedForUpdateSortedFields(entity, fieldsToUpdate));
         }
@@ -500,7 +502,7 @@ private object GeByPrimaryKeyIncludingJustPkAndRowVersionFields(Type entityType,
             return q.FirstOrDefault();
         }
 
-        protected virtual int Update(object entity, List<string> sortedFields)
+        protected internal virtual int Update(object entity, List<string> sortedFields)
         {
             if (entity == null) throw new ArgumentNullException("entity");
             Type entityType = entity.GetType();
@@ -539,7 +541,7 @@ protected virtual int Update(object entity, List<string> sortedFields)
             return affectedRecords;
         }
 
-        protected List<string> GetValidatedForUpdateSortedFields(object entity, string[] fieldsToUpdate = null)
+        protected internal List<string> GetValidatedForUpdateSortedFields(object entity, string[] fieldsToUpdate = null)
         {
             if (entity == null) throw new ArgumentNullException("entity");
             Type entityType = entity.GetType();

inercya.EntityLite/Repository.cs

@@ -15,6 +15,7 @@ public interface IRepository
         void Insert(object entity);
 
         void Update(object entity);
+        void Update(object entity, params string[] fieldsToUpdate);
         void Delete(object entity);
         Type EntityType { get; }
 
@@ -30,6 +31,7 @@ public interface IRepository<TEntity> : IRepository
         void Save(TEntity entity);
         void Insert(TEntity entity);
         void Update(TEntity entity);
+        void Update(TEntity entity, params string[] fieldsToUpdate);
         void Delete(TEntity entity);
         new IQueryLite<TEntity> Query(Projection projection);
         new IQueryLite<TEntity> Query(string projectionName);
@@ -85,9 +87,19 @@ public virtual void Insert(TEntity entity)
             this.DataService.Insert(entity);
         }
 
-        public virtual void Update(TEntity entity)
+        public void Update(TEntity entity)
         {
-            this.DataService.Update(entity);
+            this.Update(entity, this.DataService.GetValidatedForUpdateSortedFields(entity));
+        }
+
+        protected virtual void Update(TEntity entity, List<string> sortedFields)
+        {
+            this.DataService.Update(entity, sortedFields);
+        }
+
+        public void Update(TEntity entity, params string[] fieldsToUpdate)
+        {
+            this.Update(entity, this.DataService.GetValidatedForUpdateSortedFields(entity, fieldsToUpdate));
         }
 
         public virtual void Delete(TEntity entity)
@@ -162,6 +174,11 @@ void IRepository.Save(object entity)
             this.Save((TEntity)entity);
         }
 
+        void IRepository.Update(object entity, string[] fieldsToUpdate)
+        {
+            this.Update((TEntity)entity, fieldsToUpdate);
+        }
+
         void IRepository.Delete(object entity)
         {
             this.Delete((TEntity)entity);

nuget/Core/EntityLite.Core.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>EntityLite.Core</id>
-    <version>1.0.7-Beta</version>
+    <version>1.0.9-Beta</version>
     <title>i-nercya EntityLite Core</title>
     <authors>Jesús López (i-nercya intelligent software)</authors>
     <owners></owners>

nuget/Core/Publish.cmd

@@ -1,3 +1,3 @@
 %~dp0..\NuGet.exe Update -self
-%~dp0..\NuGet.exe Push EntityLite.Core.1.0.7-Beta.nupkg
+%~dp0..\NuGet.exe Push EntityLite.Core.1.0.9-Beta.nupkg
 pause

nuget/Generators/EntityLite.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>EntityLite</id>
-    <version>1.0.7-Beta</version>
+    <version>1.0.9-Beta</version>
     <title>i-nercya EntityLite</title>
     <authors>Jesús López (i-nercya intelligent software)</authors>
     <owners></owners>
@@ -22,7 +22,7 @@
     <copyright>Copyright 2013</copyright>
     <dependencies>
       <group targetFramework="net35-client">
-        <dependency id="EntityLite.Core" version="[1.0.7-Beta]" />
+        <dependency id="EntityLite.Core" version="[1.0.9-Beta]" />
       </group>
     </dependencies>
     <references></references>

nuget/Generators/Publish.cmd

@@ -1,3 +1,3 @@
 %~dp0..\NuGet.exe Update -self
-%~dp0..\NuGet.exe Push EntityLite.1.0.7-Beta.nupkg
+%~dp0..\NuGet.exe Push EntityLite.1.0.9-Beta.nupkg
 pause

nuget/Generators/content/EntityLite.ttinclude/DataLayerGeneration.ttinclude

@@ -5,6 +5,7 @@ public class DataLayerGeneration : IDisposable
 
     public string ProviderName { get; set; }
     public string ConnectionString { get; set; }
+	public string ConnectionStringName {get; set;}
     public string RootNamespace { get; set; }
     public string DataServiceName { get; set; }
     public string ProceduresClassName { get; set; }
@@ -19,10 +20,11 @@ public class DataLayerGeneration : IDisposable
 
     public DataLayerGeneration()
     {
-        DataServiceName = "DataService";
+        DataServiceName = "AppDataService";
         RootNamespace = "inercya.Entities";
         ProceduresClassName = "StoredProcedures";
 		EntityNameToEntityViewTransform = TextTransform.None;
+		ConnectionStringName = "AppConnectionString";
     }
 
 	private  DbProviderFactory _factory;

nuget/Generators/content/EntityLite.ttinclude/DataServiceGeneration.ttinclude

@@ -7,15 +7,30 @@ namespace <#= generation.RootNamespace #>
 {
 	public partial class <#= generation.DataServiceName #> : DataService
 	{
-
+		partial void OnCreated();
+
+		private void Init()
+		{
+			EntityNameToEntityViewTransform = TextTransform.<#= generation.EntityNameToEntityViewTransform #>;
+<#+	if (! string.IsNullOrEmpty(generation.DefaultSchema)) { #>
+			EntityLiteProvider.DefaultSchema = "<#= generation.DefaultSchema #>";
+<#+	} #>
+			OnCreated();
+		}
+
+        public <#= generation.DataServiceName #>() : base("<#= generation.ConnectionStringName #>")
+        {
+			Init();
+        }
+
         public <#= generation.DataServiceName #>(string connectionStringName) : base(connectionStringName)
         {
-			EntityNameToEntityViewTransform = TextTransform.<#= generation.EntityNameToEntityViewTransform #>;
+			Init();
         }
 
         public <#= generation.DataServiceName #>(string connectionString, string providerName) : base(connectionString, providerName)
         {
-			EntityNameToEntityViewTransform = TextTransform.<#= generation.EntityNameToEntityViewTransform #>;
+			Init();
         }
 <#+
 	foreach (var entity in generation.EntitySettings)

nuget/Generators/content/EntityLite.ttinclude/EntityGeneration.ttinclude

@@ -187,7 +187,7 @@ void RenderEntityRepositoryClass(DataLayerGeneration generation, EntitySetting e
 		{
 		}
 
-		public new DataService DataService  
+		public new <#= generation.DataServiceName #>  DataService  
 		{
 			get { return (<#= generation.DataServiceName #>) base.DataService; }
 			set { base.DataService = value; }

nuget/Generators/content/EntityLite.ttinclude/EntityLite.ttinclude

@@ -3,7 +3,7 @@
 <#@ assembly name="Microsoft.CSharp" #>
 <#@ assembly name="System.Data" #>
 <#@ assembly name="System.Xml" #>
-<#@ assembly name="$(SolutionDir)packages\EntityLite.Core.1.0.7-Beta\lib\net35-client\inercya.EntityLite.dll" #>
+<#@ assembly name="$(SolutionDir)packages\EntityLite.Core.1.0.9-Beta\lib\net35-client\inercya.EntityLite.dll" #>
 <#@ import namespace="System" #>
 <#@ import namespace="System.Reflection" #>
 <#@ import namespace="System.Data" #>