renamed timestamp to timestamp_type_t

include/matador/query/attribute_string_writer.hpp

@@ -40,7 +40,7 @@ public:
   void write_value(size_t pos, const double& x) override;
   void write_value(size_t pos, const utils::date_type_t& x) override;
   void write_value(size_t pos, const utils::time_type_t& x) override;
-  void write_value(size_t pos, const utils::timestamp& x) override;
+  void write_value(size_t pos, const utils::timestamp_type_t& x) override;
   void write_value(size_t pos, const char* x) override;
   void write_value(size_t pos, const char* x, size_t size) override;
   void write_value(size_t pos, const std::string& x) override;

include/matador/query/internal/basic_type_to_string_visitor.hpp

@@ -33,7 +33,7 @@ struct basic_type_to_string_visitor
   void operator()(const std::string &x) { result = writer->to_string(x); }
   void operator()(const utils::date_type_t &x) { result = writer->to_string(x); }
   void operator()(const utils::time_type_t &x) { result = writer->to_string(x); }
-  void operator()(const utils::timestamp &x) { result = writer->to_string(x); }
+  void operator()(const utils::timestamp_type_t &x) { result = writer->to_string(x); }
   void operator()(const utils::blob_type_t &x) { result = writer->to_string(x); }
 
   attribute_string_writer *writer{};

include/matador/query/value_extractor.hpp

@@ -73,7 +73,7 @@ public:
   void write_value(size_t pos, const double &x) override;
   void write_value(size_t pos, const utils::date_type_t &x ) override;
   void write_value(size_t pos, const utils::time_type_t &x ) override;
-  void write_value(size_t pos, const utils::timestamp &x ) override;
+  void write_value(size_t pos, const utils::timestamp_type_t &x ) override;
   void write_value(size_t pos, const char *x) override;
   void write_value(size_t pos, const char *x, size_t size) override;
   void write_value(size_t pos, const std::string &x) override;

include/matador/utils/attribute_reader.hpp

@@ -27,7 +27,7 @@ public:
   virtual void read_value(const char *id, size_t index, double &value) = 0;
   virtual void read_value(const char *id, size_t index, time_type_t &value) = 0;
   virtual void read_value(const char *id, size_t index, date_type_t &value) = 0;
-  virtual void read_value(const char *id, size_t index, timestamp &value) = 0;
+  virtual void read_value(const char *id, size_t index, timestamp_type_t &value) = 0;
   virtual void read_value(const char *id, size_t index, char *value, size_t size) = 0;
   virtual void read_value(const char *id, size_t index, std::string &value) = 0;
   virtual void read_value(const char *id, size_t index, std::string &value, size_t size) = 0;

include/matador/utils/attribute_writer.hpp

@@ -27,7 +27,7 @@ public:
   virtual void write_value(size_t pos, const double &x) = 0;
   virtual void write_value(size_t pos, const date_type_t &x) = 0;
   virtual void write_value(size_t pos, const time_type_t &x) = 0;
-  virtual void write_value(size_t pos, const timestamp &x) = 0;
+  virtual void write_value(size_t pos, const timestamp_type_t &x) = 0;
   virtual void write_value(size_t pos, const char *x) = 0;
   virtual void write_value(size_t pos, const char *x, size_t size) = 0;
   virtual void write_value(size_t pos, const std::string &x) = 0;

include/matador/utils/basic_type_converter.hpp

@@ -33,7 +33,7 @@ public:
   void operator()(std::string &x) { this->convert(x); }
   void operator()(date_type_t &x) { this->convert(x); }
   void operator()(time_type_t &x) { this->convert(x); }
-  void operator()(timestamp &x) { this->convert(x); }
+  void operator()(timestamp_type_t &x) { this->convert(x); }
   void operator()(blob_type_t &x) { this->convert(x); }
 
 private:

include/matador/utils/convert.hpp

