add Oracle support

fixes ErikEJ#1622
kshman · Dec 20, 2022 · 626a7a5 · 626a7a5
1 parent 77a5450
commit 626a7a5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/src/GUI/RevEng.Core.70/RevEng.Core.70.csproj b/src/GUI/RevEng.Core.70/RevEng.Core.70.csproj
@@ -39,6 +39,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="7.0.1" />
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="7.0.1" />
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="7.0.1" />
+    <PackageReference Include="Oracle.EntityFrameworkCore" Version="7.21.8" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="7.0.0-silver.1" />
     <PackageReference Include="SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime" Version="7.0.0" />
 		<PackageReference Include="System.CodeDom" Version="6.0.0" />

diff --git a/src/GUI/RevEng.Core/Functions/SqlServerFunctionScaffolder.cs b/src/GUI/RevEng.Core/Functions/SqlServerFunctionScaffolder.cs
@@ -101,8 +101,9 @@ private void GenerateModelCreation(RoutineModel model)
 
         private void GenerateFunctionStub(Routine function, RoutineModel model)
         {
+            // TODO Use Code.Identifier again after 7.0.3
             var paramStrings = function.Parameters
-                .Select(p => $"{Code.Reference(p.ClrType())} {(string.IsNullOrEmpty(p.Name) ? p.Name : Code.Identifier(p.Name))}");
+                .Select(p => $"{Code.Reference(p.ClrType())} {p.Name}");
 
             var identifier = GenerateIdentifierName(function, model);
 

diff --git a/src/GUI/RevEng.Core/ReverseEngineerScaffolder.cs b/src/GUI/RevEng.Core/ReverseEngineerScaffolder.cs
@@ -78,6 +78,8 @@ public SavedModelFiles GenerateDbContext(
             {
                 UseDataAnnotations = !options.UseFluentApiOnly,
                 Language = "C#",
+
+                // TODO Use Code.Identifier again after 7.0.3
                 ContextName = options.ContextClassName,
                 ContextDir = outputContextDir,
                 RootNamespace = null,

diff --git a/src/GUI/RevEng.Core/ServiceProviderBuilder.cs b/src/GUI/RevEng.Core/ServiceProviderBuilder.cs
@@ -1,6 +1,5 @@
 #if !CORE70
 using FirebirdSql.EntityFrameworkCore.Firebird.Design.Internal;
-using Oracle.EntityFrameworkCore.Design.Internal;
 #endif
 using EntityFrameworkCore.Scaffolding.Handlebars;
 using ErikEJ.EntityFrameworkCore.SqlServer.Scaffolding;
@@ -16,6 +15,7 @@
 using Microsoft.EntityFrameworkCore.SqlServer.Design.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Design.Internal;
+using Oracle.EntityFrameworkCore.Design.Internal;
 using Pomelo.EntityFrameworkCore.MySql.Design.Internal;
 using RevEng.Common;
 using RevEng.Core.Procedures;
@@ -232,12 +232,11 @@ public static ServiceProvider Build(ReverseEngineerCommandOptions options, List<
 
                     break;
 
-#if !CORE70
                 case DatabaseType.Oracle:
                     var oracleProvider = new OracleDesignTimeServices();
                     oracleProvider.ConfigureDesignTimeServices(serviceCollection);
                     break;
-
+#if !CORE70
                 case DatabaseType.Firebird:
                     var firebirdProvider = new FbDesignTimeServices();
                     firebirdProvider.ConfigureDesignTimeServices(serviceCollection);

diff --git a/src/GUI/lib/efreveng70.exe.zip b/src/GUI/lib/efreveng70.exe.zip