* renamed project to cppmariadb

* refactored cmake files

include/cppmariadb.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <cppmariadb/column.h>
+#include <cppmariadb/connection.h>
+#include <cppmariadb/database.h>
+#include <cppmariadb/enums.h>
+#include <cppmariadb/exception.h>
+#include <cppmariadb/field.h>
+#include <cppmariadb/result.h>
+#include <cppmariadb/row.h>
+#include <cppmariadb/statement.h>
+#include <cppmariadb/transaction.h>
+
+#include <cppmariadb/inline/connection.inl>
+#include <cppmariadb/inline/database.inl>
+#include <cppmariadb/inline/field.inl>
+#include <cppmariadb/inline/result.inl>
+#include <cppmariadb/inline/row.inl>
+#include <cppmariadb/inline/statement.inl>
+#include <cppmariadb/inline/transaction.inl>

include/mariadb/column.h → include/cppmariadb/column.h

@@ -2,11 +2,11 @@
 
 #include <string>
 #include <vector>
-#include <mariadb/config.h>
-#include <mariadb/enums.h>
-#include <mariadb/forward/column.h>
+#include <cppmariadb/config.h>
+#include <cppmariadb/enums.h>
+#include <cppmariadb/forward/column.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     struct column

include/mariadb/connection.h → include/cppmariadb/connection.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include <memory>
-#include <mariadb/config.h>
-#include <mariadb/impl/mariadb_handle.h>
-#include <mariadb/forward/connection.h>
-#include <mariadb/forward/result.h>
-#include <mariadb/forward/statement.h>
+#include <cppmariadb/config.h>
+#include <cppmariadb/impl/mariadb_handle.h>
+#include <cppmariadb/forward/connection.h>
+#include <cppmariadb/forward/result.h>
+#include <cppmariadb/forward/statement.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     struct connection

include/mariadb/database.h → include/cppmariadb/database.h

@@ -1,11 +1,11 @@
 #pragma once
 
 #include <string>
-#include <mariadb/config.h>
-#include <mariadb/enums.h>
-#include <mariadb/forward/connection.h>
+#include <cppmariadb/config.h>
+#include <cppmariadb/enums.h>
+#include <cppmariadb/forward/connection.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     struct database

include/mariadb/enums.h → include/cppmariadb/enums.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include <limits>
-#include <mariadb/config.h>
+#include <cppmariadb/config.h>
 #include <cpputils/misc/flags.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     enum class column_type

include/mariadb/exception.h → include/cppmariadb/exception.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <mariadb/config.h>
-#include <mariadb/enums.h>
+#include <cppmariadb/config.h>
+#include <cppmariadb/enums.h>
 #include <cpputils/misc/exception.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     struct exception : public utl::exception

include/mariadb/field.h → include/cppmariadb/field.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <mariadb/config.h>
-#include <mariadb/forward/column.h>
-#include <mariadb/forward/field.h>
-#include <mariadb/forward/row.h>
+#include <cppmariadb/config.h>
+#include <cppmariadb/forward/column.h>
+#include <cppmariadb/forward/field.h>
+#include <cppmariadb/forward/row.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     struct field

include/mariadb/forward/column.h → include/cppmariadb/forward/column.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include <mariadb/config.h>
+#include <vector>
+#include <cppmariadb/config.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     struct column;

include/cppmariadb/forward/connection.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <cppmariadb/config.h>
+
+namespace cppmariadb
+{
+
+    struct connection;
+
+}

include/cppmariadb/forward/database.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <cppmariadb/config.h>
+
+namespace cppmariadb
+{
+
+    struct database;
+
+}

include/cppmariadb/forward/field.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <cppmariadb/config.h>
+
+namespace cppmariadb
+{
+
+    struct field;
+
+}

include/mariadb/forward/result.h → include/cppmariadb/forward/result.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <mariadb/config.h>
+#include <cppmariadb/config.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     struct result;

include/cppmariadb/forward/row.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <cppmariadb/config.h>
+
+namespace cppmariadb
+{
+
+    struct row;
+
+}

include/cppmariadb/forward/statement.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <cppmariadb/config.h>
+
+namespace cppmariadb
+{
+
+    struct statement;
+
+}

