From 5bfeb02ad9d2aa3cb3eb2ccf97ac3ddb426323b6 Mon Sep 17 00:00:00 2001 From: ruben Date: Sat, 4 Apr 2020 17:59:29 +0100 Subject: [PATCH] Changed Appveyor SSL setup --- .appveyor.yml | 8 ++++---- include/boost/mysql/connection.hpp | 26 +------------------------- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 1ebc2127..2211a020 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,16 +5,16 @@ configuration: platform: - x86 - x64 - +matrix: + fast_finish: true build_script: - cp ci\ca-cert.pem C:\ - cp ci\server-cert.pem C:\ - cp ci\server-key.pem C:\ - cp ci\windows-ssl.cnf C:\my.cnf - - dir C:\ - - dir /b /s /a:-D "C:\Program Files\MySQL\MySQL Server 5.7" - - type C:\mysql-log.txt + - 'echo "!include C:\my.cnf" >> "C:\Program Files\MySQL\MySQL Server 5.7\my.ini"' + - type "C:\Program Files\MySQL\MySQL Server 5.7\my.ini" - net stop MySQL57 && net start MySQL57 - set PATH=C:\Program Files\MySQL\MySQL Server 5.7\bin;C:\Libraries\boost_1_71_0\lib64-msvc-14.2;C:\Libraries\boost_1_71_0\lib32-msvc-14.2;%PATH% - mysqladmin --user=root password -pPassword12! "" diff --git a/include/boost/mysql/connection.hpp b/include/boost/mysql/connection.hpp index 14b3b003..75961518 100644 --- a/include/boost/mysql/connection.hpp +++ b/include/boost/mysql/connection.hpp @@ -7,36 +7,12 @@ #include "boost/mysql/error.hpp" #include "boost/mysql/resultset.hpp" #include "boost/mysql/prepared_statement.hpp" +#include "boost/mysql/connection_params.hpp" #include namespace boost { namespace mysql { -/** - * \brief Parameters defining how to authenticate to a MySQL server. - */ -struct connection_params -{ - std::string_view username; ///< Username to authenticate as. - std::string_view password; ///< Password for that username, possibly empty. - std::string_view database; ///< Database to use, or empty string for no database. - collation connection_collation; ///< The default character set and collation for the connection. - - /// Initializing constructor - connection_params( - std::string_view username, - std::string_view password, - std::string_view db = "", - collation connection_col = collation::utf8_general_ci - ) : - username(username), - password(password), - database(db), - connection_collation(connection_col) - { - } -}; - /** * \brief A connection to a MySQL server. * \details