Skip to content

Commit eab915b

Browse files
committed
Executor::Execute: use default type resolver if type resolver is null
1 parent 9aee909 commit eab915b

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/oatpp-postgresql/Executor.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,11 @@ std::shared_ptr<orm::QueryResult> Executor::execute(const StringTemplate& queryT
291291
conn = getConnection();
292292
}
293293

294+
std::shared_ptr<const data::mapping::TypeResolver> tr = typeResolver;
295+
if(!tr) {
296+
tr = m_defaultTypeResolver;
297+
}
298+
294299
auto pgConnection = std::static_pointer_cast<postgresql::Connection>(conn);
295300

296301
auto extra = std::static_pointer_cast<ql_template::Parser::TemplateExtra>(queryTemplate.getExtraData());
@@ -299,19 +304,19 @@ std::shared_ptr<orm::QueryResult> Executor::execute(const StringTemplate& queryT
299304
if(prepare) {
300305

301306
if (!pgConnection->isPrepared(extra->templateName)) {
302-
auto result = prepareQuery(queryTemplate, typeResolver, pgConnection);
307+
auto result = prepareQuery(queryTemplate, tr, pgConnection);
303308
if(result->isSuccess()) {
304309
pgConnection->setPrepared(extra->templateName);
305310
} else {
306311
return result;
307312
}
308313
}
309314

310-
return executeQueryPrepared(queryTemplate, params, typeResolver, pgConnection);
315+
return executeQueryPrepared(queryTemplate, params, tr, pgConnection);
311316

312317
}
313318

314-
return executeQuery(queryTemplate, params, typeResolver, pgConnection);
319+
return executeQuery(queryTemplate, params, tr, pgConnection);
315320

316321
}
317322

0 commit comments

Comments
 (0)