fix: allowing the systemusertablename to be set

EAVFW · Aug 23, 2024 · d176905 · d176905
1 parent 49b6089
commit d176905
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/aspire/EAVFramework.Extensions.Aspire.Hosting/AspireBuilderExtensions.cs b/aspire/EAVFramework.Extensions.Aspire.Hosting/AspireBuilderExtensions.cs
@@ -528,13 +528,13 @@ public static IResourceBuilder<EAVFWModelProjectResource> FromBackup(this IResou
         public static IResourceBuilder<EAVFWModelProjectResource> PublishTo(
             this IResourceBuilder<EAVFWModelProjectResource> builder,
             IResourceBuilder<SqlServerDatabaseResource> target,
-            string administratorEmail, Guid initialAdministratorUserId, string Username, string schema = "dbo"
+            string administratorEmail, Guid initialAdministratorUserId, string Username, string schema = "dbo", string systemUsersTableName = "SystemUsers",
             )
         {
             builder.ApplicationBuilder.Services.TryAddLifecycleHook<PublishEAVFWProjectLifecycleHook>();
             builder.WithAnnotation(new TargetDatabaseResourceAnnotation(target.Resource.Name, target.Resource)
             {
-                InitialEmail = administratorEmail, InitialIdentity = initialAdministratorUserId, Schema = schema, InitialUsername = Username, UserPrincipalName = Username.Replace(" ","")
+                InitialEmail = administratorEmail, InitialIdentity = initialAdministratorUserId, SystemUsersTableName = systemUsersTableName, Schema = schema, InitialUsername = Username, UserPrincipalName = Username.Replace(" ","")
             }, ResourceAnnotationMutationBehavior.Replace);
             return builder;
         }

diff --git a/aspire/EAVFramework.Extensions.Aspire.Hosting/PublishEAVFWProjectLifecycleHook.cs b/aspire/EAVFramework.Extensions.Aspire.Hosting/PublishEAVFWProjectLifecycleHook.cs
@@ -586,7 +586,7 @@ private static async Task DoMigrationAsync(string modelProjectPath, TargetDataba
             var variablegenerator = new SQLClientParameterGenerator();
             var migrator = new SQLMigrationGenerator(variablegenerator, new ManifestPermissionGenerator(variablegenerator));
 
-            var sqls = await migrator.GenerateSQL(Path.GetDirectoryName(modelProjectPath), true, "SystemUsers",
+            var sqls = await migrator.GenerateSQL(Path.GetDirectoryName(modelProjectPath), true, targetDatabaseResourceAnnotation.SystemUsersTableName ?? "SystemUsers",
                 o =>
                 {
                     o.UseNetTopologySuite();

diff --git a/aspire/EAVFramework.Extensions.Aspire.Hosting/TargetDatabaseResourceAnnotation.cs b/aspire/EAVFramework.Extensions.Aspire.Hosting/TargetDatabaseResourceAnnotation.cs
@@ -28,6 +28,7 @@ public record TargetDatabaseResourceAnnotation(string TargetDatabaseResourceName
         public string InitialEmail { get;  set; }
         public string UserPrincipalName { get;  set; }
         public string InitialUsername { get;  set; }
+        public string SystemUsersTableName{get;set;} = "SystemUsers";
         public string InitialSystemSecurityGroupId { get;  set; } = "1b714972-8d0a-4feb-b166-08d93c6ae328";
     }
     public record CreateSigninUrlAnnotation(IResource Target, IResource Project) : IResourceAnnotation