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
+26 -26
View File
@@ -154,61 +154,61 @@ utils::result<size_t, utils::error> postgres_connection::execute(const std::stri
utils::basic_type oid2type(const Oid oid) {
switch (oid) {
case 16:
return utils::basic_type::type_bool;
return utils::basic_type::Boolean;
case 17:
return utils::basic_type::type_blob;
return utils::basic_type::Blob;
case 18:
return utils::basic_type::type_int8;
return utils::basic_type::Int8;
case 21:
return utils::basic_type::type_int16;
return utils::basic_type::Int16;
case 23:
return utils::basic_type::type_int32;
return utils::basic_type::Int32;
case 20:
return utils::basic_type::type_int64;
return utils::basic_type::Int64;
case 25:
return utils::basic_type::type_text;
return utils::basic_type::Text;
case 1043:
return utils::basic_type::type_varchar;
return utils::basic_type::Varchar;
case 700:
return utils::basic_type::type_float;
return utils::basic_type::Float;
case 701:
return utils::basic_type::type_double;
return utils::basic_type::Double;
case 1082:
return utils::basic_type::type_date;
return utils::basic_type::Date;
case 1114:
return utils::basic_type::type_time;
return utils::basic_type::Time;
default:
return utils::basic_type::type_null;
return utils::basic_type::Null;
}
}
utils::basic_type string2type(const char *type) {
if (strcmp(type, "int2") == 0) {
return utils::basic_type::type_int16;
return utils::basic_type::Int16;
} else if (strcmp(type, "int4") == 0) {
return utils::basic_type::type_int32;
return utils::basic_type::Int32;
} else if (strcmp(type, "int8") == 0) {
return utils::basic_type::type_int64;
return utils::basic_type::Int64;
} else if (strcmp(type, "bool") == 0) {
return utils::basic_type::type_bool;
return utils::basic_type::Boolean;
} else if (strcmp(type, "date") == 0) {
return utils::basic_type::type_date;
return utils::basic_type::Date;
} else if (strcmp(type, "timestamp") == 0) {
return utils::basic_type::type_time;
return utils::basic_type::Time;
} else if (strcmp(type, "float4") == 0) {
return utils::basic_type::type_float;
return utils::basic_type::Float;
} else if (strcmp(type, "float8") == 0) {
return utils::basic_type::type_double;
return utils::basic_type::Double;
} else if (strncmp(type, "varchar", 7) == 0) {
return utils::basic_type::type_varchar;
return utils::basic_type::Varchar;
} else if (strcmp(type, "character varying") == 0) {
return utils::basic_type::type_varchar;
return utils::basic_type::Varchar;
} else if (strcmp(type, "text") == 0) {
return utils::basic_type::type_text;
return utils::basic_type::Text;
} else if (strcmp(type, "bytea") == 0) {
return utils::basic_type::type_blob;
return utils::basic_type::Blob;
} else {
return utils::basic_type::type_null;
return utils::basic_type::Null;
}
}
+6 -6
View File
@@ -16,12 +16,12 @@
{dialect_token::BeginBinaryData, "'\\x"}
})
.with_data_type_replace_map({
{matador::utils::basic_type::type_int8, "SMALLINT"},
{matador::utils::basic_type::type_uint8, "SMALLINT"},
{matador::utils::basic_type::type_float, "REAL"},
{matador::utils::basic_type::type_double, "DOUBLE PRECISION"},
{matador::utils::basic_type::type_time, "TIMESTAMP"},
{matador::utils::basic_type::type_blob, "BYTEA"}
{matador::utils::basic_type::Int8, "SMALLINT"},
{matador::utils::basic_type::UInt8, "SMALLINT"},
{matador::utils::basic_type::Float, "REAL"},
{matador::utils::basic_type::Double, "DOUBLE PRECISION"},
{matador::utils::basic_type::Time, "TIMESTAMP"},
{matador::utils::basic_type::Blob, "BYTEA"}
})
.with_bool_strings("TRUE", "FALSE")
.with_default_schema_name("public")
@@ -172,41 +172,41 @@ void set_value<utils::blob>(const char* str, utils::value& value) {
void postgres_result_reader::read_value(const char * /*id*/, const size_t index, utils::value &val, size_t) {
switch (val.type()) {
case utils::basic_type::type_int8:
case utils::basic_type::Int8:
set_value<int8_t>(column(index), val);
break;
case utils::basic_type::type_int16:
case utils::basic_type::Int16:
set_value<int16_t>(column(index), val);
break;
case utils::basic_type::type_int32:
case utils::basic_type::Int32:
set_value<int32_t>(column(index), val);
break;
case utils::basic_type::type_int64:
case utils::basic_type::Int64:
set_value<int64_t>(column(index), val);
break;
case utils::basic_type::type_uint8:
case utils::basic_type::UInt8:
set_value<uint8_t>(column(index), val);
break;
case utils::basic_type::type_uint16:
case utils::basic_type::UInt16:
set_value<uint16_t>(column(index), val);
break;
case utils::basic_type::type_uint32:
case utils::basic_type::UInt32:
set_value<uint32_t>(column(index), val);
break;
case utils::basic_type::type_uint64:
case utils::basic_type::UInt64:
set_value<uint64_t>(column(index), val);
break;
case utils::basic_type::type_float:
case utils::basic_type::Float:
set_value<float>(column(index), val);
break;
case utils::basic_type::type_double:
case utils::basic_type::Double:
set_value<double>(column(index), val);
break;
case utils::basic_type::type_bool:
case utils::basic_type::Boolean:
set_value<bool>(column(index), val);
break;
case utils::basic_type::type_text:
case utils::basic_type::type_varchar: {
case utils::basic_type::Text:
case utils::basic_type::Varchar: {
if (const auto *column_value = column(index); column_value == nullptr) {
val = std::string{};
} else {
@@ -214,16 +214,16 @@ void postgres_result_reader::read_value(const char * /*id*/, const size_t index,
}
break;
}
case utils::basic_type::type_time:
case utils::basic_type::type_date: {
case utils::basic_type::Time:
case utils::basic_type::Date: {
val = std::string{column(index)};
break;
}
case utils::basic_type::type_null: {
case utils::basic_type::Null: {
val = nullptr_t{};
break;
}
case utils::basic_type::type_blob: {
case utils::basic_type::Blob: {
set_value<utils::blob>(column(index), val);
break;
}