Update Other Dependencies

Author: droyad

src/Tests/ApprovalFiles/NoPublicApiChanges.Run.approved.cs

@@ -33,14 +33,20 @@ public PostgresqlConnectionManager(string connectionString) { }
         public PostgresqlConnectionManager(Npgsql.NpgsqlDataSource datasource) { }
         public PostgresqlConnectionManager(string connectionString, System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { }
         public PostgresqlConnectionManager(string connectionString, DbUp.Postgresql.PostgresqlConnectionOptions connectionOptions) { }
+<<<<<<< Updated upstream
         public bool StandardConformingStrings { get; set; }
+=======
+>>>>>>> Stashed changes
         public override System.Collections.Generic.IEnumerable<string> SplitScriptIntoCommands(string scriptContents) { }
     }
     public class PostgresqlConnectionOptions
     {
         public PostgresqlConnectionOptions() { }
         public System.Security.Cryptography.X509Certificates.X509Certificate2 ClientCertificate { get; set; }
+<<<<<<< Updated upstream
         public string MasterDatabaseName { get; set; }
+=======
+>>>>>>> Stashed changes
         public System.Net.Security.RemoteCertificateValidationCallback UserCertificateValidationCallback { get; set; }
     }
     public class PostgresqlObjectParser : DbUp.Support.SqlObjectParser, DbUp.Engine.ISqlObjectParser

src/dbup-postgresql/PostgresqlConnectionManager.cs

@@ -24,6 +24,7 @@ public class PostgresqlConnectionManager : DatabaseConnectionManager
     public PostgresqlConnectionManager(string connectionString)
         : base(new DelegateConnectionFactory(l => new NpgsqlConnection(connectionString)))
     {
+<<<<<<< Updated upstream
     }
 
     /// <summary>
