Skip to content

Commit 460bfc4

Browse files
lganzzzolganzzzo
committed
Code cleanup.
1 parent 7328832 commit 460bfc4

File tree

5 files changed

+5
-95
lines changed

5 files changed

+5
-95
lines changed

‎src/oatpp-postgresql/ConnectionProvider.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ std::shared_ptr<Connection> ConnectionProvider::get() {
4141
"Error. Can't connect. " + errMsg);
4242
}
4343

44-
OATPP_LOGI("ConnectionProvider", "get()");
4544
return std::make_shared<ConnectionImpl>(handle);
4645

4746
}

‎src/oatpp-postgresql/Executor.cpp

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ data::share::StringTemplate Executor::parseQueryTemplate(const oatpp::String& na
128128
auto extra = std::make_shared<ql_template::Parser::TemplateExtra>();
129129
extra->templateName = name;
130130

131-
ql_template::TemplateValueProvider valueProvider(&paramsTypeMap);
131+
ql_template::TemplateValueProvider valueProvider;
132132
extra->preparedTemplate = t.format(&valueProvider);
133133

134134
extra->paramTypes = getParamTypes(t, paramsTypeMap);
@@ -140,26 +140,7 @@ data::share::StringTemplate Executor::parseQueryTemplate(const oatpp::String& na
140140
}
141141

142142
std::shared_ptr<orm::Connection> Executor::getConnection() {
143-
144-
// oatpp::String dbHost = "localhost";
145-
// oatpp::String dbUser = "postgres";
146-
// oatpp::String dbPassword = "db-pass";
147-
// oatpp::String dbName = "postgres";
148-
//
149-
// oatpp::data::stream::ChunkedBuffer stream;
150-
// stream << "host=" << dbHost << " user=" << dbUser << " password=" << dbPassword << " dbname=" << dbName;
151-
// auto connStr = stream.toString();
152-
//
153-
// auto handle = PQconnectdb(connStr->c_str());
154-
//
155-
// if(PQstatus(handle) == CONNECTION_BAD) {
156-
// OATPP_LOGD("Database", "Connection to database failed: %s\n", PQerrorMessage(handle));
157-
// PQfinish(handle);
158-
// return nullptr;
159-
// }
160-
161143
return m_connectionProvider->get();
162-
163144
}
164145

165146
std::shared_ptr<orm::QueryResult> Executor::execute(const StringTemplate& queryTemplate,

‎src/oatpp-postgresql/ql_template/TemplateValueProvider.cpp

Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -26,72 +26,10 @@
2626

2727
namespace oatpp { namespace postgresql { namespace ql_template {
2828

29-
TemplateValueProvider::TemplateValueProvider(const orm::Executor::ParamsTypeMap* paramsTypeMap)
30-
: m_paramsTypeMap(paramsTypeMap)
31-
{
32-
m_typeNames.resize(data::mapping::type::ClassId::getClassCount(), nullptr);
33-
34-
setTypeName(data::mapping::type::__class::String::CLASS_ID, "text");
35-
setTypeName(data::mapping::type::__class::Any::CLASS_ID, nullptr);
36-
37-
setTypeName(data::mapping::type::__class::Int8::CLASS_ID, "int2");
38-
setTypeName(data::mapping::type::__class::UInt8::CLASS_ID, "int2");
39-
40-
setTypeName(data::mapping::type::__class::Int16::CLASS_ID, "int2");
41-
setTypeName(data::mapping::type::__class::UInt16::CLASS_ID, "int4");
42-
43-
setTypeName(data::mapping::type::__class::Int32::CLASS_ID, "int4");
44-
setTypeName(data::mapping::type::__class::UInt32::CLASS_ID, "int8");
45-
46-
setTypeName(data::mapping::type::__class::Int64::CLASS_ID, "int8");
47-
setTypeName(data::mapping::type::__class::UInt64::CLASS_ID, nullptr);
48-
49-
setTypeName(data::mapping::type::__class::Float32::CLASS_ID, "float4");
50-
setTypeName(data::mapping::type::__class::Float64::CLASS_ID, "float8");
51-
setTypeName(data::mapping::type::__class::Boolean::CLASS_ID, "bool");
52-
53-
setTypeName(data::mapping::type::__class::AbstractObject::CLASS_ID, nullptr);
54-
setTypeName(data::mapping::type::__class::AbstractEnum::CLASS_ID, nullptr);
55-
56-
setTypeName(data::mapping::type::__class::AbstractVector::CLASS_ID, nullptr);
57-
setTypeName(data::mapping::type::__class::AbstractList::CLASS_ID, nullptr);
58-
setTypeName(data::mapping::type::__class::AbstractUnorderedSet::CLASS_ID, nullptr);
59-
60-
setTypeName(data::mapping::type::__class::AbstractPairList::CLASS_ID, nullptr);
61-
setTypeName(data::mapping::type::__class::AbstractUnorderedMap::CLASS_ID, nullptr);
62-
63-
}
64-
65-
void TemplateValueProvider::setTypeName(const data::mapping::type::ClassId& classId, const oatpp::String& name) {
66-
const v_uint32 id = classId.id;
67-
if(id < m_typeNames.size()) {
68-
m_typeNames[id] = name;
69-
} else {
70-
throw std::runtime_error("[oatpp::postgresql::ql_template::TemplateValueProvider::setTypeName()]: "
71-
"Error. Unknown classId. Class-Name=" + std::string(classId.name));
72-
}
73-
}
74-
7529
oatpp::String TemplateValueProvider::getValue(const data::share::StringTemplate::Variable& variable, v_uint32 index) {
76-
77-
auto typeIt = m_paramsTypeMap->find(variable.name);
78-
if(typeIt == m_paramsTypeMap->end()) {
79-
throw std::runtime_error("[oatpp::postgresql::Executor::PGTemplateValueProvider::getValue()]: Error. "
80-
"Type info not found for variable " + variable.name->std_str());
81-
}
82-
83-
auto typeName = m_typeNames[typeIt->second->classId.id];
84-
85-
if(!typeName) {
86-
throw std::runtime_error("[oatpp::postgresql::Executor::PGTemplateValueProvider::getValue()]: Error. "
87-
"Unsupported type - " + std::string(typeIt->second->classId.name));
88-
}
89-
9030
m_buffStream.setCurrentPosition(0);
91-
m_buffStream << "$" << (index + 1);// << "::" << typeName;
92-
31+
m_buffStream << "$" << (index + 1);
9332
return m_buffStream.toString();
94-
9533
}
9634

9735
}}}

‎src/oatpp-postgresql/ql_template/TemplateValueProvider.hpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,9 @@ namespace oatpp { namespace postgresql { namespace ql_template {
3232

3333
class TemplateValueProvider : public data::share::StringTemplate::ValueProvider {
3434
private:
35-
void setTypeName(const data::mapping::type::ClassId& classId, const oatpp::String& name);
36-
private:
37-
const orm::Executor::ParamsTypeMap* m_paramsTypeMap;
38-
std::vector<oatpp::String> m_typeNames;
3935
data::stream::BufferOutputStream m_buffStream;
4036
public:
41-
42-
TemplateValueProvider(const orm::Executor::ParamsTypeMap* paramsTypeMap);
43-
4437
oatpp::String getValue(const data::share::StringTemplate::Variable& variable, v_uint32 index) override;
45-
4638
};
4739

4840
}}}

‎test/oatpp-postgresql/tests.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ class Test : public oatpp::test::UnitTest {
119119
//client.insertFloats(0.32, 0.64, connection);
120120
//client.insertFloats(-0.32, -0.64, connection);
121121

122-
//client.insertStrs("Hello", "World", "Oat++");
123-
//client.insertStrs("Hello", "World", "oatpp");
124-
//client.insertStrs("Yeah", "Ops", "!!!");
122+
// client.insertStrs("Hello", "World", "Oat++");
123+
// client.insertStrs("Hello", "World", "oatpp");
124+
// client.insertStrs("Yeah", "Ops", "!!!");
125125

126126
{
127127

0 commit comments

Comments
 (0)