Skip to content

Commit 37aa68e

Browse files
Pierre-Luc Gagnéclaude
andcommitted
style: apply clang-format to all new code
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 85202ba commit 37aa68e

8 files changed

Lines changed: 107 additions & 87 deletions

File tree

lib/include/ds_mysql/column_field_base_core.hpp

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,32 @@ inline constexpr set_null_t set_null{};
147147
inline constexpr no_action_t no_action{};
148148

149149
// on_delete(action) — intermediate composable style
150-
constexpr on_delete_cascade on_delete(cascade_t) { return {}; }
151-
constexpr on_delete_restrict on_delete(restrict_t) { return {}; }
152-
constexpr on_delete_set_null on_delete(set_null_t) { return {}; }
153-
constexpr on_delete_no_action on_delete(no_action_t) { return {}; }
150+
constexpr on_delete_cascade on_delete(cascade_t) {
151+
return {};
152+
}
153+
constexpr on_delete_restrict on_delete(restrict_t) {
154+
return {};
155+
}
156+
constexpr on_delete_set_null on_delete(set_null_t) {
157+
return {};
158+
}
159+
constexpr on_delete_no_action on_delete(no_action_t) {
160+
return {};
161+
}
154162

155163
// on_update(action) — intermediate composable style
156-
constexpr on_update_cascade on_update(cascade_t) { return {}; }
157-
constexpr on_update_restrict on_update(restrict_t) { return {}; }
158-
constexpr on_update_set_null on_update(set_null_t) { return {}; }
159-
constexpr on_update_no_action on_update(no_action_t) { return {}; }
164+
constexpr on_update_cascade on_update(cascade_t) {
165+
return {};
166+
}
167+
constexpr on_update_restrict on_update(restrict_t) {
168+
return {};
169+
}
170+
constexpr on_update_set_null on_update(set_null_t) {
171+
return {};
172+
}
173+
constexpr on_update_no_action on_update(no_action_t) {
174+
return {};
175+
}
160176

161177
// Descriptors for fully composable on(delete_(...)) / on(update_(...)) style
162178
template <typename Action>
@@ -165,15 +181,31 @@ struct delete_action {};
165181
template <typename Action>
166182
struct update_action {};
167183

168-
constexpr delete_action<cascade_t> delete_(cascade_t) { return {}; }
169-
constexpr delete_action<restrict_t> delete_(restrict_t) { return {}; }
170-
constexpr delete_action<set_null_t> delete_(set_null_t) { return {}; }
171-
constexpr delete_action<no_action_t> delete_(no_action_t) { return {}; }
184+
constexpr delete_action<cascade_t> delete_(cascade_t) {
185+
return {};
186+
}
187+
constexpr delete_action<restrict_t> delete_(restrict_t) {
188+
return {};
189+
}
190+
constexpr delete_action<set_null_t> delete_(set_null_t) {
191+
return {};
192+
}
193+
constexpr delete_action<no_action_t> delete_(no_action_t) {
194+
return {};
195+
}
172196

173-
constexpr update_action<cascade_t> update_(cascade_t) { return {}; }
174-
constexpr update_action<restrict_t> update_(restrict_t) { return {}; }
175-
constexpr update_action<set_null_t> update_(set_null_t) { return {}; }
176-
constexpr update_action<no_action_t> update_(no_action_t) { return {}; }
197+
constexpr update_action<cascade_t> update_(cascade_t) {
198+
return {};
199+
}
200+
constexpr update_action<restrict_t> update_(restrict_t) {
201+
return {};
202+
}
203+
constexpr update_action<set_null_t> update_(set_null_t) {
204+
return {};
205+
}
206+
constexpr update_action<no_action_t> update_(no_action_t) {
207+
return {};
208+
}
177209

178210
// on(delete_action<A>) / on(update_action<A>) — dispatch to flat types
179211
template <typename A>

