3party/sqlpp11
0
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-15 20:31:16 +08:00
Code Issues Projects Releases Wiki Activity

Added support for g++-4.8

Browse Source
This commit is contained in:
Roland Bock 2013-08-15 11:54:20 +02:00
parent e95294d044
commit 4ea28cac4b
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -78,11 +78,14 @@ db.run(remove_from(foo).where(not foo.hasFun));
Requirements: Requirements:
------------- -------------
sqlpp11 makes heavy use of C++11. It has been developed using __Compiler:__
sqlpp11 makes heavy use of C++11 and requires a recent compiler and STL. The following compilers are known to compile the test programs:
clang-3.2 on Ubuntu-10.4 with matching libc++ * clang-3.2 on Ubuntu-12.4
* g++-4.8 on Ubuntu-12.4
It also requires a database library with a matching interface, see database/api.h __Database Connector:__
sqlpp11 requires a certain api in order to connect with the database, see database/api.h.
Links to sample implementations will follow soon. Links to sample implementations will follow soon.

2
include/sqlpp11/insert.h
View File

@ -65,7 +65,7 @@ namespace sqlpp
static_assert(std::is_same<Assignments, noop>::value, "cannot call set() twice"); static_assert(std::is_same<Assignments, noop>::value, "cannot call set() twice");
return { return {
_table, _table,
{std::forward<Assignment>(assignment)...}, {std::tuple<typename std::decay<Assignment>::type...>{std::forward<Assignment>(assignment)...}},
}; };
} }

2
include/sqlpp11/multi_column.h
View File

@ -73,7 +73,7 @@ namespace sqlpp
template<typename AliasProvider, typename... NamedExpr> template<typename AliasProvider, typename... NamedExpr>
detail::make_multi_column_t<AliasProvider, NamedExpr...> multi_column(AliasProvider&& aliasProvider, NamedExpr&&... namedExpr) detail::make_multi_column_t<AliasProvider, NamedExpr...> multi_column(AliasProvider&& aliasProvider, NamedExpr&&... namedExpr)
{ {
return { {std::forward<NamedExpr>(namedExpr)...}}; return { decltype(make_expression_tuple(std::declval<NamedExpr>()...)){std::forward<NamedExpr>(namedExpr)...}};
} }
} }

2
include/sqlpp11/remove.h
View File

@ -65,7 +65,7 @@ namespace sqlpp
static_assert(std::is_same<Where, noop>::value, "cannot call using() after where()"); static_assert(std::is_same<Where, noop>::value, "cannot call using() after where()");
return { return {
_table, _table,
{{std::forward<Tab>(tab)...}}, {std::tuple<typename std::decay<Tab>::type...>{std::forward<Tab>(tab)...}},
_where _where
}; };
} }

10
include/sqlpp11/select.h
View File

@ -102,7 +102,7 @@ namespace sqlpp
using add_limit_t = select_t<Flags, ExpressionList, From, Where, GroupBy, Having, OrderBy, limit_t, Offset>; using add_limit_t = select_t<Flags, ExpressionList, From, Where, GroupBy, Having, OrderBy, limit_t, Offset>;
using add_offset_t = select_t<Flags, ExpressionList, From, Where, GroupBy, Having, OrderBy, Limit, offset_t>; using add_offset_t = select_t<Flags, ExpressionList, From, Where, GroupBy, Having, OrderBy, Limit, offset_t>;
using result_row_t = result_row_t<NamedExpr...>; using _result_row_t = result_row_t<NamedExpr...>;
// Indicators // Indicators
using _value_type = typename std::conditional< using _value_type = typename std::conditional<
@ -218,7 +218,7 @@ namespace sqlpp
return { return {
_flags, _flags,
_expression_list, _expression_list,
{{std::forward<Table>(table)...}}, {std::tuple<typename std::decay<Table>::type...>{std::forward<Table>(table)...}},
_where, _where,
_group_by, _group_by,
_having, _having,
@ -256,7 +256,7 @@ namespace sqlpp
_expression_list, _expression_list,
_from, _from,
_where, _where,
{{std::forward<Col>(column)...}}, {std::tuple<typename std::decay<Col>::type...>{std::forward<Col>(column)...}},
_having, _having,
_order_by, _order_by,
_limit, _limit,
@ -294,7 +294,7 @@ namespace sqlpp
_where, _where,
_group_by, _group_by,
_having, _having,
{{std::forward<OrderExpr>(expr)...}}, {std::tuple<typename std::decay<OrderExpr>::type...>{std::forward<OrderExpr>(expr)...}},
_limit, _limit,
_offset _offset
}; };
@ -383,7 +383,7 @@ namespace sqlpp
// Execute // Execute
template<typename Db> template<typename Db>
result_t<Db, result_row_t> run(Db& db) const result_t<Db, _result_row_t> run(Db& db) const
{ {
static_assert(not is_noop<ExpressionList>::value, "cannot run select without having selected anything"); static_assert(not is_noop<ExpressionList>::value, "cannot run select without having selected anything");
static_assert(is_from_t<From>::value, "cannot run select without a from()"); static_assert(is_from_t<From>::value, "cannot run select without a from()");

2
include/sqlpp11/update.h
View File

@ -64,7 +64,7 @@ namespace sqlpp
static_assert(std::is_same<Assignments, noop>::value, "cannot call set() twice"); static_assert(std::is_same<Assignments, noop>::value, "cannot call set() twice");
return { return {
_table, _table,
{{std::forward<Assignment>(assignment)...}}, {std::tuple<typename std::decay<Assignment>::type...>{std::forward<Assignment>(assignment)...}},
_where, _where,
}; };
} }