mirror/sqlpp11
1
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2026-05-04 18:09:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

More function tests and a few corrections for names and return types

Browse Source
This commit is contained in:
Roland Bock
2013-11-07 15:06:13 +01:00
parent 9d94f6770b
commit 813549690e
9 changed files with 231 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sqlpp11/any.h
+1 -1
View File
@@ -42,7 +42,7 @@ namespace sqlpp
struct _value_type: public Select::_value_type::_base_value_type
{
using _is_named_expression = std::true_type;
using _is_nameless_expression = std::true_type; // must not be named
};
struct _name_t
include/sqlpp11/detail/basic_operators.h
+4 -8
View File
@@ -31,6 +31,7 @@
#include <sqlpp11/alias.h>
#include <sqlpp11/sort_order.h>
#include <sqlpp11/in.h>
#include <sqlpp11/is_null.h>
namespace sqlpp
{
@@ -64,12 +65,6 @@ namespace sqlpp
static constexpr const char* _name = ">";
};
struct is_null_
{
using _value_type = boolean;
static constexpr const char* _name = "IS NULL";
};
struct is_not_null_
{
using _value_type = boolean;
@@ -116,12 +111,12 @@ namespace sqlpp
return { *static_cast<const Base*>(this), std::forward<T>(t) };
}
null_expression_t<Base, is_null_> is_null() const
is_null_t<true, boolean, Base> is_null() const
{
return { *static_cast<const Base*>(this) };
}
null_expression_t<Base, is_not_null_> is_not_null() const
is_null_t<false, boolean, Base> is_not_null() const
{
return { *static_cast<const Base*>(this) };
}
@@ -152,6 +147,7 @@ namespace sqlpp
template<typename alias_provider>
expression_alias_t<Base, typename std::decay<alias_provider>::type> as(alias_provider&&)
{
static_assert(not is_nameless_expression_t<Base>::value, "expression cannot have a name, e.g. like any()");
return { *static_cast<const Base*>(this) };
}
include/sqlpp11/expression.h
-33
View File
@@ -175,39 +175,6 @@ namespace sqlpp
Lhs _lhs;
};
template<typename Lhs, typename O>
struct null_expression_t: public O::_value_type::template operators<null_expression_t<Lhs, O>>
{
using _value_type = typename O::_value_type;
null_expression_t(Lhs&& l):
_lhs(std::move(l))
{}
null_expression_t(const Lhs& l):
_lhs(l)
{}
null_expression_t(const null_expression_t&) = default;
null_expression_t(null_expression_t&&) = default;
null_expression_t& operator=(const null_expression_t&) = default;
null_expression_t& operator=(null_expression_t&&) = default;
~null_expression_t() = default;
template<typename Db>
void serialize(std::ostream& os, Db& db) const
{
os << "(";
_lhs.serialize(os, db);
os << " ";
os << O::_name;
os << ")";
}
private:
Lhs _lhs;
};
template<typename Lhs, typename O, typename Rhs>
struct binary_expression_t: public O::_value_type::template operators<binary_expression_t<Lhs, O, Rhs>>
{
include/sqlpp11/in.h
+1 -1
View File
@@ -77,7 +77,7 @@ namespace sqlpp
void serialize(std::ostream& os, Db& db) const
{
static_assert(NotInverted and Db::_supports_in
or _inverted and Db::_supports_not_in, "in() not supported by current database");
or _inverted and Db::_supports_not_in, "in() and/or not_in() not supported by current database");
_operand.serialize(os, db);
os << (_inverted ? " NOT IN(" : " IN(");
detail::serialize_tuple(os, db, _args, ',');
include/sqlpp11/is_null.h
+88
View File
@@ -0,0 +1,88 @@
/*
* Copyright (c) 2013, Roland Bock
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* Redistributions in binary form must reproduce the above copyright notice, this
* list of conditions and the following disclaimer in the documentation and/or
* other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef SQLPP_IS_NULL_H
#define SQLPP_IS_NULL_H
#include <sstream>
#include <sqlpp11/type_traits.h>
#include <sqlpp11/detail/set.h>
namespace sqlpp
{
namespace detail
{
// The ValueType should be boolean, this is a hack because boolean is not fully defined when the compiler first gets here...
template<bool NotInverted, typename ValueType, typename Operand>
struct is_null_t: public ValueType::_base_value_type::template operators<is_null_t<NotInverted, ValueType, Operand>>
{
static constexpr bool _inverted = not NotInverted;
struct _value_type: public ValueType::_base_value_type // we requite fully defined boolean here
{
using _is_named_expression = std::true_type;
};
struct _name_t
{
static constexpr const char* _get_name() { return _inverted ? "IS NOT NULL" : "IS NULL"; }
template<typename T>
struct _member_t
{
T in;
};
};
is_null_t(const Operand& operand):
_operand(operand)
{}
is_null_t(Operand&& operand):
_operand(std::move(operand))
{}
is_null_t(const is_null_t&) = default;
is_null_t(is_null_t&&) = default;
is_null_t& operator=(const is_null_t&) = default;
is_null_t& operator=(is_null_t&&) = default;
~is_null_t() = default;
template<typename Db>
void serialize(std::ostream& os, Db& db) const
{
static_assert(NotInverted and Db::_supports_is_null
or _inverted and Db::_supports_is_not_null, "is_null() and/or is_not_null() not supported by current database");
_operand.serialize(os, db);
os << (_inverted ? " IS NOT NULL" : " IS NULL");
}
private:
Operand _operand;
};
}
}
#endif
include/sqlpp11/some.h
+1 -1
View File
@@ -42,7 +42,7 @@ namespace sqlpp
struct _value_type: public Select::_value_type::_base_value_type
{
using _is_named_expression = std::true_type;
using _is_nameless_expression = std::true_type; // must not be named
};
struct _name_t
include/sqlpp11/type_traits.h
+1
View File
@@ -84,6 +84,7 @@ namespace sqlpp
SQLPP_IS_VALUE_TRAIT_GENERATOR(value);
SQLPP_IS_VALUE_TRAIT_GENERATOR(expression);
SQLPP_IS_VALUE_TRAIT_GENERATOR(named_expression);
SQLPP_IS_VALUE_TRAIT_GENERATOR(nameless_expression);
SQLPP_IS_VALUE_TRAIT_GENERATOR(alias); // FIXME: Is this really part of the value?
SQLPP_IS_VALUE_TRAIT_GENERATOR(select_flag);