Updates SchemaInitializer to enable SqlServerFhirModel initialization…

… changes. (#44)
microsoft · Jun 8, 2020 · 0800f6f · 0800f6f
1 parent eb73cf1
commit 0800f6f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/Microsoft.Health.SqlServer/Features/Schema/SchemaInitializer.cs b/src/Microsoft.Health.SqlServer/Features/Schema/SchemaInitializer.cs
@@ -22,6 +22,7 @@ public class SchemaInitializer : IStartable
         private readonly SchemaUpgradeRunner _schemaUpgradeRunner;
         private readonly SchemaInformation _schemaInformation;
         private readonly ILogger<SchemaInitializer> _logger;
+        private bool _started;
 
         public SchemaInitializer(SqlServerDataStoreConfiguration sqlServerDataStoreConfiguration, SchemaUpgradeRunner schemaUpgradeRunner, SchemaInformation schemaInformation, ILogger<SchemaInitializer> logger)
         {
@@ -190,13 +191,17 @@ private bool CanInitialize()
 
         public void Start()
         {
-            if (!string.IsNullOrWhiteSpace(_sqlServerDataStoreConfiguration.ConnectionString))
+            if (!_started)
             {
-                Initialize();
-            }
-            else
-            {
-                _logger.LogCritical("There was no connection string supplied. Schema initialization can not be completed.");
+                if (!string.IsNullOrWhiteSpace(_sqlServerDataStoreConfiguration.ConnectionString))
+                {
+                    Initialize();
+                    _started = true;
+                }
+                else
+                {
+                    _logger.LogCritical("There was no connection string supplied. Schema initialization can not be completed.");
+                }
             }
         }
     }

diff --git a/src/Microsoft.Health.SqlServer/Registration/SqlServerBaseRegistrationExtensions.cs b/src/Microsoft.Health.SqlServer/Registration/SqlServerBaseRegistrationExtensions.cs
@@ -47,6 +47,7 @@ public static IServiceCollection AddSqlServerBase<TSchemaVersionEnum>(
 
             services.Add<SchemaInitializer>()
                 .Singleton()
+                .AsSelf()
                 .AsService<IStartable>();
 
             services.Add<ScriptProvider<TSchemaVersionEnum>>()