Fix Postgres

Author: DeeJayTC

sample/ApiGeneratorSampleApp/Program.cs

@@ -11,8 +11,6 @@
 builder.Services.AddApiGeneratorIdentity(builder.Configuration);
 
 builder.Services.AddApiGeneratorServices()
-                //.AddAssemblyWithOData(Assembly.GetExecutingAssembly())
-                //.AddAssemblyWithODataFromUri("https://xxx","")
                 .AddAssembly(Assembly.GetExecutingAssembly())
                 .AddDataContextSQL()
                 .AddOData()

src/TCDev.APIGenerator.Data.Postgres/ProviderConfig.cs

@@ -4,34 +4,30 @@
 using TCDev.APIGenerator.Extension;
 using TCDev.APIGenerator.Model.Interfaces;
 
-namespace TCDev.APIGenerator.SQL;
+namespace TCDev.APIGenerator.Data.Postgres;
 
-public static partial class ServiceExtension
+public class ProviderConfig : IDatabaseProviderConfiguration
 {
-    public class ProviderConfig : IDatabaseProviderConfiguration
+    private IConfiguration configuration;
+    private ApiGeneratorServiceBuilder builder;
+    public ProviderConfig(IConfiguration config, ApiGeneratorServiceBuilder builder)
     {
-        private IConfiguration configuration;
-        private ApiGeneratorServiceBuilder builder;
-        public ProviderConfig(IConfiguration config, ApiGeneratorServiceBuilder builder)
-        {
-            this.configuration = config;
-            this.builder = builder;
-        }
+        this.configuration = config;
+        this.builder = builder;
+    }
 
-        public void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            if (string.IsNullOrEmpty(builder.ApiGeneratorConfig.DatabaseOptions.Connection)
-                &&
-                string.IsNullOrEmpty(builder.ApiGeneratorConfig.DatabaseOptions.ConnectionStringName)
-               ) throw new ArgumentException("Please set either Connection or ConnectonStringName, (and not both!)");
+    public void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        if (string.IsNullOrEmpty(builder.ApiGeneratorConfig.DatabaseOptions.Connection)
+            &&
+            string.IsNullOrEmpty(builder.ApiGeneratorConfig.DatabaseOptions.ConnectionStringName)
+           ) throw new ArgumentException("Please set either Connection or ConnectonStringName, (and not both!)");
 
-            var connection = !string.IsNullOrEmpty(builder.ApiGeneratorConfig.DatabaseOptions.ConnectionStringName) ?
-                configuration.GetConnectionString(builder.ApiGeneratorConfig.DatabaseOptions.ConnectionStringName) :
-                builder.ApiGeneratorConfig.DatabaseOptions.Connection;
+        var connection = !string.IsNullOrEmpty(builder.ApiGeneratorConfig.DatabaseOptions.ConnectionStringName) ?
+            configuration.GetConnectionString(builder.ApiGeneratorConfig.DatabaseOptions.ConnectionStringName) :
+            builder.ApiGeneratorConfig.DatabaseOptions.Connection;
 
 
-            optionsBuilder.UseNpgsql(connection);
-        }
+        optionsBuilder.UseNpgsql(connection);
     }
-
 }

src/TCDev.APIGenerator.Data.Postgres/ServiceExtension.cs

@@ -8,8 +8,9 @@
 using TCDev.APIGenerator.Data;
 using TCDev.APIGenerator.Extension;
 using TCDev.APIGenerator.Model.Interfaces;
+using TCDev.APIGenerator.Data.Postgres;
 
-namespace TCDev.APIGenerator.SQL;
+namespace TCDev.APIGenerator.Extension;
 
 public static partial class ServiceExtension
 {
@@ -45,7 +46,7 @@ public static IApplicationBuilder UseAutomaticApiMigrations(
         return app;
     }
 
-    private static ApiGeneratorServiceBuilder AddDataContextSQL(
+    public static ApiGeneratorServiceBuilder AddDataContextPostgres(
         this ApiGeneratorServiceBuilder builder, 
         Action<NpgsqlDbContextOptionsBuilder>? NpgsqlOptions = null)
     {

src/TCDev.APIGenerator.Data.SQL/ServiceExtension.cs

@@ -28,7 +28,7 @@ public static IApplicationBuilder UseAutomaticApiMigrations(
                     dbContext.MigrateToLatestVersion(new DbMigrationsOptions
                     {
                         AutomaticMigrationsEnabled = true,
-                        AutomaticMigrationDataLossAllowed = allowDataLoss
+                        AutomaticMigrationDataLossAllowed = true
                     });
 
                     dbContext.MigrateToLatestVersion();