Split day_point and time_point

include/sqlpp11/date_time_fwd.h → include/sqlpp11/chrono.h

@@ -24,8 +24,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SQLPP_DATE_FWD_H
-#define SQLPP_DATE_FWD_H
+#ifndef SQLPP_CHRONO_H
+#define SQLPP_CHRONO_H
 
 #include <chrono>
 
@@ -38,9 +38,6 @@ namespace sqlpp
     using day_point = std::chrono::time_point<std::chrono::system_clock, days>;
     using mus_point = std::chrono::time_point<std::chrono::system_clock, std::chrono::microseconds>;
   }
-
-  struct day_point;
-  struct time_point;
 }
 
 #endif

include/sqlpp11/data_types/boolean/expression_operators.h

@@ -27,6 +27,7 @@
 #ifndef SQLPP_BOOLEAN_EXPRESSION_OPERATORS_H
 #define SQLPP_BOOLEAN_EXPRESSION_OPERATORS_H
 
+#include <sqlpp11/expression_operators.h>
 #include <sqlpp11/basic_expression_operators.h>
 
 namespace sqlpp

include/sqlpp11/data_types/day_point.h

@@ -27,210 +27,13 @@
 #ifndef SQLPP_DAY_POINT_H
 #define SQLPP_DAY_POINT_H
 
-#include <date.h>
-#include <sqlpp11/data_types/time_point.h>
-#include <sqlpp11/basic_expression_operators.h>
-#include <sqlpp11/type_traits.h>
-#include <sqlpp11/exception.h>
-#include <sqlpp11/value_type.h>
-#include <sqlpp11/assignment.h>
-#include <sqlpp11/result_field.h>
+#include <sqlpp11/data_types/day_point/data_type.h>
+#include <sqlpp11/data_types/day_point/expression_operators.h>
+#include <sqlpp11/data_types/day_point/column_operators.h>
+#include <sqlpp11/data_types/day_point/parameter_type.h>
+#include <sqlpp11/data_types/day_point/result_field.h>
+#include <sqlpp11/data_types/day_point/operand.h>
+#include <sqlpp11/data_types/day_point/wrap_operand.h>
+#include <sqlpp11/data_types/day_point/serialize.h>
 
