renamed basic_types enumerations

This commit is contained in:
2025-12-08 20:04:04 +01:00
parent d4ef97ef5a
commit 108eca4e53
26 changed files with 302 additions and 302 deletions
+1 -1
View File
@@ -70,7 +70,7 @@ private:
std::string name_;
object *owner_{nullptr};
utils::basic_type type_{utils::basic_type::type_null};
utils::basic_type type_{utils::basic_type::Null};
utils::field_attributes options_{};
null_option_type null_option_{null_option_type::NotNull};
};
+17 -17
View File
@@ -243,23 +243,23 @@ private:
};
data_type_to_string_map data_types_ {
{utils::basic_type::type_int8, "TINYINT"},
{utils::basic_type::type_int16, "SMALLINT"},
{utils::basic_type::type_int32, "INTEGER"},
{utils::basic_type::type_int64, "BIGINT"},
{utils::basic_type::type_uint8, "TINYINT"},
{utils::basic_type::type_uint16, "INTEGER"},
{utils::basic_type::type_uint32, "BIGINT"},
{utils::basic_type::type_uint64, "BIGINT"},
{utils::basic_type::type_float, "FLOAT"},
{utils::basic_type::type_double, "DOUBLE"},
{utils::basic_type::type_bool, "BOOLEAN"},
{utils::basic_type::type_varchar, "VARCHAR"},
{utils::basic_type::type_text, "TEXT"},
{utils::basic_type::type_date, "DATE"},
{utils::basic_type::type_time, "DATETIME"},
{utils::basic_type::type_blob, "BLOB"},
{utils::basic_type::type_null, "NULL"}
{utils::basic_type::Int8, "TINYINT"},
{utils::basic_type::Int16, "SMALLINT"},
{utils::basic_type::Int32, "INTEGER"},
{utils::basic_type::Int64, "BIGINT"},
{utils::basic_type::UInt8, "TINYINT"},
{utils::basic_type::UInt16, "INTEGER"},
{utils::basic_type::UInt32, "BIGINT"},
{utils::basic_type::UInt64, "BIGINT"},
{utils::basic_type::Float, "FLOAT"},
{utils::basic_type::Double, "DOUBLE"},
{utils::basic_type::Boolean, "BOOLEAN"},
{utils::basic_type::Varchar, "VARCHAR"},
{utils::basic_type::Text, "TEXT"},
{utils::basic_type::Date, "DATE"},
{utils::basic_type::Time, "DATETIME"},
{utils::basic_type::Blob, "BLOB"},
{utils::basic_type::Null, "NULL"}
};
sql_func_to_string_map sql_func_map_ {
+18 -18
View File
@@ -9,24 +9,24 @@ namespace matador::utils {
* @brief Enumeration type of all supported basic data types
*/
enum class basic_type : uint8_t {
type_int8 = 0, /*!< Data type int8 */
type_int16, /*!< Data type int16 */
type_int32, /*!< Data type int32 */
type_int64, /*!< Data type int64 */
type_uint8, /*!< Data type unsigned int8 */
type_uint16, /*!< Data type unsigned int16 */
type_uint32, /*!< Data type unsigned int32 */
type_uint64, /*!< Data type unsigned int64 */
type_float, /*!< Data type float */
type_double, /*!< Data type double */
type_bool, /*!< Data type bool */
type_varchar, /*!< Data type varchar */
type_text, /*!< Data type text */
type_date, /*!< Data type date */
type_time, /*!< Data type time */
type_blob, /*!< Data type blob */
type_null, /*!< Data type null */
type_unknown /*!< Data type unknown */
Int8 = 0, /*!< Data type int8 */
Int16, /*!< Data type int16 */
Int32, /*!< Data type int32 */
Int64, /*!< Data type int64 */
UInt8, /*!< Data type unsigned int8 */
UInt16, /*!< Data type unsigned int16 */
UInt32, /*!< Data type unsigned int32 */
UInt64, /*!< Data type unsigned int64 */
Float, /*!< Data type float */
Double, /*!< Data type double */
Boolean, /*!< Data type bool */
Varchar, /*!< Data type varchar */
Text, /*!< Data type text */
Date, /*!< Data type date */
Time, /*!< Data type time */
Blob, /*!< Data type blob */
Null, /*!< Data type null */
Unknown /*!< Data type unknown */
};
}
+1 -1
View File
@@ -20,7 +20,7 @@ class attribute_writer;
*/
template < class Type, class Enable = void >
struct data_type_traits {
static basic_type type(std::size_t /*size*/) { return basic_type::type_unknown; }
static basic_type type(std::size_t /*size*/) { return basic_type::Unknown; }
static void read_value(attribute_reader &/*reader*/, const char *id, size_t index, nullptr_t &/*value*/, size_t /*size*/ = 0) {}
static void bind_value(attribute_writer &/*binder*/, size_t index, nullptr_t &/*value*/, size_t /*size*/ = 0) {}
};
+18 -18
View File
@@ -12,105 +12,105 @@ namespace matador::utils {
/// @cond MATADOR_DEV
template <> struct data_type_traits<nullptr_t, void>
{
static basic_type type(std::size_t /*size*/) { return basic_type::type_null; }
static basic_type type(std::size_t /*size*/) { return basic_type::Null; }
static void read_value(attribute_reader &reader, const char *id, size_t index, nullptr_t &/*value*/, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, nullptr_t &/*value*/, size_t /*size*/ = 0);
};
template <> struct data_type_traits<int8_t, void>
{
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::type_int8; }
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::Int8; }
static void read_value(attribute_reader &reader, const char *id, size_t index, int8_t &value, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, const int8_t &value, size_t /*size*/ = 0);
};
template <> struct data_type_traits<int16_t, void>
{
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::type_int16; }
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::Int16; }
static void read_value(attribute_reader &reader, const char *id, size_t index, int16_t &value, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, const int16_t &value, size_t /*size*/ = 0);
};
template <> struct data_type_traits<int32_t, void>
{
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::type_int32; }
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::Int32; }
static void read_value(attribute_reader &reader, const char *id, size_t index, int32_t &value, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, const int32_t &value, size_t /*size*/ = 0);
};
template <> struct data_type_traits<int64_t, void>
{
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::type_int64; }
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::Int64; }
static void read_value(attribute_reader &reader, const char *id, size_t index, int64_t &value, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, const int64_t &value, size_t /*size*/ = 0);
};
template <> struct data_type_traits<uint8_t, void>
{
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::type_uint8; }
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::UInt8; }
static void read_value(attribute_reader &reader, const char *id, size_t index, uint8_t &value, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, const uint8_t &value, size_t /*size*/ = 0);
};
template <> struct data_type_traits<uint16_t, void>
{
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::type_uint16; }
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::UInt16; }
static void read_value(attribute_reader &reader, const char *id, size_t index, uint16_t &value, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, const uint16_t &value, size_t /*size*/ = 0);
};
template <> struct data_type_traits<uint32_t, void>
{
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::type_uint32; }
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::UInt32; }
static void read_value(attribute_reader &reader, const char *id, size_t index, uint32_t &value, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, const uint32_t &value, size_t /*size*/ = 0);
};
template <> struct data_type_traits<uint64_t, void>
{
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::type_uint64; }
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::UInt64; }
static void read_value(attribute_reader &reader, const char *id, size_t index, uint64_t &value, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, const uint64_t &value, size_t /*size*/ = 0);
};
template <> struct data_type_traits<bool, void>
{
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::type_bool; }
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::Boolean; }
static void read_value(attribute_reader &reader, const char *id, size_t index, bool &value, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, const bool &value, size_t /*size*/ = 0);
};
template <> struct data_type_traits<float, void>
{
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::type_float; }
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::Float; }
static void read_value(attribute_reader &reader, const char *id, size_t index, float &value, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, const float &value, size_t /*size*/ = 0);
};
template <> struct data_type_traits<double, void>
{
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::type_double; }
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::Double; }
static void read_value(attribute_reader &reader, const char *id, size_t index, double &value, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, const double &value, size_t /*size*/ = 0);
};
template <> struct data_type_traits<const char*, void>
{
static basic_type type(const std::size_t size) { return size == 0 ? basic_type::type_text : basic_type::type_varchar; }
static basic_type type(const std::size_t size) { return size == 0 ? basic_type::Text : basic_type::Varchar; }
static void read_value(attribute_reader &reader, const char *id, size_t index, const char* value, size_t size);
static void bind_value(attribute_writer &binder, size_t index, const char *value, size_t size = 0);
};
template <> struct data_type_traits<char*, void>
{
static basic_type type(const std::size_t size) { return size == 0 ? basic_type::type_text : basic_type::type_varchar; }
static basic_type type(const std::size_t size) { return size == 0 ? basic_type::Text : basic_type::Varchar; }
static void read_value(attribute_reader &reader, const char *id, size_t index, char *value, size_t size);
static void bind_value(attribute_writer &binder, size_t index, const char *value, size_t size = 0);
};
template <> struct data_type_traits<char[], void>
{
static basic_type type(const std::size_t size) { return size == 0 ? basic_type::type_text : basic_type::type_varchar; }
static basic_type type(const std::size_t size) { return size == 0 ? basic_type::Text : basic_type::Varchar; }
template < int N >
static void read_value(attribute_reader &reader, const char *id, const size_t index, char (&value)[N], const size_t size) {
data_type_traits<const char*>::read_value(reader, id, index, value, size);
@@ -123,14 +123,14 @@ template <> struct data_type_traits<char[], void>
template <> struct data_type_traits<std::string, void>
{
static basic_type type(const std::size_t size) { return size == 0 ? basic_type::type_text : basic_type::type_varchar; }
static basic_type type(const std::size_t size) { return size == 0 ? basic_type::Text : basic_type::Varchar; }
static void read_value(attribute_reader &reader, const char *id, size_t index, std::string &value, size_t size);
static void bind_value(attribute_writer &binder, size_t index, std::string &value, size_t size = 0);
};
template <> struct data_type_traits<utils::blob, void>
{
static basic_type type(std::size_t /*size*/) { return basic_type::type_blob; }
static basic_type type(std::size_t /*size*/) { return basic_type::Blob; }
static void read_value(attribute_reader &reader, const char *id, size_t index, utils::blob &value, size_t /*size*/ = 0);
static void bind_value(attribute_writer &binder, size_t index, utils::blob &value, size_t /*size*/ = 0);
};
@@ -152,7 +152,7 @@ template <> struct data_type_traits<utils::blob, void>
template < typename EnumType >
struct data_type_traits<EnumType, std::enable_if_t<std::is_enum_v<EnumType>>>
{
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::type_int32; }
static basic_type type(std::size_t /*size*/ = 0) { return basic_type::Int32; }
static void read_value(attribute_reader &reader, const char *id, const size_t index, EnumType &value, const size_t size = 0) {
data_type_traits<int>::read_value(reader, id, index, reinterpret_cast<int&>(value), size);
}
+1 -1
View File
@@ -89,7 +89,7 @@ private:
[[nodiscard]] virtual size_t hash() const = 0;
std::type_index type_index_;
basic_type type_{basic_type::type_null};
basic_type type_{basic_type::Null};
};
template<class IdType>
+1 -1
View File
@@ -80,7 +80,7 @@ public:
private:
utils::database_type value_;
size_t size_{};
basic_type type_{basic_type::type_null};
basic_type type_{basic_type::Null};
};