include/cppmariadb/forward/transaction.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <cppmariadb/config.h>
+
+namespace cppmariadb
+{
+
+    struct transaction;
+
+}

include/mariadb/impl/mariadb_handle.h → include/cppmariadb/impl/mariadb_handle.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <mariadb/config.h>
+#include <cppmariadb/config.h>
 
-namespace mariadb {
+namespace cppmariadb {
 namespace __impl
 {
 

include/mariadb/inline/connection.inl → include/cppmariadb/inline/connection.inl

@@ -1,13 +1,13 @@
 #pragma once
 
-#include <mariadb/result.h>
-#include <mariadb/connection.h>
+#include <cppmariadb/result.h>
+#include <cppmariadb/connection.h>
 
-#include <mariadb/inline/result.inl>
-#include <mariadb/inline/database.inl>
-#include <mariadb/inline/statement.inl>
+#include <cppmariadb/inline/result.inl>
+#include <cppmariadb/inline/database.inl>
+#include <cppmariadb/inline/statement.inl>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     /* op_store_result ***************************************************************************/
@@ -36,7 +36,7 @@ namespace mariadb
     typename T::result_type* connection::execute_internal(const std::string& cmd)
     {
 #ifdef MARIADB_DEBUG
-        log_global_message(debug) << "execute mariadb query: " << std::endl << cmd;
+        log_global_message(debug) << "execute cppmariadb query: " << std::endl << cmd;
 #endif
         if (!handle())
             throw exception("invalid handle", error_code::Unknown, cmd);

include/mariadb/inline/database.inl → include/cppmariadb/inline/database.inl

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <mariadb/database.h>
+#include <cppmariadb/database.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     /* database ***********************************************************************************/

include/mariadb/inline/field.inl → include/cppmariadb/inline/field.inl

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <mariadb/row.h>
-#include <mariadb/field.h>
+#include <cppmariadb/row.h>
+#include <cppmariadb/field.h>
 #include <cpputils/misc/enum.h>
 #include <cpputils/misc/string.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     /* op_field_converter ************************************************************************/

include/mariadb/inline/result.inl → include/cppmariadb/inline/result.inl

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <mariadb/result.h>
+#include <cppmariadb/result.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     /* result ************************************************************************************/

include/mariadb/inline/row.inl → include/cppmariadb/inline/row.inl

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <mariadb/row.h>
-#include <mariadb/field.h>
-#include <mariadb/result.h>
+#include <cppmariadb/row.h>
+#include <cppmariadb/field.h>
+#include <cppmariadb/result.h>
 
-namespace mariadb
+namespace cppmariadb
 {
     /* row::iterator_tpl *************************************************************************/
 

include/mariadb/inline/statement.inl → include/cppmariadb/inline/statement.inl

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <mariadb/statement.h>
+#include <cppmariadb/statement.h>
 #include <cpputils/misc/enum.h>
 #include <cpputils/misc/string.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     /* statement *********************************************************************************/

include/mariadb/inline/transaction.inl → include/cppmariadb/inline/transaction.inl

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <mariadb/transaction.h>
+#include <cppmariadb/transaction.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     /* transaction *******************************************************************************/

include/mariadb/result.h → include/cppmariadb/result.h

@@ -1,12 +1,12 @@
 #pragma once
 
 #include <memory>
-#include <mariadb/config.h>
-#include <mariadb/impl/mariadb_handle.h>
-#include <mariadb/forward/column.h>
-#include <mariadb/forward/row.h>
+#include <cppmariadb/config.h>
+#include <cppmariadb/impl/mariadb_handle.h>
+#include <cppmariadb/forward/column.h>
+#include <cppmariadb/forward/row.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     struct result :

include/mariadb/row.h → include/cppmariadb/row.h

@@ -3,14 +3,14 @@
 #include <string>
 #include <limits>
 #include <memory>
-#include <mariadb/config.h>
-#include <mariadb/impl/mariadb_handle.h>
-#include <mariadb/forward/column.h>
-#include <mariadb/forward/field.h>
-#include <mariadb/forward/result.h>
-#include <mariadb/forward/row.h>
+#include <cppmariadb/config.h>
+#include <cppmariadb/impl/mariadb_handle.h>
+#include <cppmariadb/forward/column.h>
+#include <cppmariadb/forward/field.h>
+#include <cppmariadb/forward/result.h>
+#include <cppmariadb/forward/row.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     struct row

include/mariadb/statement.h → include/cppmariadb/statement.h

@@ -2,11 +2,11 @@
 
 #include <string>
 #include <vector>
-#include <mariadb/config.h>
-#include <mariadb/forward/connection.h>
-#include <mariadb/forward/statement.h>
+#include <cppmariadb/config.h>
+#include <cppmariadb/forward/connection.h>
+#include <cppmariadb/forward/statement.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     struct statement

include/mariadb/transaction.h → include/cppmariadb/transaction.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include <mariadb/config.h>
-#include <mariadb/enums.h>
-#include <mariadb/forward/connection.h>
-#include <mariadb/forward/statement.h>
-#include <mariadb/forward/transaction.h>
+#include <cppmariadb/config.h>
+#include <cppmariadb/enums.h>
+#include <cppmariadb/forward/connection.h>
+#include <cppmariadb/forward/statement.h>
+#include <cppmariadb/forward/transaction.h>
 
-namespace mariadb
+namespace cppmariadb
 {
 
     struct transaction

include/mariadb.h

@@ -1,20 +0,0 @@
-#pragma once
-
-#include <mariadb/column.h>
-#include <mariadb/connection.h>
-#include <mariadb/database.h>
-#include <mariadb/enums.h>
-#include <mariadb/exception.h>
-#include <mariadb/field.h>
-#include <mariadb/result.h>
-#include <mariadb/row.h>
-#include <mariadb/statement.h>
-#include <mariadb/transaction.h>
-
-#include <mariadb/inline/connection.inl>
-#include <mariadb/inline/database.inl>
-#include <mariadb/inline/field.inl>
-#include <mariadb/inline/result.inl>
-#include <mariadb/inline/row.inl>
-#include <mariadb/inline/statement.inl>
-#include <mariadb/inline/transaction.inl>

include/mariadb/forward/connection.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include <mariadb/config.h>
-
-namespace mariadb
-{
-
-    struct connection;
-
-}

include/mariadb/forward/database.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include <mariadb/config.h>
-
-namespace mariadb
-{
-
-    struct database;
-
-}

include/mariadb/forward/field.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include <mariadb/config.h>
-
-namespace mariadb
-{
-
-    struct field;
-
-}

include/mariadb/forward/row.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include <mariadb/config.h>
-
-namespace mariadb
-{
-
-    struct row;
-
-}

include/mariadb/forward/statement.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include <mariadb/config.h>
-
-namespace mariadb
-{
-
-    struct statement;
-
-}

include/mariadb/forward/transaction.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include <mariadb/config.h>
-
-namespace mariadb
-{
-
-    struct transaction;
-
-}

src/CMakeLists.txt

@@ -2,7 +2,11 @@
 
 Include                     ( cotire OPTIONAL )
 Include                     ( pedantic OPTIONAL )
+Include                     ( strip_symbols OPTIONAL )
 
+Option                      ( BUILD_SHARED_MARIADBPP "Build cppmariadb shared library." OFF )
+
+Set                         ( BUILD_SHARED_LIBS ${BUILD_SHARED_MARIADBPP} )
 Set                         ( CMAKE_CXX_STANDARD 17 )
 Set                         ( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   ${PEDANTIC_C_FLAGS}" )
 Set                         ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PEDANTIC_CXX_FLAGS}" )
@@ -11,19 +15,22 @@ Set                         ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PEDANTIC_CXX
 
 Find_Package                ( cpputils REQUIRED )
 
-# Project: mariadb ################################################################################
+# Project: cppmariadb #############################################################################
 
-Project                     ( mariadb VERSION 1.0.0.0 LANGUAGES CXX )
+Project                     ( cppmariadb VERSION 1.0.0.0 LANGUAGES CXX )
 File                        ( GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp )
-Add_Library                 ( mariadb ${SOURCE_FILES} )
+Add_Library                 ( cppmariadb ${SOURCE_FILES} )
 Target_Include_Directories  (
-                                mariadb
+                                cppmariadb
                                 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../include
                             )
 Target_Link_Libraries       (
-                                mariadb
+                                cppmariadb
                                 cpputils
                             )
 If                          ( __COTIRE_INCLUDED )
-    Cotire                      ( mariadb )
-EndIf                       ( )
+    Cotire                      ( cppmariadb )
+EndIf                       ( )
+If                          ( __STRIP_SYMBOLS_INCLUDED )
+    Strip_Symbols               ( cppmariadb DBG_FILE )
+EndIf                       ()

src/exception.cpp

@@ -1,8 +1,8 @@
-#include <mariadb/exception.h>
+#include <cppmariadb/exception.h>
 #include <cpputils/misc/enum.h>
 #include <cpputils/misc/string.h>
 
-using namespace ::mariadb;
+using namespace ::cppmariadb;
 
 void exception::print_message(std::ostream& os) const
 {

src/result.cpp

@@ -1,10 +1,10 @@
-#include <mariadb/result.h>
-#include <mariadb/column.h>
+#include <cppmariadb/result.h>
+#include <cppmariadb/column.h>
 
-#include <mariadb/inline/row.inl>
-#include <mariadb/inline/result.inl>
+#include <cppmariadb/inline/row.inl>
+#include <cppmariadb/inline/result.inl>
 
-using namespace ::mariadb;
+using namespace ::cppmariadb;
 
 row* result::next()
 {

src/row.cpp

@@ -1,12 +1,12 @@
-#include <mariadb/row.h>
-#include <mariadb/column.h>
-#include <mariadb/exception.h>
+#include <cppmariadb/row.h>
+#include <cppmariadb/column.h>
+#include <cppmariadb/exception.h>
 
-#include <mariadb/inline/row.inl>
-#include <mariadb/inline/field.inl>
-#include <mariadb/inline/result.inl>
+#include <cppmariadb/inline/row.inl>
+#include <cppmariadb/inline/field.inl>
+#include <cppmariadb/inline/result.inl>
 
-using namespace ::mariadb;
+using namespace ::cppmariadb;
 
 size_t row::find(const std::string& name) const
 {

src/statement.cpp

@@ -1,12 +1,12 @@
-#include <mariadb/row.h>
-#include <mariadb/enums.h>
-#include <mariadb/column.h>
-#include <mariadb/exception.h>
+#include <cppmariadb/row.h>
+#include <cppmariadb/enums.h>
+#include <cppmariadb/column.h>
+#include <cppmariadb/exception.h>
 
-#include <mariadb/inline/statement.inl>
-#include <mariadb/inline/connection.inl>
+#include <cppmariadb/inline/statement.inl>
+#include <cppmariadb/inline/connection.inl>
 
-using namespace ::mariadb;
+using namespace ::cppmariadb;
 
 void statement::parse(const std::string& query)
 {

test/CMakeLists.txt

@@ -8,14 +8,14 @@ Set                         ( CMAKE_CXX_STANDARD 17 )
 Set                         ( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   ${PEDANTIC_C_FLAGS}" )
 Set                         ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PEDANTIC_CXX_FLAGS}" )
 
-# Project: test_mariadb ###########################################################################
+# Project: test_mariadbpp #########################################################################
 
-Project                     ( test_mariadb )
+Project                     ( test_mariadbpp )
 File                        ( GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp )
-Add_Executable              ( test_mariadb EXCLUDE_FROM_ALL ${SOURCE_FILES} )
+Add_Executable              ( test_mariadbpp EXCLUDE_FROM_ALL ${SOURCE_FILES} )
 Target_Link_Libraries       (
-                                test_mariadb
-                                mariadb
+                                test_mariadbpp
+                                cppmariadb
                                 cpputils
                                 gtest
                                 gmock
@@ -23,8 +23,8 @@ Target_Link_Libraries       (
                                 pthread
                             )
 If                          ( __COTIRE_INCLUDED )
-    Cotire                      ( test_mariadb )
+    Cotire                      ( test_mariadbpp )
 EndIf                       ( )
 If                          ( __CMAKE_TESTS_INCLUDED )
-    Add_CMake_Test             ( tsoutils test_mariadb )
+    Add_CMake_Test             ( tsoutils test_mariadbpp )
 EndIf                       ( )

test/mariadb.cpp → test/mariadbpp.cpp

@@ -1,12 +1,12 @@
 #include <memory>
 #include <type_traits>
 #include <gtest/gtest.h>
-#include <mariadb.h>
+#include <cppmariadb.h>
 
 #include "mock.h"
 
 using namespace ::testing;
-using namespace ::mariadb;
+using namespace ::cppmariadb;
 
 /**********************************************************************************************************/
 TEST(MariaDbTests, MariaDB_connect)
@@ -103,7 +103,7 @@ TEST(MariaDbTests, Connection_execute_queryFailed)
         .Times(1);
 
     connection con(reinterpret_cast<MYSQL*>(0x6818));
-    EXPECT_THROW(con.execute("SELECT * FROM blubb"), ::mariadb::exception);
+    EXPECT_THROW(con.execute("SELECT * FROM blubb"), ::cppmariadb::exception);
 }
 
 TEST(MariaDbTests, Connection_execute_storeResultFailed_fieldCountGreaterZero)
@@ -123,7 +123,7 @@ TEST(MariaDbTests, Connection_execute_storeResultFailed_fieldCountGreaterZero)
         .Times(1);
 
     connection con(reinterpret_cast<MYSQL*>(0x6818));
-    EXPECT_THROW(con.execute("SELECT * FROM blubb"), ::mariadb::exception);
+    EXPECT_THROW(con.execute("SELECT * FROM blubb"), ::cppmariadb::exception);
 }
 
 TEST(MariaDbTests, Connection_execute_storeResultFailed_fieldCountIsZero)
@@ -183,7 +183,7 @@ TEST(MariaDbTests, Connection_executeStored_queryFailed)
         .Times(1);
 
     connection con(reinterpret_cast<MYSQL*>(0x6818));
-    EXPECT_THROW(con.execute_stored("SELECT * FROM blubb"), ::mariadb::exception);
+    EXPECT_THROW(con.execute_stored("SELECT * FROM blubb"), ::cppmariadb::exception);
 }
 
 TEST(MariaDbTests, Connection_executeStored_storeResultFailed_fieldCountGreaterZero)
@@ -203,7 +203,7 @@ TEST(MariaDbTests, Connection_executeStored_storeResultFailed_fieldCountGreaterZ
         .Times(1);
 
     connection con(reinterpret_cast<MYSQL*>(0x6818));
-    EXPECT_THROW(con.execute_stored("SELECT * FROM blubb"), ::mariadb::exception);
+    EXPECT_THROW(con.execute_stored("SELECT * FROM blubb"), ::cppmariadb::exception);
 }
 
 TEST(MariaDbTests, Connection_executeStored_storeResultFailed_fieldCountIsZero)
@@ -264,7 +264,7 @@ TEST(MariaDbTests, Connection_executeUsed_queryFailed)
         .Times(1);
 
     connection con(reinterpret_cast<MYSQL*>(0x6818));
-    EXPECT_THROW(con.execute_used("SELECT * FROM blubb"), ::mariadb::exception);
+    EXPECT_THROW(con.execute_used("SELECT * FROM blubb"), ::cppmariadb::exception);
 }
 
 TEST(MariaDbTests, Connection_executeused_useResultFailed_fieldCountGreaterZero)
@@ -284,7 +284,7 @@ TEST(MariaDbTests, Connection_executeused_useResultFailed_fieldCountGreaterZero)
         .Times(1);
 
     connection con(reinterpret_cast<MYSQL*>(0x6818));
-    EXPECT_THROW(con.execute_used("SELECT * FROM blubb"), ::mariadb::exception);
+    EXPECT_THROW(con.execute_used("SELECT * FROM blubb"), ::cppmariadb::exception);
 }
 
 TEST(MariaDbTests, Connection_executeUsed_useResultFailed_fieldCountIsZero)
@@ -345,7 +345,7 @@ TEST(MariaDbTests, Statement_set_invalidIndex)
 {
     StrictMock<MariaDbMock> mock;
     statement s("SELECT * FROM ?table?");
-    EXPECT_THROW(s.set(4, "test"), ::mariadb::exception);
+    EXPECT_THROW(s.set(4, "test"), ::cppmariadb::exception);
 }
 
 TEST(MariaDbTests, Statement_set_validName)
@@ -359,7 +359,7 @@ TEST(MariaDbTests, Statement_set_invalidName)
 {
     StrictMock<MariaDbMock> mock;
     statement s("SELECT * FROM ?table?");
-    EXPECT_THROW(s.set("foo", "test"), ::mariadb::exception);
+    EXPECT_THROW(s.set("foo", "test"), ::cppmariadb::exception);
 }
 
 TEST(MariaDbTests, Statement_query)
@@ -661,7 +661,7 @@ TEST(MariaDbTests, Row_at_invalidIndex)
 
     result_stored result(reinterpret_cast<MYSQL_RES*>(0x51651));
     row row(result, const_cast<MYSQL_ROW>(&RowData[0]));
-    EXPECT_THROW(row.at(3), ::mariadb::exception);
+    EXPECT_THROW(row.at(3), ::cppmariadb::exception);
 }
 
 TEST(MariaDbTests, Row_at_validIndex)
@@ -706,7 +706,7 @@ TEST(MariaDbTests, Row_at_invalidName)
 
     result_stored result(reinterpret_cast<MYSQL_RES*>(0x51651));
     row row(result, const_cast<MYSQL_ROW>(&RowData[0]));
-    EXPECT_THROW(row.at("blubb"), ::mariadb::exception);
+    EXPECT_THROW(row.at("blubb"), ::cppmariadb::exception);
 }
 
 TEST(MariaDbTests, Row_at_validName)
@@ -831,19 +831,19 @@ TEST(MariaDbTests, Row_const_reverse_iterator)
 /**********************************************************************************************************/
 TEST(MariaDbTests, Field_index)
 {
-    mariadb::result_stored   result (reinterpret_cast<MYSQL_RES*>(0x51651));
-    mariadb::row             row    (result, const_cast<MYSQL_ROW>(&RowData[0]));
-    mariadb::field           field  (row, 1, RowData[1], RowLengths[1]);
+    cppmariadb::result_stored   result (reinterpret_cast<MYSQL_RES*>(0x51651));
+    cppmariadb::row             row    (result, const_cast<MYSQL_ROW>(&RowData[0]));
+    cppmariadb::field           field  (row, 1, RowData[1], RowLengths[1]);
     EXPECT_EQ(1, field.index());
 }
 
 TEST(MariaDbTests, Field_isNull)
 {
-    mariadb::result_stored  result  (reinterpret_cast<MYSQL_RES*>(0x51651));
-    mariadb::row            row     (result, const_cast<MYSQL_ROW>(&RowData[0]));
-    mariadb::field          field0  (row, 1, nullptr, 0);
-    mariadb::field          field1  (row, 1, "",      0);
-    mariadb::field          field2  (row, 1, "asd",   3);
+    cppmariadb::result_stored  result  (reinterpret_cast<MYSQL_RES*>(0x51651));
+    cppmariadb::row            row     (result, const_cast<MYSQL_ROW>(&RowData[0]));
+    cppmariadb::field          field0  (row, 1, nullptr, 0);
+    cppmariadb::field          field1  (row, 1, "",      0);
+    cppmariadb::field          field2  (row, 1, "asd",   3);
 
     EXPECT_TRUE (field0.is_null());
     EXPECT_FALSE(field1.is_null());
@@ -852,11 +852,11 @@ TEST(MariaDbTests, Field_isNull)
 
 TEST(MariaDbTests, Field_isEmpty)
 {
-    mariadb::result_stored  result  (reinterpret_cast<MYSQL_RES*>(0x51651));
-    mariadb::row            row     (result, const_cast<MYSQL_ROW>(&RowData[0]));
-    mariadb::field          field0  (row, 1, nullptr, 0);
-    mariadb::field          field1  (row, 1, "",      0);
-    mariadb::field          field2  (row, 1, "asd",   3);
+    cppmariadb::result_stored  result  (reinterpret_cast<MYSQL_RES*>(0x51651));
+    cppmariadb::row            row     (result, const_cast<MYSQL_ROW>(&RowData[0]));
+    cppmariadb::field          field0  (row, 1, nullptr, 0);
+    cppmariadb::field          field1  (row, 1, "",      0);
+    cppmariadb::field          field2  (row, 1, "asd",   3);
 
     EXPECT_TRUE (field0.is_empty());
     EXPECT_TRUE (field1.is_empty());
@@ -867,9 +867,9 @@ TEST(MariaDbTests, Field_data)
 {
     static const char* data = "test";
 
-    mariadb::result_stored  result  (reinterpret_cast<MYSQL_RES*>(0x51651));
-    mariadb::row            row     (result, const_cast<MYSQL_ROW>(&RowData[0]));
-    mariadb::field          field   (row, 1, data, 4);
+    cppmariadb::result_stored  result  (reinterpret_cast<MYSQL_RES*>(0x51651));
+    cppmariadb::row            row     (result, const_cast<MYSQL_ROW>(&RowData[0]));
+    cppmariadb::field          field   (row, 1, data, 4);
 
     EXPECT_EQ(data, field.data());
 }
@@ -878,20 +878,20 @@ TEST(MariaDbTests, Field_size)
 {
     static const char* data = "test";
 
-    mariadb::result_stored  result  (reinterpret_cast<MYSQL_RES*>(0x51651));
-    mariadb::row            row     (result, const_cast<MYSQL_ROW>(&RowData[0]));
-    mariadb::field          field   (row, 1, data, 4);
+    cppmariadb::result_stored  result  (reinterpret_cast<MYSQL_RES*>(0x51651));
+    cppmariadb::row            row     (result, const_cast<MYSQL_ROW>(&RowData[0]));
+    cppmariadb::field          field   (row, 1, data, 4);
 
     EXPECT_EQ(4, field.size());
 }
 
 TEST(MariaDbTests, Field_implicit_bool_cast)
 {
-    mariadb::result_stored  result  (reinterpret_cast<MYSQL_RES*>(0x51651));
-    mariadb::row            row     (result, const_cast<MYSQL_ROW>(&RowData[0]));
-    mariadb::field          field0  (row, 1, nullptr, 0);
-    mariadb::field          field1  (row, 1, "",      0);
-    mariadb::field          field2  (row, 1, "asd",   3);
+    cppmariadb::result_stored  result  (reinterpret_cast<MYSQL_RES*>(0x51651));
+    cppmariadb::row            row     (result, const_cast<MYSQL_ROW>(&RowData[0]));
+    cppmariadb::field          field0  (row, 1, nullptr, 0);
+    cppmariadb::field          field1  (row, 1, "",      0);
+    cppmariadb::field          field2  (row, 1, "asd",   3);
 
     EXPECT_FALSE(static_cast<bool>(field0));
     EXPECT_FALSE(static_cast<bool>(field1));
@@ -900,10 +900,10 @@ TEST(MariaDbTests, Field_implicit_bool_cast)
 
 TEST(MariaDbTests, Field_get)
 {
-    mariadb::result_stored  result  (reinterpret_cast<MYSQL_RES*>(0x51651));
-    mariadb::row            row     (result, const_cast<MYSQL_ROW>(&RowData[0]));
-    mariadb::field          field0  (row, 1, "123", 3);
-    mariadb::field          field1  (row, 1, "asd",   3);
+    cppmariadb::result_stored  result  (reinterpret_cast<MYSQL_RES*>(0x51651));
+    cppmariadb::row            row     (result, const_cast<MYSQL_ROW>(&RowData[0]));
+    cppmariadb::field          field0  (row, 1, "123", 3);
+    cppmariadb::field          field1  (row, 1, "asd",   3);
 
     EXPECT_EQ(123,                field0.get<int>());
     EXPECT_EQ(std::string("asd"), field1.get<std::string>());