From d856709cf3e0d202b1d974d87fe7144959949809 Mon Sep 17 00:00:00 2001 From: rbock Date: Mon, 18 Aug 2014 00:07:21 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d8629978..f25797ba 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,10 @@ Upcoming talks at * 2014-09-11: http://sched.co/1r4lue3 * MeetingC++ (Berlin, Germany): http://meetingcpp.com/index.php/mcpp2014.html * 2014-12-05:http://meetingcpp.com/index.php/tv14/items/4.html + +You can contact me + * by posting issues at https://github.com/rbock/sqlpp11/issues + * or via email at rbock at eudoxos dot de Motivation: ----------- @@ -25,7 +29,7 @@ This results in several benefits, e.g. * the library user operates comfortably on structs and functions, * the compiler reports many kinds of errors long before the code enters unit testing or production, - * the library hides the gory details of string construction for queries and interpreting string based results returned by select calls. + * the library hides the gory details of string construction for queries and interpreting results returned by select calls. The library supports both static and dynamic queries. The former offers greater benefit in terms of type and consistency checking. The latter makes it easier to construct queries on the flight. From 73973f0f488bb81ea51f622c37cd9b83eec9146a Mon Sep 17 00:00:00 2001 From: Johan Date: Wed, 20 Aug 2014 21:58:57 +0200 Subject: [PATCH 2/2] Fix cygwin-gcc and cmake problems Fixed warning in CMake Fixed problem with tuples creation Fixed problem of stream copy constructor usage --- CMakeLists.txt | 4 ++++ include/sqlpp11/insert_value_list.h | 2 +- test_constraints/CMakeLists.txt | 2 +- tests/MockDb.h | 6 ++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32fd43cc..556cdf06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,10 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cmake_minimum_required(VERSION 2.6) + +# Cygwin does not define WIN32 and warn if not use with this flag +set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required + project (sqlpp11) enable_testing() diff --git a/include/sqlpp11/insert_value_list.h b/include/sqlpp11/insert_value_list.h index 768e789b..fdf34fe5 100644 --- a/include/sqlpp11/insert_value_list.h +++ b/include/sqlpp11/insert_value_list.h @@ -105,7 +105,7 @@ namespace sqlpp insert_list_data_t(Assignments... assignments): _assignments(assignments...), _columns({assignments._lhs}...), - _values({assignments._rhs}...) + _values(assignments._rhs...) {} insert_list_data_t(const insert_list_data_t&) = default; diff --git a/test_constraints/CMakeLists.txt b/test_constraints/CMakeLists.txt index bdb60f10..4870883d 100644 --- a/test_constraints/CMakeLists.txt +++ b/test_constraints/CMakeLists.txt @@ -22,7 +22,7 @@ function(test_constraint name pattern) add_dependencies(test_sqlpp_constraints test_${name}) -endfunction(testconstraint) +endfunction(test_constraint) test_constraint(no_conversion_operator_if_null_not_trivial "int i = row.alpha") diff --git a/tests/MockDb.h b/tests/MockDb.h index d6a55365..5ef1f110 100644 --- a/tests/MockDb.h +++ b/tests/MockDb.h @@ -41,6 +41,12 @@ struct MockDbT: public sqlpp::connection { std::ostringstream _os; + _serializer_context_t() = default; + _serializer_context_t(const _serializer_context_t& rhs) + { + _os << rhs._os.str(); + } + std::string str() const { return _os.str();