From a73572ecbaa2fc8ef4dbaa3b77caf4f82daa0e74 Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Sat, 31 Oct 2015 18:22:32 +0100
Subject: [PATCH] Some renaming cleanup

---
 include/sqlpp11/data_types/boolean.h                   |  2 +-
 .../boolean/{parameter_type.h => parameter_value.h}    |  8 ++++----
 include/sqlpp11/data_types/day_point.h                 |  2 +-
 .../day_point/{parameter_type.h => parameter_value.h}  |  8 ++++----
 include/sqlpp11/data_types/floating_point.h            |  2 +-
 .../{parameter_type.h => parameter_value.h}            |  8 ++++----
 include/sqlpp11/data_types/integral.h                  |  2 +-
 .../integral/{parameter_type.h => parameter_value.h}   |  8 ++++----
 include/sqlpp11/data_types/parameter_value_base.h      | 10 +++++-----
 include/sqlpp11/data_types/text.h                      |  2 +-
 .../text/{parameter_type.h => parameter_value.h}       |  8 ++++----
 include/sqlpp11/data_types/time_point.h                |  2 +-
 .../time_point/{parameter_type.h => parameter_value.h} |  8 ++++----
 13 files changed, 35 insertions(+), 35 deletions(-)
 rename include/sqlpp11/data_types/boolean/{parameter_type.h => parameter_value.h} (89%)
 rename include/sqlpp11/data_types/day_point/{parameter_type.h => parameter_value.h} (89%)
 rename include/sqlpp11/data_types/floating_point/{parameter_type.h => parameter_value.h} (89%)
 rename include/sqlpp11/data_types/integral/{parameter_type.h => parameter_value.h} (89%)
 rename include/sqlpp11/data_types/text/{parameter_type.h => parameter_value.h} (91%)
 rename include/sqlpp11/data_types/time_point/{parameter_type.h => parameter_value.h} (89%)

diff --git a/include/sqlpp11/data_types/boolean.h b/include/sqlpp11/data_types/boolean.h
index b08fd5ce..cd865481 100644
--- a/include/sqlpp11/data_types/boolean.h
+++ b/include/sqlpp11/data_types/boolean.h
@@ -32,7 +32,7 @@
 #include <sqlpp11/data_types/boolean/wrap_operand.h>
 #include <sqlpp11/data_types/boolean/expression_operators.h>
 #include <sqlpp11/data_types/boolean/column_operators.h>
-#include <sqlpp11/data_types/boolean/parameter_type.h>
+#include <sqlpp11/data_types/boolean/parameter_value.h>
 #include <sqlpp11/data_types/boolean/result_field.h>
 
 #endif
diff --git a/include/sqlpp11/data_types/boolean/parameter_type.h b/include/sqlpp11/data_types/boolean/parameter_value.h
similarity index 89%
rename from include/sqlpp11/data_types/boolean/parameter_type.h
rename to include/sqlpp11/data_types/boolean/parameter_value.h
index 728140d2..796ef207 100644
--- a/include/sqlpp11/data_types/boolean/parameter_type.h
+++ b/include/sqlpp11/data_types/boolean/parameter_value.h
@@ -24,8 +24,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SQLPP_BOOLEAN_PARAMETER_TYPE_H
-#define SQLPP_BOOLEAN_PARAMETER_TYPE_H
+#ifndef SQLPP_BOOLEAN_PARAMETER_VALUE_H
+#define SQLPP_BOOLEAN_PARAMETER_VALUE_H
 
 #include <sqlpp11/data_types/parameter_value.h>
 #include <sqlpp11/data_types/parameter_value_base.h>
