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

use raw pointer of table in class column (progress, needs fixes in tests)

Browse Source
This commit is contained in:
Sascha Kühl
2025-12-15 17:31:43 +01:00
parent 9418f28348
commit 4a19322ef8
5 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/matador/orm/session_query_builder.hpp
+12 -12
View File
@@ -135,8 +135,8 @@ public:
}
append_join(
query::column{table_info_stack_.top().table, table_info_stack_.top().info.get().primary_key_attribute()->name()},
query::column{next->second, join_column}
query::column{table_info_stack_.top().table.get(), table_info_stack_.top().info.get().primary_key_attribute()->name()},
query::column{next->second.get(), join_column}
);
}
}
@@ -172,12 +172,12 @@ public:
}
append_join(
query::column{table_info_stack_.top().table, table_info_stack_.top().info.get().primary_key_attribute()->name()},
query::column{relation->second, join_column}
query::column{table_info_stack_.top().table.get(), table_info_stack_.top().info.get().primary_key_attribute()->name()},
query::column{relation->second.get(), join_column}
);
append_join(
query::column{relation->second, inverse_join_column},
query::column{next->second, info.primary_key_attribute()->name()}
query::column{relation->second.get(), inverse_join_column},
query::column{next->second.get(), info.primary_key_attribute()->name()}
);
}
@@ -214,12 +214,12 @@ public:
const auto join_columns = join_columns_collector_.collect<typename ContainerType::value_type::value_type>();
append_join(
query::column{table_info_stack_.top().table, table_info_stack_.top().info.get().primary_key_attribute()->name()},
query::column{relation->second, join_columns.inverse_join_column}
query::column{table_info_stack_.top().table.get(), table_info_stack_.top().info.get().primary_key_attribute()->name()},
query::column{relation->second.get(), join_columns.inverse_join_column}
);
append_join(
query::column{relation->second, join_columns.join_column},
query::column{next->second, info.primary_key_attribute()->name()}
query::column{relation->second.get(), join_columns.join_column},
query::column{next->second.get(), info.primary_key_attribute()->name()}
);
}
@@ -271,8 +271,8 @@ void session_query_builder::on_foreign_object(const char *id, Pointer &, const u
table_info_stack_.pop();
append_join(
query::column{table_info_stack_.top().table, id},
query::column{next->second, info->get().primary_key_attribute()->name()}
query::column{table_info_stack_.top().table.get(), id},
query::column{next->second.get(), info->get().primary_key_attribute()->name()}
);
} else {
push(id);