renamed basic_types enumerations
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
|
||||
namespace matador::object {
|
||||
attribute::attribute(std::string name)
|
||||
: attribute(std::move(name), utils::basic_type::type_null, {}, null_option_type::NotNull) {
|
||||
: attribute(std::move(name), utils::basic_type::Null, {}, null_option_type::NotNull) {
|
||||
}
|
||||
|
||||
attribute::attribute(std::string name,
|
||||
@@ -57,39 +57,39 @@ void attribute::change_type(const utils::basic_type type, const utils::field_att
|
||||
}
|
||||
|
||||
bool attribute::is_integer() const {
|
||||
return type_ >= utils::basic_type::type_int8 && type_ <= utils::basic_type::type_uint64;
|
||||
return type_ >= utils::basic_type::Int8 && type_ <= utils::basic_type::UInt64;
|
||||
}
|
||||
|
||||
bool attribute::is_floating_point() const {
|
||||
return type_ == utils::basic_type::type_float || type_ == utils::basic_type::type_double;
|
||||
return type_ == utils::basic_type::Float || type_ == utils::basic_type::Double;
|
||||
}
|
||||
|
||||
bool attribute::is_bool() const {
|
||||
return type_ == utils::basic_type::type_bool;
|
||||
return type_ == utils::basic_type::Boolean;
|
||||
}
|
||||
|
||||
bool attribute::is_string() const {
|
||||
return type_ == utils::basic_type::type_text;
|
||||
return type_ == utils::basic_type::Text;
|
||||
}
|
||||
|
||||
bool attribute::is_varchar() const {
|
||||
return type_ == utils::basic_type::type_varchar;
|
||||
return type_ == utils::basic_type::Varchar;
|
||||
}
|
||||
|
||||
bool attribute::is_date() const {
|
||||
return type_ == utils::basic_type::type_date;
|
||||
return type_ == utils::basic_type::Date;
|
||||
}
|
||||
|
||||
bool attribute::is_time() const {
|
||||
return type_ == utils::basic_type::type_time;
|
||||
return type_ == utils::basic_type::Time;
|
||||
}
|
||||
|
||||
bool attribute::is_blob() const {
|
||||
return type_ == utils::basic_type::type_blob;
|
||||
return type_ == utils::basic_type::Blob;
|
||||
}
|
||||
|
||||
bool attribute::is_null() const {
|
||||
return type_ == utils::basic_type::type_null;
|
||||
return type_ == utils::basic_type::Null;
|
||||
}
|
||||
|
||||
std::ostream & operator<<(std::ostream &os, const attribute &attr) {
|
||||
|
||||
@@ -23,7 +23,7 @@ identifier::base::base(const std::type_index &ti, const basic_type type)
|
||||
{}
|
||||
|
||||
identifier::null_pk::null_pk()
|
||||
: base(std::type_index(typeid(null_type_t)), basic_type::type_null)
|
||||
: base(std::type_index(typeid(null_type_t)), basic_type::Null)
|
||||
{}
|
||||
|
||||
identifier::base* identifier::null_pk::copy() const
|
||||
@@ -134,31 +134,31 @@ size_t identifier::use_count() const
|
||||
}
|
||||
|
||||
bool identifier::is_integer() const {
|
||||
return id_->type_ >= basic_type::type_int8 && id_->type_ <= basic_type::type_uint64;
|
||||
return id_->type_ >= basic_type::Int8 && id_->type_ <= basic_type::UInt64;
|
||||
}
|
||||
|
||||
bool identifier::is_floating_point() const {
|
||||
return id_->type_ == basic_type::type_float || id_->type_ == basic_type::type_double;
|
||||
return id_->type_ == basic_type::Float || id_->type_ == basic_type::Double;
|
||||
}
|
||||
|
||||
bool identifier::is_bool() const {
|
||||
return id_->type_ == basic_type::type_bool;
|
||||
return id_->type_ == basic_type::Boolean;
|
||||
}
|
||||
|
||||
bool identifier::is_varchar() const {
|
||||
return id_->type_ == basic_type::type_varchar;
|
||||
return id_->type_ == basic_type::Varchar;
|
||||
}
|
||||
|
||||
bool identifier::is_date() const {
|
||||
return id_->type_ == basic_type::type_date;
|
||||
return id_->type_ == basic_type::Date;
|
||||
}
|
||||
|
||||
bool identifier::is_time() const {
|
||||
return id_->type_ == basic_type::type_time;
|
||||
return id_->type_ == basic_type::Time;
|
||||
}
|
||||
|
||||
bool identifier::is_blob() const {
|
||||
return id_->type_ == basic_type::type_blob;
|
||||
return id_->type_ == basic_type::Blob;
|
||||
}
|
||||
|
||||
bool identifier::is_null() const
|
||||
|
||||
+14
-14
@@ -6,41 +6,41 @@ namespace matador::utils {
|
||||
void initialize_by_basic_type(const basic_type type, database_type &val)
|
||||
{
|
||||
switch (type) {
|
||||
case basic_type::type_int8:
|
||||
case basic_type::Int8:
|
||||
val.emplace<int8_t>();
|
||||
break;
|
||||
case basic_type::type_int16:
|
||||
case basic_type::Int16:
|
||||
val.emplace<int16_t>();
|
||||
break;
|
||||
case basic_type::type_int32:
|
||||
case basic_type::Int32:
|
||||
val.emplace<int32_t>();
|
||||
break;
|
||||
case basic_type::type_int64:
|
||||
case basic_type::Int64:
|
||||
val.emplace<int64_t>();
|
||||
break;
|
||||
case basic_type::type_uint8:
|
||||
case basic_type::UInt8:
|
||||
val.emplace<uint8_t>();
|
||||
break;
|
||||
case basic_type::type_uint16:
|
||||
case basic_type::UInt16:
|
||||
val.emplace<uint16_t>();
|
||||
break;
|
||||
case basic_type::type_uint32:
|
||||
case basic_type::UInt32:
|
||||
val.emplace<uint32_t>();
|
||||
break;
|
||||
case basic_type::type_uint64:
|
||||
case basic_type::UInt64:
|
||||
val.emplace<uint64_t>();
|
||||
break;
|
||||
case basic_type::type_bool:
|
||||
case basic_type::Boolean:
|
||||
val.emplace<bool>();
|
||||
break;
|
||||
case basic_type::type_float:
|
||||
case basic_type::Float:
|
||||
val.emplace<float>();
|
||||
break;
|
||||
case basic_type::type_double:
|
||||
case basic_type::Double:
|
||||
val.emplace<double>();
|
||||
break;
|
||||
case basic_type::type_varchar:
|
||||
case basic_type::type_text:
|
||||
case basic_type::Varchar:
|
||||
case basic_type::Text:
|
||||
val.emplace<std::string>();
|
||||
break;
|
||||
// case basic_type::type_date:
|
||||
@@ -49,7 +49,7 @@ void initialize_by_basic_type(const basic_type type, database_type &val)
|
||||
// case basic_type::type_time:
|
||||
// val.emplace<time>();
|
||||
// break;
|
||||
case basic_type::type_blob:
|
||||
case basic_type::Blob:
|
||||
val.emplace<utils::blob>();
|
||||
break;
|
||||
default:
|
||||
|
||||
+25
-25
@@ -32,7 +32,7 @@ value::value(value &&x) noexcept
|
||||
, type_(x.type_)
|
||||
{
|
||||
x.value_ = nullptr;
|
||||
x.type_ = basic_type::type_null;
|
||||
x.type_ = basic_type::Null;
|
||||
}
|
||||
|
||||
value &value::operator=(value &&x) noexcept
|
||||
@@ -40,7 +40,7 @@ value &value::operator=(value &&x) noexcept
|
||||
value_ = std::move(x.value_);
|
||||
type_ = x.type_;
|
||||
x.value_ = nullptr;
|
||||
x.type_ = basic_type::type_null;
|
||||
x.type_ = basic_type::Null;
|
||||
|
||||
return *this;
|
||||
}
|
||||
@@ -66,87 +66,87 @@ void value::type(const basic_type t) {
|
||||
|
||||
bool value::is_integer() const
|
||||
{
|
||||
return type_ >= basic_type::type_int8 && type_ <= basic_type::type_uint64;
|
||||
return type_ >= basic_type::Int8 && type_ <= basic_type::UInt64;
|
||||
}
|
||||
|
||||
bool value::is_floating_point() const
|
||||
{
|
||||
return type_ == basic_type::type_float || type_ == basic_type::type_double;
|
||||
return type_ == basic_type::Float || type_ == basic_type::Double;
|
||||
}
|
||||
|
||||
bool value::is_bool() const
|
||||
{
|
||||
return type_ == basic_type::type_bool;
|
||||
return type_ == basic_type::Boolean;
|
||||
}
|
||||
|
||||
bool value::is_string() const
|
||||
{
|
||||
return type_ == basic_type::type_text;
|
||||
return type_ == basic_type::Text;
|
||||
}
|
||||
|
||||
bool value::is_varchar() const
|
||||
{
|
||||
return type_ == basic_type::type_varchar;
|
||||
return type_ == basic_type::Varchar;
|
||||
}
|
||||
|
||||
bool value::is_date() const
|
||||
{
|
||||
return type_ == basic_type::type_date;
|
||||
return type_ == basic_type::Date;
|
||||
}
|
||||
|
||||
bool value::is_time() const
|
||||
{
|
||||
return type_ == basic_type::type_time;
|
||||
return type_ == basic_type::Time;
|
||||
}
|
||||
|
||||
bool value::is_blob() const
|
||||
{
|
||||
return type_ == basic_type::type_blob;
|
||||
return type_ == basic_type::Blob;
|
||||
}
|
||||
|
||||
bool value::is_null() const
|
||||
{
|
||||
return type_ == basic_type::type_null;
|
||||
return type_ == basic_type::Null;
|
||||
}
|
||||
|
||||
namespace detail {
|
||||
void initialize_by_basic_type(const basic_type type, database_type &val) {
|
||||
switch (type) {
|
||||
case basic_type::type_int8:
|
||||
case basic_type::Int8:
|
||||
val.emplace<int8_t>();
|
||||
break;
|
||||
case basic_type::type_int16:
|
||||
case basic_type::Int16:
|
||||
val.emplace<int16_t>();
|
||||
break;
|
||||
case basic_type::type_int32:
|
||||
case basic_type::Int32:
|
||||
val.emplace<int32_t>();
|
||||
break;
|
||||
case basic_type::type_int64:
|
||||
case basic_type::Int64:
|
||||
val.emplace<int64_t>();
|
||||
break;
|
||||
case basic_type::type_uint8:
|
||||
case basic_type::UInt8:
|
||||
val.emplace<uint8_t>();
|
||||
break;
|
||||
case basic_type::type_uint16:
|
||||
case basic_type::UInt16:
|
||||
val.emplace<uint16_t>();
|
||||
break;
|
||||
case basic_type::type_uint32:
|
||||
case basic_type::UInt32:
|
||||
val.emplace<uint32_t>();
|
||||
break;
|
||||
case basic_type::type_uint64:
|
||||
case basic_type::UInt64:
|
||||
val.emplace<uint64_t>();
|
||||
break;
|
||||
case basic_type::type_bool:
|
||||
case basic_type::Boolean:
|
||||
val.emplace<bool>();
|
||||
break;
|
||||
case basic_type::type_float:
|
||||
case basic_type::Float:
|
||||
val.emplace<float>();
|
||||
break;
|
||||
case basic_type::type_double:
|
||||
case basic_type::Double:
|
||||
val.emplace<double>();
|
||||
break;
|
||||
case basic_type::type_varchar:
|
||||
case basic_type::type_text:
|
||||
case basic_type::Varchar:
|
||||
case basic_type::Text:
|
||||
val.emplace<std::string>();
|
||||
break;
|
||||
// case basic_type::type_date:
|
||||
@@ -155,7 +155,7 @@ void initialize_by_basic_type(const basic_type type, database_type &val) {
|
||||
// case basic_type::type_time:
|
||||
// val.emplace<time>();
|
||||
// break;
|
||||
case basic_type::type_blob:
|
||||
case basic_type::Blob:
|
||||
val.emplace<utils::blob>();
|
||||
break;
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user