@@ -35,9 +35,9 @@
 namespace sqlpp
 {
   template <>
-  struct parameter_value_t<boolean> : public base_parameter_value<boolean, signed char>
+  struct parameter_value_t<boolean> : public parameter_value_base<boolean, signed char>
   {
-    using base = base_parameter_value<boolean, signed char>;
+    using base = parameter_value_base<boolean, signed char>;
     using base::base;
     using base::operator=;
 
diff --git a/include/sqlpp11/data_types/day_point.h b/include/sqlpp11/data_types/day_point.h
index 779dffae..5c43f96c 100644
--- a/include/sqlpp11/data_types/day_point.h
+++ b/include/sqlpp11/data_types/day_point.h
@@ -32,7 +32,7 @@
 #include <sqlpp11/data_types/day_point/wrap_operand.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/parameter_value.h>
 #include <sqlpp11/data_types/day_point/result_field.h>
 
 #endif
diff --git a/include/sqlpp11/data_types/day_point/parameter_type.h b/include/sqlpp11/data_types/day_point/parameter_value.h
similarity index 89%
rename from include/sqlpp11/data_types/day_point/parameter_type.h
rename to include/sqlpp11/data_types/day_point/parameter_value.h
index 657bdbcc..12738827 100644
--- a/include/sqlpp11/data_types/day_point/parameter_type.h
+++ b/include/sqlpp11/data_types/day_point/parameter_value.h
@@ -24,8 +24,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SQLPP_DAY_POINT_PARAMETER_TYPE_H
-#define SQLPP_DAY_POINT_PARAMETER_TYPE_H
+#ifndef SQLPP_DAY_POINT_PARAMETER_VALUE_H
+#define SQLPP_DAY_POINT_PARAMETER_VALUE_H
 
 #include <sqlpp11/data_types/parameter_value.h>
 #include <sqlpp11/data_types/parameter_value_base.h>
@@ -37,9 +37,9 @@
 namespace sqlpp
 {
   template <>
-  struct parameter_value_t<day_point> : public base_parameter_value<day_point>
+  struct parameter_value_t<day_point> : public parameter_value_base<day_point>
   {
-    using base = base_parameter_value<day_point>;
+    using base = parameter_value_base<day_point>;
     using base::base;
     using base::operator=;
 
diff --git a/include/sqlpp11/data_types/floating_point.h b/include/sqlpp11/data_types/floating_point.h
index 2be6924a..ff9a6179 100644
--- a/include/sqlpp11/data_types/floating_point.h
+++ b/include/sqlpp11/data_types/floating_point.h
@@ -32,7 +32,7 @@
 #include <sqlpp11/data_types/floating_point/wrap_operand.h>
 #include <sqlpp11/data_types/floating_point/expression_operators.h>
 #include <sqlpp11/data_types/floating_point/column_operators.h>
-#include <sqlpp11/data_types/floating_point/parameter_type.h>
+#include <sqlpp11/data_types/floating_point/parameter_value.h>
 #include <sqlpp11/data_types/floating_point/result_field.h>
 
 #endif
diff --git a/include/sqlpp11/data_types/floating_point/parameter_type.h b/include/sqlpp11/data_types/floating_point/parameter_value.h
similarity index 89%
rename from include/sqlpp11/data_types/floating_point/parameter_type.h
rename to include/sqlpp11/data_types/floating_point/parameter_value.h
index d0ff6108..88c2cd02 100644
--- a/include/sqlpp11/data_types/floating_point/parameter_type.h
+++ b/include/sqlpp11/data_types/floating_point/parameter_value.h
@@ -24,8 +24,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SQLPP_FLOATING_POINT_PARAMETER_TYPE_H
-#define SQLPP_FLOATING_POINT_PARAMETER_TYPE_H
+#ifndef SQLPP_FLOATING_POINT_PARAMETER_VALUE_H
+#define SQLPP_FLOATING_POINT_PARAMETER_VALUE_H
 
 #include <sqlpp11/data_types/parameter_value.h>
 #include <sqlpp11/data_types/parameter_value_base.h>
@@ -37,9 +37,9 @@
 namespace sqlpp
 {
   template <>
-  struct parameter_value_t<floating_point> : public base_parameter_value<floating_point>
+  struct parameter_value_t<floating_point> : public parameter_value_base<floating_point>
   {
-    using base = base_parameter_value<floating_point>;
+    using base = parameter_value_base<floating_point>;
     using base::base;
     using base::operator=;
 
diff --git a/include/sqlpp11/data_types/integral.h b/include/sqlpp11/data_types/integral.h
index a4836b23..3b420ff2 100644
--- a/include/sqlpp11/data_types/integral.h
+++ b/include/sqlpp11/data_types/integral.h
@@ -32,7 +32,7 @@
 #include <sqlpp11/data_types/integral/wrap_operand.h>
 #include <sqlpp11/data_types/integral/expression_operators.h>
 #include <sqlpp11/data_types/integral/column_operators.h>
-#include <sqlpp11/data_types/integral/parameter_type.h>
+#include <sqlpp11/data_types/integral/parameter_value.h>
 #include <sqlpp11/data_types/integral/result_field.h>
 
 #endif
diff --git a/include/sqlpp11/data_types/integral/parameter_type.h b/include/sqlpp11/data_types/integral/parameter_value.h
similarity index 89%
rename from include/sqlpp11/data_types/integral/parameter_type.h
rename to include/sqlpp11/data_types/integral/parameter_value.h
index ba8e1d5d..8c29b9fc 100644
--- a/include/sqlpp11/data_types/integral/parameter_type.h
+++ b/include/sqlpp11/data_types/integral/parameter_value.h
@@ -24,8 +24,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SQLPP_INTEGRAL_PARAMETER_TYPE_H
-#define SQLPP_INTEGRAL_PARAMETER_TYPE_H
+#ifndef SQLPP_INTEGRAL_PARAMETER_VALUE_H
+#define SQLPP_INTEGRAL_PARAMETER_VALUE_H
 
 #include <sqlpp11/data_types/parameter_value.h>
 #include <sqlpp11/data_types/parameter_value_base.h>
@@ -35,9 +35,9 @@
 namespace sqlpp
 {
   template <>
-  struct parameter_value_t<integral> : public base_parameter_value<integral>
+  struct parameter_value_t<integral> : public parameter_value_base<integral>
   {
-    using base = base_parameter_value<integral>;
+    using base = parameter_value_base<integral>;
     using base::base;
     using base::operator=;
 
diff --git a/include/sqlpp11/data_types/parameter_value_base.h b/include/sqlpp11/data_types/parameter_value_base.h
index 19785d62..491666d4 100644
--- a/include/sqlpp11/data_types/parameter_value_base.h
+++ b/include/sqlpp11/data_types/parameter_value_base.h
@@ -33,28 +33,28 @@
 namespace sqlpp
 {
   template <typename DataType, typename StorageType = typename DataType::_cpp_value_type>
-  struct base_parameter_value
+  struct parameter_value_base
   {
     using _value_type = DataType;
     using _cpp_value_type = typename _value_type::_cpp_value_type;
     using _cpp_storage_type = StorageType;
 
-    base_parameter_value() : _value{}, _is_null{true}
+    parameter_value_base() : _value{}, _is_null{true}
     {
     }
 
-    explicit base_parameter_value(const _cpp_value_type& val) : _value(val), _is_null(false)
+    explicit parameter_value_base(const _cpp_value_type& val) : _value(val), _is_null(false)
     {
     }
 
-    base_parameter_value& operator=(const _cpp_value_type& val)
+    parameter_value_base& operator=(const _cpp_value_type& val)
     {
       _value = val;
       _is_null = false;
       return *this;
     }
 
-    base_parameter_value& operator=(const tvin_t<wrap_operand_t<_cpp_value_type>>& t)
+    parameter_value_base& operator=(const tvin_t<wrap_operand_t<_cpp_value_type>>& t)
     {
       if (t._is_trivial())
       {
diff --git a/include/sqlpp11/data_types/text.h b/include/sqlpp11/data_types/text.h
index c50d4b3f..2c9327c7 100644
--- a/include/sqlpp11/data_types/text.h
+++ b/include/sqlpp11/data_types/text.h
@@ -32,7 +32,7 @@
 #include <sqlpp11/data_types/text/wrap_operand.h>
 #include <sqlpp11/data_types/text/expression_operators.h>
 #include <sqlpp11/data_types/text/column_operators.h>
-#include <sqlpp11/data_types/text/parameter_type.h>
+#include <sqlpp11/data_types/text/parameter_value.h>
 #include <sqlpp11/data_types/text/result_field.h>
 
 // text specific functions
diff --git a/include/sqlpp11/data_types/text/parameter_type.h b/include/sqlpp11/data_types/text/parameter_value.h
similarity index 91%
rename from include/sqlpp11/data_types/text/parameter_type.h
rename to include/sqlpp11/data_types/text/parameter_value.h
index 8358696c..10d69d06 100644
--- a/include/sqlpp11/data_types/text/parameter_type.h
+++ b/include/sqlpp11/data_types/text/parameter_value.h
@@ -24,8 +24,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SQLPP_TEXT_PARAMETER_TYPE_H
-#define SQLPP_TEXT_PARAMETER_TYPE_H
+#ifndef SQLPP_TEXT_PARAMETER_VALUE_H
+#define SQLPP_TEXT_PARAMETER_VALUE_H
 
 #include <sqlpp11/data_types/parameter_value.h>
 #include <sqlpp11/data_types/parameter_value_base.h>
@@ -37,9 +37,9 @@
 namespace sqlpp
 {
   template <>
-  struct parameter_value_t<text> : public base_parameter_value<text>
+  struct parameter_value_t<text> : public parameter_value_base<text>
   {
-    using base = base_parameter_value<text>;
+    using base = parameter_value_base<text>;
     using base::base;
     using base::operator=;
 
diff --git a/include/sqlpp11/data_types/time_point.h b/include/sqlpp11/data_types/time_point.h
index e6f02703..83e481b7 100644
--- a/include/sqlpp11/data_types/time_point.h
+++ b/include/sqlpp11/data_types/time_point.h
@@ -32,7 +32,7 @@
 #include <sqlpp11/data_types/time_point/wrap_operand.h>
 #include <sqlpp11/data_types/time_point/expression_operators.h>
 #include <sqlpp11/data_types/time_point/column_operators.h>
-#include <sqlpp11/data_types/time_point/parameter_type.h>
+#include <sqlpp11/data_types/time_point/parameter_value.h>
 #include <sqlpp11/data_types/time_point/result_field.h>
 
 #endif
diff --git a/include/sqlpp11/data_types/time_point/parameter_type.h b/include/sqlpp11/data_types/time_point/parameter_value.h
similarity index 89%
rename from include/sqlpp11/data_types/time_point/parameter_type.h
rename to include/sqlpp11/data_types/time_point/parameter_value.h
index 5cccac0b..276c6942 100644
--- a/include/sqlpp11/data_types/time_point/parameter_type.h
+++ b/include/sqlpp11/data_types/time_point/parameter_value.h
@@ -24,8 +24,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SQLPP_TIME_POINT_PARAMETER_TYPE_H
-#define SQLPP_TIME_POINT_PARAMETER_TYPE_H
+#ifndef SQLPP_TIME_POINT_PARAMETER_VALUE_H
+#define SQLPP_TIME_POINT_PARAMETER_VALUE_H
 
 #include <sqlpp11/data_types/parameter_value.h>
 #include <sqlpp11/data_types/parameter_value_base.h>
@@ -37,9 +37,9 @@
 namespace sqlpp
 {
   template <>
-  struct parameter_value_t<time_point> : public base_parameter_value<time_point>
+  struct parameter_value_t<time_point> : public parameter_value_base<time_point>
   {
-    using base = base_parameter_value<time_point>;
+    using base = parameter_value_base<time_point>;
     using base::base;
     using base::operator=;