-namespace sqlpp
-{
-  // day_point value type
-  struct day_point
-  {
-    using _traits = make_traits<day_point, tag::is_value_type>;
-    using _tag = tag::is_date;
-    using _cpp_value_type = ::sqlpp::chrono::day_point;
-
-    template <typename T>
-    using _is_valid_operand = is_time_point_t<T>;
-    template <typename T>
-    using _is_valid_assignment_operand = is_date_t<T>;
-  };
-
-  // day_point parameter value
-  template <>
-  struct parameter_value_t<day_point>
-  {
-    using _value_type = day_point;
-    using _cpp_value_type = typename _value_type::_cpp_value_type;
-
-    parameter_value_t() : _value{}, _is_null(true)
-    {
-    }
-
-    explicit parameter_value_t(const _cpp_value_type& val) : _value(val), _is_null(false)
-    {
-    }
-
-    parameter_value_t& operator=(const _cpp_value_type& val)
-    {
-      _value = val;
-      _is_null = false;
-      return *this;
-    }
-
-    parameter_value_t& operator=(const tvin_t<wrap_operand_t<_cpp_value_type>>& t)
-    {
-      if (t._is_trivial())
-      {
-        _value = _cpp_value_type{};
-        _is_null = true;
-      }
-      else
-      {
-        _value = t._value._t;
-        _is_null = false;
-      }
-      return *this;
-    }
-
-    void set_null()
-    {
-      _value = _cpp_value_type{};
-      _is_null = true;
-    }
-
-    bool is_null() const
-    {
-      return _is_null;
-    }
-
-    const _cpp_value_type& value() const
-    {
-      return _value;
-    }
-
-    operator _cpp_value_type() const
-    {
-      return _value;
-    }
-
-    template <typename Target>
-    void _bind(Target& target, size_t index) const
-    {
-      target._bind_date_parameter(index, &_value, _is_null);
-    }
-
-  private:
-    _cpp_value_type _value;
-    bool _is_null;
-  };
-
-  // day_point expression operators
-  template <typename Base>
-  struct expression_operators<Base, day_point> : public basic_expression_operators<Base, day_point>
-  {
-    template <typename T>
-    using _is_valid_operand = is_valid_operand<day_point, T>;
-  };
-
-  // day_point column operators
-  template <typename Base>
-  struct column_operators<Base, day_point>
-  {
-    template <typename T>
-    using _is_valid_operand = is_valid_operand<day_point, T>;
-  };
-
-  // day_point result field
-  template <typename Db, typename FieldSpec>
-  struct result_field_t<day_point, Db, FieldSpec>
-      : public result_field_methods_t<result_field_t<day_point, Db, FieldSpec>>
-  {
-    static_assert(std::is_same<value_type_of<FieldSpec>, day_point>::value, "field type mismatch");
-    using _cpp_value_type = typename sqlpp::day_point::_cpp_value_type;
-
-    result_field_t() : _is_valid(false), _is_null(true), _value{}
-    {
-    }
-
-    void _invalidate()
-    {
-      _is_valid = false;
-      _is_null = true;
-      _value = _cpp_value_type{};
-    }
-
-    void _validate()
-    {
-      _is_valid = true;
-    }
-
-    bool is_null() const
-    {
-      if (not _is_valid)
-        throw exception("accessing is_null in non-existing row");
-      return _is_null;
-    }
-
-    bool _is_trivial() const
-    {
-      if (not _is_valid)
-        throw exception("accessing is_null in non-existing row");
-
-      return value() == _cpp_value_type{};
-    }
-
-    _cpp_value_type value() const
-    {
-      if (not _is_valid)
-        throw exception("accessing value in non-existing row");
-
-      if (_is_null)
-      {
-        if (enforce_null_result_treatment_t<Db>::value and not null_is_trivial_value_t<FieldSpec>::value)
-        {
-          throw exception("accessing value of NULL field");
-        }
-        else
-        {
-          return _cpp_value_type{};
-        }
-      }
-      return _value;
-    }
-
-    template <typename Target>
-    void _bind(Target& target, size_t i)
-    {
-      target._bind_date_result(i, &_value, &_is_null);
-    }
-
-  private:
-    bool _is_valid;
-    bool _is_null;
-    _cpp_value_type _value;
-  };
-
-  template <typename Context, typename Db, typename FieldSpec>
-  struct serializer_t<Context, result_field_t<day_point, Db, FieldSpec>>
-  {
-    using _serialize_check = consistent_t;
-    using T = result_field_t<day_point, Db, FieldSpec>;
-
-    static Context& _(const T& t, Context& context)
-    {
-      if (t.is_null() and not null_is_trivial_value_t<FieldSpec>::value)
-      {
-        context << "NULL";
-      }
-      else
-      {
-        const auto ymd = ::date::year_month_day{t.value()};
-        context << ymd;
-      }
-      return context;
-    }
-  };
-
-  template <typename Db, typename FieldSpec>
-  inline std::ostream& operator<<(std::ostream& os, const result_field_t<day_point, Db, FieldSpec>& e)
-  {
-    return serialize(e, os);
-  }
-}
 #endif

include/sqlpp11/data_types/day_point/column_operators.h

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2015-2015, 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_DAY_POINT_COLUMN_OPERATORS_H
+#define SQLPP_DAY_POINT_COLUMN_OPERATORS_H
+
+#include <sqlpp11/type_traits.h>
+#include <sqlpp11/assignment.h>
+#include <sqlpp11/data_types/day_point/data_type.h>
+#include <sqlpp11/data_types/column_operators.h>
+
+namespace sqlpp
+{
+  template <typename Base>
+  struct column_operators<Base, day_point>
+  {
+    template <typename T>
+    using _is_valid_operand = is_valid_operand<day_point, T>;
+  };
+}
+#endif

include/sqlpp11/data_types/day_point/data_type.h

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2015-2015, 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_DAY_POINT_DATA_TYPE_H
+#define SQLPP_DAY_POINT_DATA_TYPE_H
+
+#include <sqlpp11/chrono.h>
+#include <sqlpp11/type_traits.h>
+
+namespace sqlpp
+{
+  struct day_point
+  {
+    using _traits = make_traits<day_point, tag::is_value_type>;
+    using _tag = tag::is_date;
+    using _cpp_value_type = ::sqlpp::chrono::day_point;
+
+    template <typename T>
+    using _is_valid_operand = is_time_point_t<T>;
+    template <typename T>
+    using _is_valid_assignment_operand = is_date_t<T>;
+  };
+}
+#endif

include/sqlpp11/data_types/day_point/expression_operators.h

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2015-2015, 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_DAY_POINT_EXPRESSION_OPERATORS_H
+#define SQLPP_DAY_POINT_EXPRESSION_OPERATORS_H
+
+#include <sqlpp11/expression_operators.h>
+#include <sqlpp11/basic_expression_operators.h>
+#include <sqlpp11/type_traits.h>
+#include <sqlpp11/data_types/day_point/data_type.h>
+
+namespace sqlpp
+{
+  template <typename Base>
+  struct expression_operators<Base, day_point> : public basic_expression_operators<Base, day_point>
+  {
+    template <typename T>
+    using _is_valid_operand = is_valid_operand<day_point, T>;
+  };
+}
+#endif