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

Added a few cte checks, fixed logic of requiring and providing ctes

Browse Source
This commit is contained in:
rbock 2015-02-08 18:26:36 +01:00
parent b60df812e1
commit ee3d803c33
3 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
include/sqlpp11/cte.h
View File

@ -71,12 +71,12 @@ namespace sqlpp
template<typename AliasProvider, typename Statement, typename... ColumnSpecs> template<typename AliasProvider, typename Statement, typename... ColumnSpecs>
struct cte_t: public member_t<ColumnSpecs, column_t<AliasProvider, ColumnSpecs>>... struct cte_t: public member_t<ColumnSpecs, column_t<AliasProvider, ColumnSpecs>>...
{ {
using _traits = make_traits<no_value_t, tag::is_cte, tag::is_table>; using _traits = make_traits<no_value_t, tag::is_cte, tag::is_table>; // FIXME: is table? really?
struct _recursive_traits struct _recursive_traits
{ {
using _required_ctes = required_ctes_of<Statement>; using _required_ctes = detail::make_joined_set_t<required_ctes_of<Statement>, detail::make_type_set_t<AliasProvider>>;
using _provided_ctes = detail::make_type_set_t<AliasProvider>; using _provided_ctes = detail::type_set<>;
using _required_tables = required_tables_of<Statement>; using _required_tables = detail::type_set<>;
using _provided_tables = detail::type_set<AliasProvider>; using _provided_tables = detail::type_set<AliasProvider>;
using _provided_outer_tables = detail::type_set<>; using _provided_outer_tables = detail::type_set<>;
using _extra_tables = detail::type_set<>; using _extra_tables = detail::type_set<>;
@ -122,17 +122,45 @@ namespace sqlpp
template<typename AliasProvider> template<typename AliasProvider>
struct pre_cte_t struct pre_cte_t
{ {
using _traits = make_traits<no_value_t, tag::is_cte, tag::is_table>; // FIXME: is table? really?
struct _recursive_traits
{
using _required_ctes = detail::make_type_set_t<AliasProvider>;
using _provided_ctes = detail::type_set<>;
using _required_tables = detail::type_set<>;
using _provided_tables = detail::type_set<AliasProvider>;
using _provided_outer_tables = detail::type_set<>;
using _extra_tables = detail::type_set<>;
using _parameters = std::tuple<>;
using _tags = detail::type_set<>;
};
using _alias_t = typename AliasProvider::_alias_t;
template<typename Statement> template<typename Statement>
auto as(Statement statement) auto as(Statement statement)
-> make_cte_t<AliasProvider, Statement> -> make_cte_t<AliasProvider, Statement>
{ {
// FIXME: Need to check stuff here. static_assert(required_tables_of<Statement>::size::value == 0, "common table expression must not use unknown tables");
// e.g. make sure that the statement does not require this a cte of this name (other ctes are allowed) static_assert(not detail::is_element_of<AliasProvider, required_ctes_of<Statement>>::value, "common table expression must not self-reference in the first part, use union_all/union_distinct for recursion");
// make sure that the statement does not depend on external tables
return { statement }; return { statement };
} }
}; };
template<typename Context, typename AliasProvider>
struct serializer_t<Context, pre_cte_t<AliasProvider>>
{
using _serialize_check = consistent_t;
using T = pre_cte_t<AliasProvider>;
static Context& _(const T& t, Context& context)
{
context << name_of<T>::char_ptr();
return context;
}
};
template<typename AliasProvider> template<typename AliasProvider>
auto cte(const AliasProvider&) auto cte(const AliasProvider&)
-> pre_cte_t<AliasProvider> -> pre_cte_t<AliasProvider>

2
include/sqlpp11/type_traits.h
View File

@ -227,7 +227,7 @@ namespace sqlpp
struct make_recursive_traits struct make_recursive_traits
{ {
using _required_ctes = detail::make_joined_set_t<required_ctes_of<Arguments>...>; using _required_ctes = detail::make_joined_set_t<required_ctes_of<Arguments>...>;
using _provided_ctes = detail::make_joined_set_t<required_ctes_of<Arguments>...>; using _provided_ctes = detail::make_joined_set_t<provided_ctes_of<Arguments>...>;
using _required_tables = detail::make_joined_set_t<required_tables_of<Arguments>...>; using _required_tables = detail::make_joined_set_t<required_tables_of<Arguments>...>;
using _provided_tables = detail::make_joined_set_t<provided_tables_of<Arguments>...>; using _provided_tables = detail::make_joined_set_t<provided_tables_of<Arguments>...>;
using _provided_outer_tables = detail::make_joined_set_t<provided_outer_tables_of<Arguments>...>; using _provided_outer_tables = detail::make_joined_set_t<provided_outer_tables_of<Arguments>...>;

13
include/sqlpp11/with.h
View File

@ -62,7 +62,18 @@ namespace sqlpp
struct with_t struct with_t
{ {
using _traits = make_traits<no_value_t, tag::is_with>; using _traits = make_traits<no_value_t, tag::is_with>;
using _recursive_traits = make_recursive_traits<Expressions...>; struct _recursive_traits
{
using _required_ctes = detail::type_set<>;
using _provided_ctes = detail::make_joined_set_t<required_ctes_of<Expressions>...>; // with provides common table expressions
using _required_tables = detail::type_set<>;
using _provided_tables = detail::type_set<>;
using _provided_outer_tables = detail::type_set<>;
using _extra_tables = detail::type_set<>;
using _parameters = detail::make_parameter_tuple_t<parameters_of<Expressions>...>;
using _tags = detail::type_set<>;
};
using _is_dynamic = is_database<Database>; using _is_dynamic = is_database<Database>;