Support CLR types from .dacpac

ErikEJ · Nov 27, 2023 · cc2019a · cc2019a
1 parent 60040d5
commit cc2019a
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 11 deletions.
diff --git a/...tityFrameworkCore.7.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac.csproj b/...tityFrameworkCore.7.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <PackageId>ErikEJ.EntityFrameworkCore.SqlServer.Dacpac</PackageId>
-    <PackageVersion>7.0.3</PackageVersion>	  
+    <PackageVersion>7.0.4</PackageVersion>	  
     <NoWarn>$(NoWarn);EF1001</NoWarn>	  
     <Authors>ErikEJ</Authors>
     <Description>Enables reverse engineering an EF Core model from a data-tier application package (DACPAC).</Description>

diff --git a/...tityFrameworkCore.8.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac.csproj b/...tityFrameworkCore.8.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <PackageId>ErikEJ.EntityFrameworkCore.SqlServer.Dacpac</PackageId>
-    <PackageVersion>8.0.0</PackageVersion>	  
+    <PackageVersion>8.0.1</PackageVersion>	  
     <NoWarn>$(NoWarn);EF1001</NoWarn>	  
     <Authors>ErikEJ</Authors>
     <Description>Enables reverse engineering an EF Core model from a data-tier application package (DACPAC).</Description>

diff --git a/...EntityFrameworkCore.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.6.SqlServer.Dacpac.csproj b/...EntityFrameworkCore.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.6.SqlServer.Dacpac.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <PackageId>ErikEJ.EntityFrameworkCore.SqlServer.Dacpac</PackageId>
-    <PackageVersion>6.0.3</PackageVersion>	  
+    <PackageVersion>6.0.4</PackageVersion>	  
     <NoWarn>$(NoWarn);EF1001</NoWarn>	  
     <Authors>ErikEJ</Authors>
     <Description>Enables reverse engineering an EF Core model from a data-tier application package (DACPAC).</Description>

diff --git a/...J.EntityFrameworkCore.SqlServer.Dacpac/Scaffolding/SqlServerDacpacDatabaseModelFactory.cs b/...J.EntityFrameworkCore.SqlServer.Dacpac/Scaffolding/SqlServerDacpacDatabaseModelFactory.cs
@@ -380,17 +380,19 @@ private static IEnumerable<TSqlColumn> GetColumns(TSqlTable item, DatabaseTable
                 string storeType = null;
                 string systemTypeName = null;
 
-                if (col.DataType.First().Name.Parts.Count > 1)
+                if (col.DataType.First().Name.Parts.Count > 1 && typeAliases.TryGetValue($"{col.DataType.First().Name.Parts[0]}.{col.DataType.First().Name.Parts[1]}", out var value))
                 {
-                    if (typeAliases.TryGetValue($"{col.DataType.First().Name.Parts[0]}.{col.DataType.First().Name.Parts[1]}", out var value))
-                    {
-                        storeType = value.StoreType;
-                        systemTypeName = value.TypeName;
-                    }
+                    storeType = value.StoreType;
+                    systemTypeName = value.TypeName;
                 }
                 else
                 {
                     var dataTypeName = col.DataType.First().Name.Parts[0];
+                    if (col.DataType.First().Name.Parts.Count > 1)
+                    {
+                        dataTypeName = col.DataType.First().Name.Parts[1];
+                    }
+
                     int maxLength = col.IsMax ? -1 : col.Length;
                     storeType = GetStoreType(dataTypeName, maxLength, col.Precision, col.Scale);
                     systemTypeName = dataTypeName;

diff --git a/src/GUI/RevEng.Core.60/ConnectionStringResolver.cs b/src/GUI/RevEng.Core.60/ConnectionStringResolver.cs
@@ -8,7 +8,6 @@
 
 #if !CORE80
 using FirebirdSql.Data.FirebirdClient;
-using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
 using MySqlConnector;
 using Oracle.ManagedDataAccess.Client;
 #endif

diff --git a/src/GUI/efcpt.7/Program.cs b/src/GUI/efcpt.7/Program.cs
@@ -107,7 +107,7 @@ private static Task<int> DisplayHelpAsync(ParserResult<ScaffoldOptions> parserRe
         {
             h.AddPostOptionsLine("SAMPLES:");
             h.AddPostOptionsLine(@"  efcpt ""Data Source=.;Initial Catalog=Chinook;User=sa;Pwd=123""");
-            h.AddPostOptionsLine(@"  efcpt ""/temp/mydb.dacpac"" Microsoft.EntityFrameworkCore.SqlServer");
+            h.AddPostOptionsLine(@"  efcpt ""/temp/mydb.dacpac"" mssql");
             h.AddPostOptionsLine(@"  efcpt ""Server=my.database.windows.net;Authentication=Active Directory Default;Database=myddb;User [email protected];"" mssql");
             return h;
         }));

diff --git a/src/GUI/lib/efreveng60.exe.zip b/src/GUI/lib/efreveng60.exe.zip
diff --git a/src/GUI/lib/efreveng70.exe.zip b/src/GUI/lib/efreveng70.exe.zip
diff --git a/src/GUI/lib/efreveng80.exe.zip b/src/GUI/lib/efreveng80.exe.zip
diff --git a/test/ScaffoldingTester/Database/Database.sqlproj b/test/ScaffoldingTester/Database/Database.sqlproj
@@ -61,5 +61,6 @@
   </ItemGroup>
   <ItemGroup>
     <Build Include="dbo\Tables\Table1.sql" />
+    <Build Include="dbo\Tables\Logger.sql" />
   </ItemGroup>
 </Project>
diff --git a/test/ScaffoldingTester/Database/dbo/Tables/Logger.sql b/test/ScaffoldingTester/Database/dbo/Tables/Logger.sql
@@ -0,0 +1,13 @@
+CREATE TABLE [dbo].[Logger]
+(
+	[Id] NVARCHAR(10) NOT NULL, 
+    [CompanyId] NCHAR(2) NOT NULL,
+    [Location] GEOGRAPHY NULL,
+    [Parents] HierarchyId NULL,
+    [LocationChanged] DATETIMEOFFSET NULL, 
+    [BatteryLevel] INT NULL, 
+    [SignalStrength] INT NULL, 
+    [MeasurementsChanged] DATETIMEOFFSET NULL,
+    [TestCol] [sys].[sysname] NULL, 
+    CONSTRAINT [PK_Loggers] PRIMARY KEY CLUSTERED ([Id])
+);