* small changes and fixes

include/cppmariadb/inline/result.inl

@@ -6,7 +6,7 @@ namespace cppmariadb
 {
 
     /* result ************************************************************************************/
-        
+
     inline void result::rowindex(unsigned long long value)
         { _rowindex = value; }
 
@@ -34,8 +34,9 @@ namespace cppmariadb
     }
 
     inline result::result(MYSQL_RES* h)
-        : mariadb_handle(h)
-        , _rowindex     (static_cast<unsigned long long>(-1))
+        : mariadb_handle    (h)
+        , _is_initialized   (false)
+        , _rowindex         (static_cast<unsigned long long>(-1))
         { }
 
     /* result_stored ******************************************************************************/
@@ -61,7 +62,7 @@ namespace cppmariadb
     inline result_stored::result_stored(MYSQL_RES* h)
         : result(h)
         { }
-        
+
     /* result_used *******************************************************************************/
 
     inline result_used::result_used(MYSQL_RES* h)

include/cppmariadb/inline/statement.inl

@@ -8,7 +8,7 @@ namespace cppmariadb
 {
 
     /* statement *********************************************************************************/
-        
+
     inline void statement::assign(const std::string& query)
     {
         _changed = true;
@@ -49,6 +49,9 @@ namespace cppmariadb
         _changed = true;
     }
 
+    inline bool statement::empty() const
+        { return _code.empty(); }
+
     inline void statement::clear()
     {
         for (auto& param : _parameters)
@@ -85,5 +88,5 @@ namespace cppmariadb
         , _connection   (nullptr)
         { parse(query); }
 
-        
+
 }

include/cppmariadb/inline/transaction.inl

@@ -10,7 +10,7 @@ namespace cppmariadb
     inline void transaction::begin()
     {
         static const statement sCommit("START TRANSACTION");
-        _connection.execute_rows(sCommit);
+        _connection.execute(sCommit);
     }
 
     inline void transaction::commit()
@@ -18,7 +18,7 @@ namespace cppmariadb
         static const statement sCommit("COMMIT");
         if (_closed)
             throw exception("transaction is already closed", error_code::Unknown);
-        _connection.execute_rows(sCommit);
+        _connection.execute(sCommit);
         _closed = true;
     }
 
@@ -27,7 +27,7 @@ namespace cppmariadb
         static const statement sRollback("ROLLBACK");
         if (_closed)
             throw exception("transaction is already closed", error_code::Unknown);
-        _connection.execute_rows(sRollback);
+        _connection.execute(sRollback);
         _closed = true;
     }
 
@@ -42,5 +42,5 @@ namespace cppmariadb
             rollback();
     }
 
-    
+
 }

include/cppmariadb/result.h

@@ -13,6 +13,7 @@ namespace cppmariadb
         public __impl::mariadb_handle<MYSQL_RES*>
     {
     private:
+        bool                    _is_initialized;
         std::unique_ptr<row>    _row;
         mutable column_vector   _columns;
         unsigned long long      _rowindex;

include/cppmariadb/statement.h

@@ -39,6 +39,7 @@ namespace cppmariadb
         inline size_t               find    (const std::string& param);
         inline void                 set_null(const std::string& param);
         inline void                 set_null(size_t index);
+        inline bool                 empty   () const;
         inline void                 clear   ();
 
         template<class T>

src/CMakeLists.txt

@@ -4,9 +4,9 @@ Include                     ( cotire OPTIONAL )
 Include                     ( pedantic OPTIONAL )
 Include                     ( strip_symbols OPTIONAL )
 
-Option                      ( BUILD_SHARED_MARIADBPP "Build cppmariadb shared library." OFF )
+Option                      ( BUILD_SHARED_CPPMARIADB "Build cppmariadb shared library." OFF )
 
-Set                         ( BUILD_SHARED_LIBS ${BUILD_SHARED_MARIADBPP} )
+Set                         ( BUILD_SHARED_LIBS ${BUILD_SHARED_CPPMARIADB} )
 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}" )
@@ -31,6 +31,6 @@ Target_Link_Libraries       (
 If                          ( __COTIRE_INCLUDED )
     Cotire                      ( cppmariadb )
 EndIf                       ( )
-If                          ( __STRIP_SYMBOLS_INCLUDED )
+If                          ( __STRIP_SYMBOLS_INCLUDED AND BUILD_SHARED_LIBS )
     Strip_Symbols               ( cppmariadb DBG_FILE )
 EndIf                       ()

src/result.cpp

@@ -8,14 +8,19 @@ using namespace ::cppmariadb;
 
 row* result::next()
 {
+    if (_is_initialized && !_row)
+        return nullptr;
+
+    _is_initialized = true;
     auto r = mysql_fetch_row(handle());
     if (r)
     {
-        ++_rowindex;
         _row.reset(new row(*this, r));
+        ++_rowindex;
     }
     else
         _row.reset();
+
     return _row.get();
 }
 

test/CMakeLists.txt

@@ -8,13 +8,13 @@ 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_mariadbpp #########################################################################
+# Project: test_cppmariadb ########################################################################
 
-Project                     ( test_mariadbpp )
+Project                     ( test_cppmariadb )
 File                        ( GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp )
-Add_Executable              ( test_mariadbpp EXCLUDE_FROM_ALL ${SOURCE_FILES} )
+Add_Executable              ( test_cppmariadb EXCLUDE_FROM_ALL ${SOURCE_FILES} )
 Target_Link_Libraries       (
-                                test_mariadbpp
+                                test_cppmariadb
                                 cppmariadb
                                 cpputils
                                 gtest
@@ -23,8 +23,8 @@ Target_Link_Libraries       (
                                 pthread
                             )
 If                          ( __COTIRE_INCLUDED )
-    Cotire                      ( test_mariadbpp )
+    Cotire                      ( test_cppmariadb )
 EndIf                       ( )
 If                          ( __CMAKE_TESTS_INCLUDED )
-    Add_CMake_Test             ( tsoutils test_mariadbpp )
+    Add_CMake_Test             ( tsoutils test_cppmariadb )
 EndIf                       ( )