Formatting...

This commit is contained in:
rbock
2018-06-01 09:53:39 +02:00
parent a643095958
commit cc96fc44ef
16 changed files with 51 additions and 60 deletions

View File

@@ -53,5 +53,5 @@ namespace sqlpp
concat_t<Column, wrap_operand_t<T>>{*static_cast<const Column*>(this), rhs{t}}};
}
};
}
} // namespace sqlpp
#endif

View File

@@ -45,5 +45,5 @@ namespace sqlpp
using blob = blob;
using mediumblob = blob;
}
} // namespace sqlpp
#endif

View File

@@ -90,5 +90,5 @@ namespace sqlpp
return context;
}
};
}
} // namespace sqlpp
#endif

View File

@@ -49,5 +49,5 @@ namespace sqlpp
target._bind_blob_parameter(index, &_value, _is_null);
}
};
}
} // namespace sqlpp
#endif

View File

@@ -48,7 +48,7 @@ namespace sqlpp
{
target._bind_blob_result(index, &blob, &len);
if (blob)
this->_value.assign(blob, blob+len);
this->_value.assign(blob, blob + len);
else
this->_value.clear();
this->_is_null = (blob == nullptr);
@@ -59,7 +59,7 @@ namespace sqlpp
{
target._post_bind_blob_result(index, &blob, &len);
if (blob)
this->_value.assign(blob, blob+len);
this->_value.assign(blob, blob + len);
else
this->_value.clear();
this->_is_null = (blob == nullptr);
@@ -79,5 +79,5 @@ namespace sqlpp
return os << e.value();
}
}
}
} // namespace sqlpp
#endif

View File

@@ -47,5 +47,5 @@ namespace sqlpp
{
using type = blob_operand;
};
}
} // namespace sqlpp
#endif

View File

@@ -39,6 +39,6 @@ namespace sqlpp
};
template <typename T, typename Defer>
using return_type_like_t = typename return_type_like<T, Defer>::type;
}
} // namespace sqlpp
#endif

View File

@@ -124,7 +124,7 @@ namespace sqlpp
struct insert_list_data_t
{
insert_list_data_t(std::tuple<Assignments...> assignments)
: _assignments(assignments), _columns( columns_from_tuple(assignments) ), _values( values_from_tuple(assignments) )
: _assignments(assignments), _columns(columns_from_tuple(assignments)), _values(values_from_tuple(assignments))
{
}
@@ -140,30 +140,34 @@ namespace sqlpp
std::tuple<rhs_t<Assignments>...> _values;
interpretable_list_t<Database> _dynamic_columns;
interpretable_list_t<Database> _dynamic_values;
private:
template< size_t... Indexes >
auto columns_from_tuple( detail::index_sequence<Indexes... >, std::tuple<Assignments ...> assignments ) -> decltype (_columns)
template <size_t... Indexes>
auto columns_from_tuple(detail::index_sequence<Indexes...>, std::tuple<Assignments...> assignments)
-> decltype(_columns)
{
(void) assignments;
return decltype(_columns)(std::get<Indexes>(assignments)._lhs...);
(void)assignments;
return decltype(_columns)(std::get<Indexes>(assignments)._lhs...);
}
auto columns_from_tuple(std::tuple<Assignments ...> assignments) -> decltype (_columns) {
const auto seq = detail::make_index_sequence<sizeof... (Assignments)>{};
return columns_from_tuple(seq, assignments);
auto columns_from_tuple(std::tuple<Assignments...> assignments) -> decltype(_columns)
{
const auto seq = detail::make_index_sequence<sizeof...(Assignments)>{};
return columns_from_tuple(seq, assignments);
}
template< size_t... Indexes >
auto values_from_tuple( detail::index_sequence<Indexes... >, std::tuple<Assignments ...> assignments ) -> decltype(_values)
template <size_t... Indexes>
auto values_from_tuple(detail::index_sequence<Indexes...>, std::tuple<Assignments...> assignments)
-> decltype(_values)
{
(void) assignments;
(void)assignments;
return decltype(_values)(std::get<Indexes>(assignments)._rhs...);
}
auto values_from_tuple( std::tuple<Assignments ...> assignments ) -> decltype(_values)
auto values_from_tuple(std::tuple<Assignments...> assignments) -> decltype(_values)
{
const auto seq = detail::make_index_sequence<sizeof... (Assignments)>{};
return values_from_tuple(seq, assignments);
const auto seq = detail::make_index_sequence<sizeof...(Assignments)>{};
return values_from_tuple(seq, assignments);
}
};
@@ -589,7 +593,7 @@ namespace sqlpp
auto _set_impl(Check, Assignments... assignments) const -> inconsistent<Check>;
template <typename Database, typename... Assignments>
auto _set_impl(consistent_t /*unused*/,std::tuple<Assignments...> assignments) const
auto _set_impl(consistent_t /*unused*/, std::tuple<Assignments...> assignments) const
-> _new_statement_t<consistent_t, insert_list_t<Database, Assignments...>>
{
return {static_cast<const derived_statement_t<Policies>&>(*this),

View File

@@ -38,7 +38,7 @@ namespace sqlpp
template <typename Database, typename... Assignments>
struct update_list_data_t
{
update_list_data_t(std::tuple<Assignments ...> assignments ) : _assignments(assignments)
update_list_data_t(std::tuple<Assignments...> assignments) : _assignments(assignments)
{
}