@@ -286,7 +286,7 @@ result<DestType, conversion_error> to(const char *source, std::enable_if_t<std::
 
 
 template < typename DestType >
-result<DestType, conversion_error> to(const std::string &source, std::enable_if_t<std::is_same_v<DestType, timestamp>>* = nullptr) {
+result<DestType, conversion_error> to(const std::string &source, std::enable_if_t<std::is_same_v<DestType, timestamp_type_t>>* = nullptr) {
   std::tm result{};
   std::istringstream iss(source);
   iss >> std::get_time(&result, "%Y-%m-%d %H:%M:%S");
@@ -302,7 +302,7 @@ result<DestType, conversion_error> to(const std::string &source, std::enable_if_
 }
 
 template < typename DestType >
-result<DestType, conversion_error> to(const char *source, std::enable_if_t<std::is_same_v<DestType, timestamp>>* = nullptr) {
+result<DestType, conversion_error> to(const char *source, std::enable_if_t<std::is_same_v<DestType, timestamp_type_t>>* = nullptr) {
   return to<DestType>(std::string{source});
 }
 
@@ -318,7 +318,7 @@ result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_
 }
 
 template < typename DestType, typename SourceType >
-result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_integral_v<DestType> && !std::is_same_v<bool, DestType> && std::is_same_v<timestamp, SourceType>>* = nullptr) {
+result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_integral_v<DestType> && !std::is_same_v<bool, DestType> && std::is_same_v<timestamp_type_t, SourceType>>* = nullptr) {
   return failure(conversion_error::NotConvertable);
 }
 
@@ -333,7 +333,7 @@ result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_
 }
 
 template < typename DestType, typename SourceType >
-result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_same_v<bool, DestType> && std::is_same_v<timestamp, SourceType>>* = nullptr) {
+result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_same_v<bool, DestType> && std::is_same_v<timestamp_type_t, SourceType>>* = nullptr) {
   return failure(conversion_error::NotConvertable);
 }
 
@@ -348,7 +348,7 @@ result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_
 }
 
 template < typename DestType, typename SourceType >
-result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_floating_point_v<DestType> && std::is_same_v<timestamp, SourceType>>* = nullptr) {
+result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_floating_point_v<DestType> && std::is_same_v<timestamp_type_t, SourceType>>* = nullptr) {
   return failure(conversion_error::NotConvertable);
 }
 
@@ -363,7 +363,7 @@ result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_
 }
 
 template < typename DestType, typename SourceType >
-result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_same_v<blob_type_t, DestType> && std::is_same_v<timestamp, SourceType>>* = nullptr) {
+result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_same_v<blob_type_t, DestType> && std::is_same_v<timestamp_type_t, SourceType>>* = nullptr) {
   return failure(conversion_error::NotConvertable);
 }
 
@@ -378,7 +378,7 @@ result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_
 }
 
 template < typename DestType, typename SourceType >
-result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_same_v<std::string, DestType> && std::is_same_v<timestamp, SourceType>>* = nullptr) {
+result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_same_v<std::string, DestType> && std::is_same_v<timestamp_type_t, SourceType>>* = nullptr) {
   return failure(conversion_error::NotConvertable);
 }
 
@@ -393,7 +393,7 @@ result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_
 }
 
 template < typename DestType, typename SourceType >
-result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_integral_v<SourceType> && !std::is_same_v<bool, SourceType> && std::is_same_v<timestamp, DestType>>* = nullptr) {
+result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_integral_v<SourceType> && !std::is_same_v<bool, SourceType> && std::is_same_v<timestamp_type_t, DestType>>* = nullptr) {
   return failure(conversion_error::NotConvertable);
 }
 
@@ -408,7 +408,7 @@ result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_
 }
 
 template < typename DestType, typename SourceType >
