sascha
/
query
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

renamed sql_command enum names

This commit is contained in:
Sascha Kühl 2026-01-23 09:22:27 +01:00
parent d13ccc861e
commit 15f959b24e
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/matador/sql/query_context.hpp
View File

@ -8,22 +8,22 @@
namespace matador::sql { namespace matador::sql {
enum class sql_command { enum class sql_command {
SQL_UNKNOWN, Unknown,
SQL_CREATE, Create,
SQL_CREATE_TABLE, CreateTable,
SQL_CREATE_SCHEMA, CreateSchema,
SQL_CREATE_DATABASE, CreateDatabase,
SQL_UPDATE, Update,
SQL_INSERT, Insert,
SQL_DELETE, Delete,
SQL_SELECT, Select,
SQL_DROP, Drop,
SQL_DROP_TABLE, DropTable,
SQL_DROP_SCHEMA, DropSchema,
SQL_DROP_DATABASE, DropDatabase,
SQL_ALTER, Alter,
SQL_ALTER_TABLE, AlterTable,
SQL_ALTER_SCHEMA AlterSchema
}; };
struct sql_command_info { struct sql_command_info {

16
source/orm/query/query_builder.cpp
View File

@ -59,7 +59,7 @@ void query_builder::visit(internal::query_alter_part& part) {
} }
void query_builder::visit(internal::query_alter_table_part& part) { void query_builder::visit(internal::query_alter_table_part& part) {
query_.command = sql::sql_command::SQL_ALTER_TABLE; query_.command = sql::sql_command::AlterTable;
query_.sql += " " + dialect_->token_at(part.token()) + " " + query_.sql += " " + dialect_->token_at(part.token()) + " " +
dialect_->prepare_identifier_string(part.table().name()); dialect_->prepare_identifier_string(part.table().name());
} }
@ -102,7 +102,7 @@ void query_builder::visit(internal::query_drop_key_constraint_part_by_constraint
} }
void query_builder::visit(internal::query_select_part &part) { void query_builder::visit(internal::query_select_part &part) {
query_.command = sql::sql_command::SQL_SELECT; query_.command = sql::sql_command::Select;
query_.sql = dialect_->select() + " "; query_.sql = dialect_->select() + " ";
query_.prototype.clear(); query_.prototype.clear();
@ -212,7 +212,7 @@ void query_builder::visit(internal::query_limit_part &part) {
} }
void query_builder::visit(internal::query_insert_part &/*insert_part*/) { void query_builder::visit(internal::query_insert_part &/*insert_part*/) {
query_.command = sql::sql_command::SQL_INSERT; query_.command = sql::sql_command::Insert;
query_.sql = dialect_->insert(); query_.sql = dialect_->insert();
} }
@ -274,14 +274,14 @@ void query_builder::visit(internal::query_values_part &part) {
void query_builder::visit(internal::query_update_part &part) void query_builder::visit(internal::query_update_part &part)
{ {
query_.command = sql::sql_command::SQL_UPDATE; query_.command = sql::sql_command::Update;
query_.table_name = part.table().name(); query_.table_name = part.table().name();
query_.sql += query_builder::build_table_name(part.token(), *dialect_, query_.table_name); query_.sql += query_builder::build_table_name(part.token(), *dialect_, query_.table_name);
} }
void query_builder::visit(internal::query_delete_part &/*delete_part*/) void query_builder::visit(internal::query_delete_part &/*delete_part*/)
{ {
query_.command = sql::sql_command::SQL_DELETE; query_.command = sql::sql_command::Delete;
query_.sql = dialect_->remove(); query_.sql = dialect_->remove();
} }
@ -293,7 +293,7 @@ void query_builder::visit(internal::query_delete_from_part &part)
void query_builder::visit(internal::query_create_part &/*create_part*/) void query_builder::visit(internal::query_create_part &/*create_part*/)
{ {
query_.command = sql::sql_command::SQL_CREATE_TABLE; query_.command = sql::sql_command::CreateTable;
query_.sql = dialect_->create(); query_.sql = dialect_->create();
} }
@ -329,12 +329,12 @@ void query_builder::visit(internal::query_create_table_constraints_part& part) {
} }
void query_builder::visit( internal::query_create_schema_part& part ) { void query_builder::visit( internal::query_create_schema_part& part ) {
query_.command = sql::sql_command::SQL_CREATE_SCHEMA; query_.command = sql::sql_command::CreateSchema;
query_.sql += " " + dialect_->schema() + " " + dialect_->prepare_identifier_string(part.schema()); query_.sql += " " + dialect_->schema() + " " + dialect_->prepare_identifier_string(part.schema());
} }
void query_builder::visit(internal::query_drop_part &part) { void query_builder::visit(internal::query_drop_part &part) {
query_.command = sql::sql_command::SQL_DROP_TABLE; query_.command = sql::sql_command::DropTable;
query_.sql = dialect_->token_at(part.token()); query_.sql = dialect_->token_at(part.token());
} }

2
source/orm/sql/connection.cpp
View File

@ -238,7 +238,7 @@ std::shared_ptr<class producer_resolver_factory> connection::resolver_factory()
} }
utils::result<std::unique_ptr<statement_impl>, utils::error> connection::perform_prepare(const query_context& ctx) const { utils::result<std::unique_ptr<statement_impl>, utils::error> connection::perform_prepare(const query_context& ctx) const {
if (ctx.command != sql_command::SQL_CREATE_TABLE && (ctx.prototype.empty() || has_unknown_columns(ctx.prototype))) { if (ctx.command != sql_command::CreateTable && (ctx.prototype.empty() || has_unknown_columns(ctx.prototype))) {
if (const auto result = describe(ctx.table_name); result.is_ok()) { if (const auto result = describe(ctx.table_name); result.is_ok()) {
for (auto &col: ctx.prototype) { for (auto &col: ctx.prototype) {
const auto rit = std::find_if( const auto rit = std::find_if(