@@ -48,6 +49,18 @@ public PostgresqlConnectionManager(string connectionString, PostgresqlConnection
         : base(new DataSourceConnectionFactory(connectionString, connectionOptions))
     {
     }
+=======
+        /// <summary>
+        /// Create a new PostgreSQL database connection 
+        /// </summary>
+        /// <param name="connectionString">The PostgreSQL connection string.</param>
+        /// <param name="connectionOptions">Custom options to apply on the created connection</param>
+        public PostgresqlConnectionManager(PostgresqlConnectionOptions connectionOptions)
+            : base(new DelegateConnectionFactory(l =>
+                {
+                    NpgsqlConnection databaseConnection = new NpgsqlConnection(connectionOptions.ConnectionString);
+                    databaseConnection.ApplyConnectionOptions(connectionOptions);
+>>>>>>> Stashed changes
 
     /// <summary>
     /// Creates a new PostgreSQL database connection with a NpgsqlDatasource

src/dbup-postgresql/PostgresqlConnectionOptions.cs

@@ -1,5 +1,12 @@
+<<<<<<< Updated upstream
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
+=======
+using System;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
+using DbUp.Engine.Output;
+>>>>>>> Stashed changes
 
 namespace DbUp.Postgresql
 {
@@ -8,6 +15,20 @@ namespace DbUp.Postgresql
     /// </summary>
     public class PostgresqlConnectionOptions
     {
+<<<<<<< Updated upstream
+=======
+
+        public PostgresqlConnectionOptions(string connectionString)
+        {
+            if (string.IsNullOrWhiteSpace(connectionString))
+                throw new ArgumentNullException(nameof(connectionString));
+            
+            ConnectionString = connectionString;
+        }
+        
+        public string ConnectionString { get; }
+
+>>>>>>> Stashed changes
         /// <summary>
         /// Certificate for securing connection.
         /// </summary>
@@ -23,5 +44,10 @@ public class PostgresqlConnectionOptions
         /// The database to connect to initially. Default is 'postgres'.
         /// </summary>
         public string MasterDatabaseName { get; set; } = "postgres";
+<<<<<<< Updated upstream
+=======
+
+        public IUpgradeLog Logger { get; set; } = new ConsoleUpgradeLog();
+>>>>>>> Stashed changes
     }
 }

src/dbup-postgresql/PostgresqlExtensions.cs

@@ -26,6 +26,7 @@ public static class PostgresqlExtensions
     /// A builder for a database upgrader designed for PostgreSQL databases.
     /// </returns>
     public static UpgradeEngineBuilder PostgresqlDatabase(this SupportedDatabases supported, string connectionString)
+<<<<<<< Updated upstream
         => PostgresqlDatabase(supported, connectionString, GetDefaultSchemaByConnectionString(connectionString));
     /// <summary>
     /// Get connection string use parameter SearchPath for defaultSchema
@@ -52,17 +53,21 @@ private static string GetDefaultSchemaByConnectionString(string connectionString
     /// </returns>
     public static UpgradeEngineBuilder PostgresqlDatabase(this SupportedDatabases supported, string connectionString, string schema)
         => PostgresqlDatabase(new PostgresqlConnectionManager(connectionString), schema);
+=======
+        => PostgresqlDatabase(supported, null, new PostgresqlConnectionOptions(connectionString));
+>>>>>>> Stashed changes
 
     /// <summary>
     /// Creates an upgrader for PostgreSQL databases that use SSL.
     /// </summary>
     /// <param name="supported">Fluent helper type.</param>
     /// <param name="connectionString">PostgreSQL database connection string.</param>
     /// <param name="schema">The schema in which to check for changes</param>
-    /// <param name="certificate">Certificate for securing connection.</param>
+    /// <param name="connectionOptions">Connection options to set SSL parameters</param>
     /// <returns>
     /// A builder for a database upgrader designed for PostgreSQL databases.
     /// </returns>
+<<<<<<< Updated upstream
     public static UpgradeEngineBuilder PostgresqlDatabase(this SupportedDatabases supported, string connectionString, string schema, X509Certificate2 certificate)
         => PostgresqlDatabase(new PostgresqlConnectionManager(connectionString, certificate), schema);
 
@@ -99,6 +104,10 @@ public static UpgradeEngineBuilder PostgresqlDatabase(this SupportedDatabases su
     /// </returns>
     public static UpgradeEngineBuilder PostgresqlDatabase(IConnectionManager connectionManager)
         => PostgresqlDatabase(connectionManager, null);
+=======
+    public static UpgradeEngineBuilder PostgresqlDatabase(this SupportedDatabases supported, string schema, PostgresqlConnectionOptions connectionOptions)
+        => PostgresqlDatabase(new PostgresqlConnectionManager(connectionOptions), schema);
+>>>>>>> Stashed changes
 
     /// <summary>
     /// Creates an upgrader for PostgreSQL databases.
@@ -108,7 +117,7 @@ public static UpgradeEngineBuilder PostgresqlDatabase(IConnectionManager connect
     /// <returns>
     /// A builder for a database upgrader designed for PostgreSQL databases.
     /// </returns>
-    public static UpgradeEngineBuilder PostgresqlDatabase(IConnectionManager connectionManager, string schema)
+    public static UpgradeEngineBuilder PostgresqlDatabase(IConnectionManager connectionManager, string schema = null)
     {
         var builder = new UpgradeEngineBuilder();
         builder.Configure(c => c.ConnectionManager = connectionManager);
@@ -126,18 +135,22 @@ public static UpgradeEngineBuilder PostgresqlDatabase(IConnectionManager connect
     /// <returns></returns>
     public static void PostgresqlDatabase(this SupportedDatabasesForEnsureDatabase supported, string connectionString)
     {
-        PostgresqlDatabase(supported, connectionString, new ConsoleUpgradeLog());
+        supported.PostgresqlDatabase(new PostgresqlConnectionOptions(connectionString));
     }
 
     /// <summary>
     /// Ensures that the database specified in the connection string exists using SSL for the connection.
     /// </summary>
     /// <param name="supported">Fluent helper type.</param>
     /// <param name="connectionString">The connection string.</param>
-    /// <param name="certificate">Certificate for securing connection.</param>
+    /// <param name="connectionOptions">Connection SSL to customize SSL behaviour</param>
     /// <returns></returns>
-    public static void PostgresqlDatabase(this SupportedDatabasesForEnsureDatabase supported, string connectionString, X509Certificate2 certificate)
+    public static void PostgresqlDatabase(
+        this SupportedDatabasesForEnsureDatabase supported, 
+        PostgresqlConnectionOptions connectionOptions
+    )
     {
+<<<<<<< Updated upstream
         PostgresqlDatabase(supported, connectionString, new ConsoleUpgradeLog(), certificate);
     }
 
@@ -320,27 +333,40 @@ PostgresqlConnectionOptions connectionOptions
         var masterConnectionStringBuilder = new NpgsqlConnectionStringBuilder(connectionString);
 
         var databaseName = masterConnectionStringBuilder.Database;       
+=======
+        var masterConnectionStringBuilder = new NpgsqlConnectionStringBuilder(connectionOptions.ConnectionString);
+        
+        var databaseName = masterConnectionStringBuilder.Database;
+>>>>>>> Stashed changes
 
         if (string.IsNullOrEmpty(databaseName) || databaseName.Trim() == string.Empty)
         {
             throw new InvalidOperationException("The connection string does not specify a database name.");
         }
 
+<<<<<<< Updated upstream
         if (databaseName == connectionOptions.MasterDatabaseName)
         {
             throw new InvalidOperationException("Database in connection string needs to be different than the master database in PostgresqlConnectionOptions.");
         }
 
         masterConnectionStringBuilder.Database = connectionOptions.MasterDatabaseName;
         masterConnectionStringBuilder.SearchPath = "public";
+=======
+        masterConnectionStringBuilder.Database = connectionOptions.MasterDatabaseName;
+>>>>>>> Stashed changes
 
         var logMasterConnectionStringBuilder = new NpgsqlConnectionStringBuilder(masterConnectionStringBuilder.ConnectionString);
         if (!string.IsNullOrEmpty(logMasterConnectionStringBuilder.Password))
         {
             logMasterConnectionStringBuilder.Password = "******";
         }
 
+<<<<<<< Updated upstream
         logger.LogDebug("Master ConnectionString => {0}", logMasterConnectionStringBuilder.ConnectionString);
+=======
+        connectionOptions.Logger.LogInformation("Master ConnectionString => {0}", logMasterConnectionStringBuilder.ConnectionString);
+>>>>>>> Stashed changes
 
         var factory = new DataSourceConnectionFactory(masterConnectionStringBuilder.ConnectionString, connectionOptions);
         using var connection = factory.CreateConnection();
@@ -355,6 +381,7 @@ PostgresqlConnectionOptions connectionOptions
                    CommandType = CommandType.Text
                })
         {
+<<<<<<< Updated upstream
             var results = Convert.ToInt32(command.ExecuteScalar());
 
             // if the database does not exist, we're done here...
@@ -363,6 +390,41 @@ PostgresqlConnectionOptions connectionOptions
                 logger.LogInformation(@"Database {0} does not exist. Skipping delete operation.", databaseName);
                 return;
             }
+=======
+            connection.ApplyConnectionOptions(connectionOptions);
+            connection.Open();
+
+            var sqlCommandText =
+                $@"SELECT case WHEN oid IS NOT NULL THEN 1 ELSE 0 end FROM pg_database WHERE datname = '{databaseName}' limit 1;";
+
+            // check to see if the database already exists..
+            using (var command = new NpgsqlCommand(sqlCommandText, connection)
+            {
+                CommandType = CommandType.Text
+            })
+            {
+                var results = Convert.ToInt32(command.ExecuteScalar());
+
+                // if the database exists, we're done here...
+                if (results == 1)
+                {
+                    return;
+                }
+            }
+
+            sqlCommandText = $"create database \"{databaseName}\";";
+
+            // Create the database...
+            using (var command = new NpgsqlCommand(sqlCommandText, connection)
+            {
+                CommandType = CommandType.Text
+            })
+            {
+                command.ExecuteNonQuery();
+            }
+
+            connectionOptions.Logger.LogInformation(@"Created database {0}", databaseName);
+>>>>>>> Stashed changes
         }
 
         // prevent new connections to the database
@@ -415,4 +477,17 @@ public static UpgradeEngineBuilder JournalToPostgresqlTable(this UpgradeEngineBu
         builder.Configure(c => c.Journal = new PostgresqlTableJournal(() => c.ConnectionManager, () => c.Log, schema, table));
         return builder;
     }
+
+    internal static void ApplyConnectionOptions(this NpgsqlConnection connection, PostgresqlConnectionOptions connectionOptions)
+    {
+        if (connectionOptions?.ClientCertificate != null)
+        {
+            connection.ProvideClientCertificatesCallback +=
+                certs => certs.Add(connectionOptions.ClientCertificate);
+        }
+        if (connectionOptions?.UserCertificateValidationCallback != null)
+        {
+            connection.UserCertificateValidationCallback = connectionOptions.UserCertificateValidationCallback;
+        }
+    }
 }