-result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_floating_point_v<SourceType> && std::is_same_v<timestamp, DestType>>* = nullptr) {
+result<DestType, conversion_error> to(const SourceType &/*source*/, std::enable_if_t<std::is_floating_point_v<SourceType> && std::is_same_v<timestamp_type_t, DestType>>* = nullptr) {
   return failure(conversion_error::NotConvertable);
 }
 
@@ -423,7 +423,7 @@ result<DestType, conversion_error> to(const blob_type_t &/*source*/, std::enable
 }
 
 template < typename DestType>
-result<DestType, conversion_error> to(const blob_type_t &/*source*/, std::enable_if_t<std::is_same_v<timestamp, DestType>>* = nullptr) {
+result<DestType, conversion_error> to(const blob_type_t &/*source*/, std::enable_if_t<std::is_same_v<timestamp_type_t, DestType>>* = nullptr) {
   return failure(conversion_error::NotConvertable);
 }
 
@@ -438,7 +438,7 @@ result<DestType, conversion_error> to(const bool &/*source*/, std::enable_if_t<s
 }
 
 template < typename DestType>
-result<DestType, conversion_error> to(const bool &/*source*/, std::enable_if_t<std::is_same_v<timestamp, DestType>>* = nullptr) {
+result<DestType, conversion_error> to(const bool &/*source*/, std::enable_if_t<std::is_same_v<timestamp_type_t, DestType>>* = nullptr) {
   return failure(conversion_error::NotConvertable);
 }
 
@@ -463,7 +463,7 @@ result<DestType, conversion_error> to(const date_type_t &source, std::enable_if_
 }
 
 template < typename DestType>
-result<DestType, conversion_error> to(const timestamp &source, std::enable_if_t<std::is_same_v<time_type_t, DestType>>* = nullptr) {
+result<DestType, conversion_error> to(const timestamp_type_t &source, std::enable_if_t<std::is_same_v<time_type_t, DestType>>* = nullptr) {
   const std::time_t tt = std::chrono::system_clock::to_time_t(source);
 
   const std::tm* result = std::localtime(&tt);
@@ -472,7 +472,7 @@ result<DestType, conversion_error> to(const timestamp &source, std::enable_if_t<
 }
 
 template < typename DestType>
-result<DestType, conversion_error> to(const timestamp &source, std::enable_if_t<std::is_same_v<date_type_t, DestType>>* = nullptr) {
+result<DestType, conversion_error> to(const timestamp_type_t &source, std::enable_if_t<std::is_same_v<date_type_t, DestType>>* = nullptr) {
   const std::time_t tt = std::chrono::system_clock::to_time_t(source);
 
   const std::tm* result = std::localtime(&tt);

include/matador/utils/default_type_traits.hpp

@@ -152,10 +152,10 @@ struct data_type_traits<time_type_t, void> {
 };
 
 template<>
-struct data_type_traits<timestamp, void> {
+struct data_type_traits<timestamp_type_t, void> {
   static basic_type type(std::size_t /*size*/) { return basic_type::DateTime; }
-  static void read_value(attribute_reader &reader, const char *id, size_t index, timestamp &value);
-  static void bind_value(attribute_writer &binder, size_t index, timestamp &value);
+  static void read_value(attribute_reader &reader, const char *id, size_t index, timestamp_type_t &value);
+  static void bind_value(attribute_writer &binder, size_t index, timestamp_type_t &value);
 };
 
 template<typename EnumType>

include/matador/utils/types.hpp

@@ -13,7 +13,7 @@ enum class basic_type : uint8_t;
 
 using byte = unsigned char;
 using blob_type_t = std::vector<byte>;
-using timestamp = std::chrono::system_clock::time_point;
+using timestamp_type_t = std::chrono::system_clock::time_point;
 
 struct date_type_t;
 struct time_type_t;
@@ -26,7 +26,7 @@ using database_type = std::variant<
   const char*,
   std::string,
   blob_type_t,
-  timestamp,
+  timestamp_type_t,
   date_type_t,
   time_type_t,
   nullptr_t>;