Fix ModelName for Database First

Fix ModelName for Database First

Author: zzzprojects

src/Z.EntityFramework.Plus.EF5.NET40/Properties/AssemblyInfo.cs

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("e4c2af73-caeb-4429-bcb6-0a359484e064")]
-[assembly: AssemblyVersion("1.3.5")]
-[assembly: AssemblyFileVersion("1.3.5")]
+[assembly: AssemblyVersion("1.3.6")]
+[assembly: AssemblyFileVersion("1.3.6")]

src/Z.EntityFramework.Plus.EF5.NET40/_Internal/Model/Model/Model.GetModelName.cs

@@ -20,7 +20,8 @@ internal static partial class Model
         /// <returns>The model name.</returns>
         internal static string GetModelName(this DbContext @this)
         {
-            var connectionString = @this.Database.Connection.ConnectionString;
+            // Only EntityConnection contains model
+            var connectionString = @this.Database.GetEntityConnection().ConnectionString;
             var end = connectionString.IndexOf(".msl") - 1;
 
             if (end <= -1)

src/Z.EntityFramework.Plus.EF5/Properties/AssemblyInfo.cs

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("abcbb878-043c-4957-a334-90e9872e684e")]
-[assembly: AssemblyVersion("1.3.5")]
-[assembly: AssemblyFileVersion("1.3.5")]
+[assembly: AssemblyVersion("1.3.6")]
+[assembly: AssemblyFileVersion("1.3.6")]

src/Z.EntityFramework.Plus.EF5/_Internal/Model/Model/Model.GetModelName.cs

@@ -20,7 +20,8 @@ internal static partial class Model
         /// <returns>The model name.</returns>
         internal static string GetModelName(this DbContext @this)
         {
-            var connectionString = @this.Database.Connection.ConnectionString;
+            // Only EntityConnection contains model
+            var connectionString = @this.Database.GetEntityConnection().ConnectionString;
             var end = connectionString.IndexOf(".msl") - 1;
 
             if (end <= -1)

src/Z.EntityFramework.Plus.EF6.NET40/Properties/AssemblyInfo.cs

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("ac398eb8-0a31-4d06-a804-84d10b6da96d")]
-[assembly: AssemblyVersion("1.3.5")]
-[assembly: AssemblyFileVersion("1.3.5")]
+[assembly: AssemblyVersion("1.3.6")]
+[assembly: AssemblyFileVersion("1.3.6")]

src/Z.EntityFramework.Plus.EF6.NET40/_Internal/Model/Model/Model.GetModelName.cs

@@ -20,7 +20,8 @@ internal static partial class Model
         /// <returns>The model name.</returns>
         internal static string GetModelName(this DbContext @this)
         {
-            var connectionString = @this.Database.Connection.ConnectionString;
+            // Only EntityConnection contains model
+            var connectionString = @this.Database.GetEntityConnection().ConnectionString;
             var end = connectionString.IndexOf(".msl") - 1;
 
             if (end <= -1)

src/Z.EntityFramework.Plus.EF6/Properties/AssemblyInfo.cs

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("89f47e22-ff83-4ac8-be90-c6755748cf89")]
-[assembly: AssemblyVersion("1.3.5")]
-[assembly: AssemblyFileVersion("1.3.5")]
+[assembly: AssemblyVersion("1.3.6")]
+[assembly: AssemblyFileVersion("1.3.6")]

src/Z.EntityFramework.Plus.EF6/_Internal/Model/Model/Model.GetModelName.cs

@@ -20,7 +20,8 @@ internal static partial class Model
         /// <returns>The model name.</returns>
         internal static string GetModelName(this DbContext @this)
         {
-            var connectionString = @this.Database.Connection.ConnectionString;
+            // Only EntityConnection contains model
+            var connectionString = @this.Database.GetEntityConnection().ConnectionString;
             var end = connectionString.IndexOf(".msl") - 1;
 
             if (end <= -1)