lib/include/ds_mysql/connection_pool.hpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ class connection_pool {
9797
~connection_pool() = default;
9898

9999
/// Create a pool with `pool_size` connections using the given config.
100-
[[nodiscard]] static std::expected<std::unique_ptr<connection_pool>, std::string> create(
101-
mysql_config const& config, std::size_t pool_size) {
100+
[[nodiscard]] static std::expected<std::unique_ptr<connection_pool>, std::string> create(mysql_config const& config,
101+
std::size_t pool_size) {
102102
return create_impl(config, pool_size, nullptr);
103103
}
104104

@@ -111,7 +111,9 @@ class connection_pool {
111111
/// Acquire a connection from the pool (blocks until one is available).
112112
[[nodiscard]] pooled_connection acquire() {
113113
std::unique_lock lock(mutex_);
114-
cv_.wait(lock, [this] { return !pool_.empty(); });
114+
cv_.wait(lock, [this] {
115+
return !pool_.empty();
116+
});
115117
auto conn = std::move(pool_.front());
116118
pool_.pop();
117119
return pooled_connection{this, std::move(conn)};

lib/include/ds_mysql/mysql_connection.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,7 @@ class mysql_connection {
452452

453453
// Open a server-side cursor from a typed query builder with prefetch hint.
454454
template <typename RowType, SqlBuilder Stmt, typename... Params>
455-
[[nodiscard]] std::expected<server_cursor<RowType>, std::string> open_cursor(Stmt const& stmt,
456-
prefetch_rows hint,
455+
[[nodiscard]] std::expected<server_cursor<RowType>, std::string> open_cursor(Stmt const& stmt, prefetch_rows hint,
457456
Params const&... params) const {
458457
return open_cursor_impl<RowType>(stmt.build_sql(), hint, params...);
459458
}
@@ -663,8 +662,8 @@ class mysql_connection {
663662

664663
template <typename RowType, typename... Params>
665664
[[nodiscard]] std::expected<server_cursor<RowType>, std::string> open_cursor_impl(std::string_view sql,
666-
prefetch_rows hint,
667-
Params const&... params) const {
665+
prefetch_rows hint,
666+
Params const&... params) const {
668667
using cursor_t = server_cursor<RowType>;
669668
using deleter_t = typename cursor_t::stmt_deleter;
670669

lib/include/ds_mysql/server_cursor.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ class server_cursor {
163163
if (truncated) {
164164
(refetch_truncated<std::tuple_element_t<Is, RowType>>(Is), ...);
165165
}
166-
return std::optional<RowType>{
167-
RowType{extract_value<std::tuple_element_t<Is, RowType>>(Is)...}};
166+
return std::optional<RowType>{RowType{extract_value<std::tuple_element_t<Is, RowType>>(Is)...}};
168167
}
169168

170169
template <typename T>

lib/include/ds_mysql/sql_ddl.hpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2850,8 +2850,8 @@ class create_function_builder {
28502850
}
28512851

28522852
[[nodiscard]] std::string build_sql() const {
2853-
return "CREATE FUNCTION " + std::string(Name) + "(" + params_ + ")\nRETURNS " + returns_ +
2854-
characteristics_ + "\nBEGIN\n" + body_ + "\nEND";
2853+
return "CREATE FUNCTION " + std::string(Name) + "(" + params_ + ")\nRETURNS " + returns_ + characteristics_ +
2854+
"\nBEGIN\n" + body_ + "\nEND";
28552855
}
28562856

28572857
private:
@@ -2864,9 +2864,8 @@ class create_function_builder {
28642864
} // namespace ddl_detail
28652865

28662866
template <fixed_string Name>
2867-
[[nodiscard]] ddl_detail::create_function_builder<Name> create_function(function_id<Name> const& id,
2868-
std::string params, std::string returns,
2869-
std::string body) {
2867+
[[nodiscard]] ddl_detail::create_function_builder<Name> create_function(function_id<Name> const& id, std::string params,
2868+
std::string returns, std::string body) {
28702869
return {id, std::move(params), std::move(returns), std::move(body)};
28712870
}
28722871

@@ -3048,19 +3047,19 @@ template <Database T>
30483047

30493048
template <ValidTable T, fixed_string Name>
30503049
[[nodiscard]] ddl_detail::trigger_desc<Name, T> trigger(trigger_id<Name> const&, TriggerTiming timing,
3051-
TriggerEvent event, std::string body) {
3050+
TriggerEvent event, std::string body) {
30523051
return {timing, event, std::move(body)};
30533052
}
30543053

30553054
template <fixed_string Name>
30563055
[[nodiscard]] ddl_detail::procedure_desc<Name> procedure(procedure_id<Name> const&, std::string params,
3057-
std::string body) {
3056+
std::string body) {
30583057
return {std::move(params), std::move(body)};
30593058
}
30603059

30613060
template <fixed_string Name>
30623061
[[nodiscard]] ddl_detail::function_desc<Name> function(function_id<Name> const&, std::string params,
3063-
std::string returns, std::string body) {
3062+
std::string returns, std::string body) {
30643063
return {std::move(params), std::move(returns), std::move(body)};
30653064
}
30663065

tests/integration/mysql/test_query_builder.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2083,7 +2083,9 @@ suite<"server cursor"> cursor_suite = [] {
20832083
// Set up test data
20842084
(void)(db->execute(drop_table(trade{}).if_exists()));
20852085
expect(db->execute(create_table(trade{})).has_value());
2086-
auto _ = scope_guard{[&] { (void)(db->execute(drop_table(trade{}).if_exists())); }};
2086+
auto _ = scope_guard{[&] {
2087+
(void)(db->execute(drop_table(trade{}).if_exists()));
2088+
}};
20872089

20882090
expect(db->execute(insert_into(trade{})
20892091
.columns(trade::code{}, trade::type{}, trade::name{}, trade::executed_at{},

tests/unit/test_ddl.cpp

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,8 +1523,7 @@ struct child_table_composable {
15231523
struct child_table_on_composed {
15241524
COLUMN_FIELD(id, uint32_t)
15251525
COLUMN_FIELD(parent_id, uint32_t, fk_attr::references<parent_table, parent_table::id>{},
1526-
fk_attr::on(fk_attr::delete_(fk_attr::cascade)),
1527-
fk_attr::on(fk_attr::update_(fk_attr::restrict_)))
1526+
fk_attr::on(fk_attr::delete_(fk_attr::cascade)), fk_attr::on(fk_attr::update_(fk_attr::restrict_)))
15281527
};
15291528
} // namespace
15301529

@@ -2126,8 +2125,7 @@ suite<"DDL procedures"> ddl_procedure_suite = [] {
21262125

21272126
suite<"DDL functions"> ddl_function_suite = [] {
21282127
"create_function - generates CREATE FUNCTION with RETURNS"_test = [] {
2129-
auto const sql =
2130-
create_function(function_id<"fn_hello">{}, "", "VARCHAR(50)", "RETURN 'Hello';").build_sql();
2128+
auto const sql = create_function(function_id<"fn_hello">{}, "", "VARCHAR(50)", "RETURN 'Hello';").build_sql();
21312129
expect(sql ==
21322130
"CREATE FUNCTION fn_hello()\n"
21332131
"RETURNS VARCHAR(50)\n"
@@ -2138,8 +2136,7 @@ suite<"DDL functions"> ddl_function_suite = [] {
21382136
};
21392137

21402138
"create_function with params - includes params and return type"_test = [] {
2141-
auto const sql =
2142-
create_function(function_id<"fn_add">{}, "a INT, b INT", "INT", "RETURN a + b;").build_sql();
2139+
auto const sql = create_function(function_id<"fn_add">{}, "a INT, b INT", "INT", "RETURN a + b;").build_sql();
21432140
expect(sql ==
21442141
"CREATE FUNCTION fn_add(a INT, b INT)\n"
21452142
"RETURNS INT\n"
@@ -2163,8 +2160,7 @@ suite<"DDL functions"> ddl_function_suite = [] {
21632160
};
21642161

21652162
"create_function.no_sql - adds NO SQL characteristic"_test = [] {
2166-
auto const sql =
2167-
create_function(function_id<"fn_pi">{}, "", "DOUBLE", "RETURN 3.14159;").no_sql().build_sql();
2163+
auto const sql = create_function(function_id<"fn_pi">{}, "", "DOUBLE", "RETURN 3.14159;").no_sql().build_sql();
21682164
expect(sql ==
21692165
"CREATE FUNCTION fn_pi()\n"
21702166
"RETURNS DOUBLE\n"
@@ -2176,10 +2172,10 @@ suite<"DDL functions"> ddl_function_suite = [] {
21762172
};
21772173

21782174
"create_function.reads_sql_data - adds READS SQL DATA characteristic"_test = [] {
2179-
auto const sql =
2180-
create_function(function_id<"fn_lookup">{}, "uid INT", "VARCHAR(100)", "RETURN (SELECT name FROM users WHERE id = uid);")
2181-
.reads_sql_data()
2182-
.build_sql();
2175+
auto const sql = create_function(function_id<"fn_lookup">{}, "uid INT", "VARCHAR(100)",
2176+
"RETURN (SELECT name FROM users WHERE id = uid);")
2177+
.reads_sql_data()
2178+
.build_sql();
21832179
expect(sql ==
21842180
"CREATE FUNCTION fn_lookup(uid INT)\n"
21852181
"RETURNS VARCHAR(100)\n"
@@ -2191,11 +2187,10 @@ suite<"DDL functions"> ddl_function_suite = [] {
21912187
};
21922188

21932189
"create_function.modifies_sql_data - adds MODIFIES SQL DATA characteristic"_test = [] {
2194-
auto const sql =
2195-
create_function(function_id<"fn_inc">{}, "uid INT", "INT",
2196-
"UPDATE counters SET cnt = cnt + 1 WHERE id = uid;\nRETURN 1;")
2197-
.modifies_sql_data()
2198-
.build_sql();
2190+
auto const sql = create_function(function_id<"fn_inc">{}, "uid INT", "INT",
2191+
"UPDATE counters SET cnt = cnt + 1 WHERE id = uid;\nRETURN 1;")
2192+
.modifies_sql_data()
2193+
.build_sql();
21992194
expect(sql ==
22002195
"CREATE FUNCTION fn_inc(uid INT)\n"
22012196
"RETURNS INT\n"
@@ -2208,10 +2203,8 @@ suite<"DDL functions"> ddl_function_suite = [] {
22082203
};
22092204

22102205
"create_function chained characteristics - combines DETERMINISTIC + NO SQL"_test = [] {
2211-
auto const sql = create_function(function_id<"fn_const">{}, "", "INT", "RETURN 42;")
2212-
.deterministic()
2213-
.no_sql()
2214-
.build_sql();
2206+
auto const sql =
2207+
create_function(function_id<"fn_const">{}, "", "INT", "RETURN 42;").deterministic().no_sql().build_sql();
22152208
expect(sql ==
22162209
"CREATE FUNCTION fn_const()\n"
22172210
"RETURNS INT\n"
@@ -2392,7 +2385,8 @@ suite<"DDL composition"> ddl_composition_suite = [] {
23922385

23932386
// --- create(procedure(...)) ---
23942387
"create(procedure) - equivalent to create_procedure"_test = [] {
2395-
auto const sql = create(procedure(procedure_id<"usp_add">{}, "IN a INT, IN b INT", "SELECT a + b;")).build_sql();
2388+
auto const sql =
2389+
create(procedure(procedure_id<"usp_add">{}, "IN a INT, IN b INT", "SELECT a + b;")).build_sql();
23962390
auto const expected =
23972391
create_procedure(procedure_id<"usp_add">{}, "IN a INT, IN b INT", "SELECT a + b;").build_sql();
23982392
expect(sql == expected) << sql;
@@ -2407,22 +2401,20 @@ suite<"DDL composition"> ddl_composition_suite = [] {
24072401
};
24082402

24092403
"create(function).deterministic - chains correctly"_test = [] {
2410-
auto const sql = create(function(function_id<"fn_dbl">{}, "x INT", "INT", "RETURN x * 2;"))
2411-
.deterministic()
2412-
.build_sql();
2404+
auto const sql =
2405+
create(function(function_id<"fn_dbl">{}, "x INT", "INT", "RETURN x * 2;")).deterministic().build_sql();
24132406
auto const expected =
24142407
create_function(function_id<"fn_dbl">{}, "x INT", "INT", "RETURN x * 2;").deterministic().build_sql();
24152408
expect(sql == expected) << sql;
24162409
};
24172410

24182411
// --- create(trigger<T>(...)) ---
24192412
"create(trigger) - equivalent to create_trigger"_test = [] {
2420-
auto const sql =
2421-
create(trigger<test_table>(trigger_id<"trg_bi">{}, TriggerTiming::Before, TriggerEvent::Insert,
2422-
"SET NEW.name = UPPER(NEW.name);"))
2423-
.build_sql();
2413+
auto const sql = create(trigger<test_table>(trigger_id<"trg_bi">{}, TriggerTiming::Before, TriggerEvent::Insert,
2414+
"SET NEW.name = UPPER(NEW.name);"))
2415+
.build_sql();
24242416
auto const expected = create_trigger<test_table>(trigger_id<"trg_bi">{}, TriggerTiming::Before,
2425-
TriggerEvent::Insert, "SET NEW.name = UPPER(NEW.name);")
2417+
TriggerEvent::Insert, "SET NEW.name = UPPER(NEW.name);")
24262418
.build_sql();
24272419
expect(sql == expected) << sql;
24282420
};

tests/unit/test_dml.cpp

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -795,23 +795,19 @@ suite<"DML - sql_default assignability"> dml_sql_default_suite = [] {
795795

796796
suite<"DML CASE in UPDATE"> dml_case_update_suite = [] {
797797
"set_case - UPDATE with CASE WHEN expression"_test = [] {
798-
auto const sql =
799-
update(asset{})
800-
.set_case(asset::instrument{},
801-
case_when(equal<asset::ticker>(asset::ticker{"AAPL"}), "Tech"s).else_("Other"s))
802-
.build_sql();
803-
expect(sql ==
804-
"UPDATE asset SET instrument = CASE WHEN ticker = 'AAPL' THEN 'Tech' ELSE 'Other' END"s)
805-
<< sql;
798+
auto const sql = update(asset{})
799+
.set_case(asset::instrument{},
800+
case_when(equal<asset::ticker>(asset::ticker{"AAPL"}), "Tech"s).else_("Other"s))
801+
.build_sql();
802+
expect(sql == "UPDATE asset SET instrument = CASE WHEN ticker = 'AAPL' THEN 'Tech' ELSE 'Other' END"s) << sql;
806803
};
807804

808805
"set_case with WHERE - adds WHERE clause"_test = [] {
809806
auto const sql =
810807
update(asset{})
811-
.set_case(asset::instrument{},
812-
case_when(equal<asset::ticker>(asset::ticker{"AAPL"}), "Tech"s)
813-
.when(equal<asset::ticker>(asset::ticker{"MSFT"}), "Software"s)
814-
.else_("Unknown"s))
808+
.set_case(asset::instrument{}, case_when(equal<asset::ticker>(asset::ticker{"AAPL"}), "Tech"s)
809+
.when(equal<asset::ticker>(asset::ticker{"MSFT"}), "Software"s)
810+
.else_("Unknown"s))
815811
.where(is_not_null<asset::name>())
816812
.build_sql();
817813
expect(sql.find("SET instrument = CASE WHEN ticker = 'AAPL' THEN 'Tech'"
@@ -821,21 +817,20 @@ suite<"DML CASE in UPDATE"> dml_case_update_suite = [] {
821817
};
822818

823819
"set_case mixed with set - regular assignments and CASE together"_test = [] {
824-
auto const sql = update(asset{})
825-
.set(asset::ticker{"UPDATED"})
826-
.set_case(asset::instrument{},
827-
case_when(equal<asset::exchange_id>(1u), "Local"s).else_("Foreign"s))
828-
.build_sql();
820+
auto const sql =
821+
update(asset{})
822+
.set(asset::ticker{"UPDATED"})
823+
.set_case(asset::instrument{}, case_when(equal<asset::exchange_id>(1u), "Local"s).else_("Foreign"s))
824+
.build_sql();
829825
expect(sql.find("SET ticker = 'UPDATED', instrument = CASE WHEN") != std::string::npos) << sql;
830826
};
831827

832828
"set_case on update_builder directly - starts chain with CASE"_test = [] {
833-
auto const sql =
834-
update(asset{})
835-
.set_case(asset::ticker{},
836-
case_when(equal<asset::id>(1u), asset::ticker{"A"}).else_(asset::ticker{"B"}))
837-
.where(equal<asset::id>(1u))
838-
.build_sql();
829+
auto const sql = update(asset{})
830+
.set_case(asset::ticker{},
831+
case_when(equal<asset::id>(1u), asset::ticker{"A"}).else_(asset::ticker{"B"}))
832+
.where(equal<asset::id>(1u))
833+
.build_sql();
839834
expect(sql == "UPDATE asset SET ticker = CASE WHEN id = 1 THEN 'A' ELSE 'B' END WHERE id = 1"s) << sql;
840835
};
841836
};

0 commit comments

Comments
 (0)