From cc4bcfbd5b3c67eb6a63e01328149b6e8fd3a034 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Mon, 5 Jul 2021 20:22:35 +0100 Subject: Modernize namespaces --- test/testdb-mysql.cpp | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'test/testdb-mysql.cpp') diff --git a/test/testdb-mysql.cpp b/test/testdb-mysql.cpp index 17bc241..24e41c0 100644 --- a/test/testdb-mysql.cpp +++ b/test/testdb-mysql.cpp @@ -4,31 +4,29 @@ #include #include -namespace MyGrate { - namespace Testing { - const char * const MySQLDB::SERVER {MyGrate::getenv("MYGRATE_MYSQL_SERVER", "localhost")}; - const char * const MySQLDB::USER {MyGrate::getenv("MYGRATE_MYSQL_USER", ::getenv("LOGNAME"))}; - const char * const MySQLDB::PASSWORD {::getenv("MYGRATE_MYSQL_PASSWORD")}; - const unsigned short MySQLDB::PORT {(unsigned short)std::atoi(MyGrate::getenv("MYGRATE_MYSQL_PORT", "3306"))}; - std::size_t MySQLDB::mocknum; +namespace MyGrate::Testing { + const char * const MySQLDB::SERVER {MyGrate::getenv("MYGRATE_MYSQL_SERVER", "localhost")}; + const char * const MySQLDB::USER {MyGrate::getenv("MYGRATE_MYSQL_USER", ::getenv("LOGNAME"))}; + const char * const MySQLDB::PASSWORD {::getenv("MYGRATE_MYSQL_PASSWORD")}; + const unsigned short MySQLDB::PORT {(unsigned short)std::atoi(MyGrate::getenv("MYGRATE_MYSQL_PORT", "3306"))}; + std::size_t MySQLDB::mocknum; - MySQLDB::MySQLDB() : - MySQLConn(SERVER, USER, PASSWORD, PORT), mockname {scprintf<"mygrate_test_%?_%?">(getpid(), mocknum++)} - { - query(("DROP DATABASE IF EXISTS " + mockname).c_str()); - query(("CREATE DATABASE " + mockname).c_str()); - } + MySQLDB::MySQLDB() : + MySQLConn(SERVER, USER, PASSWORD, PORT), mockname {scprintf<"mygrate_test_%?_%?">(getpid(), mocknum++)} + { + query(("DROP DATABASE IF EXISTS " + mockname).c_str()); + query(("CREATE DATABASE " + mockname).c_str()); + } - MySQLDB::~MySQLDB() - { - query(("DROP DATABASE IF EXISTS " + mockname).c_str()); - mockname.clear(); - } + MySQLDB::~MySQLDB() + { + query(("DROP DATABASE IF EXISTS " + mockname).c_str()); + mockname.clear(); + } - Input::MySQLConn - MySQLDB::mock() const - { - return {SERVER, USER, PASSWORD, PORT, mockname.c_str()}; - } + Input::MySQLConn + MySQLDB::mock() const + { + return {SERVER, USER, PASSWORD, PORT, mockname.c_str()}; } } -- cgit v1.2.3