Deserializer. Support varchar + text

Author: lganzzzo

src/oatpp-postgresql/Executor.cpp

@@ -161,23 +161,20 @@ std::shared_ptr<orm::QueryResult> Executor::execute(const StringTemplate& queryT
                                                     const std::shared_ptr<orm::Connection>& connection)
 {
 
-  auto pgConnection = std::static_pointer_cast<postgresql::Connection>(connection);
-  auto extra = std::static_pointer_cast<ql_template::Parser::TemplateExtra>(queryTemplate.getExtraData());
-
-  std::unordered_map<oatpp::String, oatpp::String> map;
-  for(auto p : params) {
-    map[p.first] = "<" + p.first + ">";
+  std::shared_ptr<orm::Connection> conn = connection;
+  if(!conn) {
+    conn = getConnection();
   }
-  auto res = queryTemplate.format(map);
+
+  auto pgConnection = std::static_pointer_cast<postgresql::Connection>(conn);
+
+  auto extra = std::static_pointer_cast<ql_template::Parser::TemplateExtra>(queryTemplate.getExtraData());
 
   if(!pgConnection->isPrepared(extra->templateName)) {
-    //OATPP_LOGD("AAA", "prepared[%s]={%s}", extra->templateName->c_str(), extra->preparedTemplate->c_str());
     prepareQuery(queryTemplate, pgConnection);
     pgConnection->setPrepared(extra->templateName);
   }
 
-  //OATPP_LOGD("AAA", "query={%s}", res->c_str());
-
   return executeQuery(queryTemplate, params, pgConnection);
 
 }

src/oatpp-postgresql/mapping/Deserializer.cpp

@@ -135,7 +135,9 @@ oatpp::Void Deserializer::deserializeString(const Deserializer* _this, const InD
   (void) _this;
   (void) type;
   switch(data.oid) {
-    case TEXTOID: return oatpp::String(data.data, data.size, true);
+    case TEXTOID:
+    case VARCHAROID: return oatpp::String(data.data, data.size, true);
+
   }
   throw std::runtime_error("[oatpp::postgresql::mapping::Deserializer::deserializeString()]: Error. Unknown OID.");
 }

src/oatpp-postgresql/mapping/ResultMapper.cpp

@@ -107,7 +107,7 @@ oatpp::Void ResultMapper::readRowAsObject(ResultMapper* _this, ResultData* dbDat
 
       mapping::Deserializer::InData inData;
       inData.oid = PQftype(dbData->dbResult, i);
-      inData.size = PQfsize(dbData->dbResult, i);
+      inData.size = PQgetlength(dbData->dbResult, rowIndex, i);
       inData.data = PQgetvalue(dbData->dbResult, rowIndex, i);
 
       field->set(object.get(), _this->m_deserializer.deserialize(inData, field->type));

src/oatpp-postgresql/mapping/ResultMapper.hpp

@@ -68,7 +68,7 @@ class ResultMapper {
       mapping::Deserializer::InData inData;
 
       inData.oid = PQftype(dbData->dbResult, i);
-      inData.size = PQfsize(dbData->dbResult, i);
+      inData.size = PQgetlength(dbData->dbResult, rowIndex, i);
       inData.data = PQgetvalue(dbData->dbResult, rowIndex, i);
 
       polymorphicDispatcher->addPolymorphicItem(listWrapper, _this->m_deserializer.deserialize(inData, itemType));
@@ -98,7 +98,7 @@ class ResultMapper {
       mapping::Deserializer::InData inData;
 
       inData.oid = PQftype(dbData->dbResult, i);
-      inData.size = PQfsize(dbData->dbResult, i);
+      inData.size = PQgetlength(dbData->dbResult, rowIndex, i);
       inData.data = PQgetvalue(dbData->dbResult, rowIndex, i);
 
       polymorphicDispatcher->addPolymorphicItem(mapWrapper, dbData->colNames[i], _this->m_deserializer.deserialize(inData, valueType));

src/oatpp-postgresql/mapping/TypeMapper.cpp

@@ -65,6 +65,7 @@ TypeMapper::TypeMapper() {
 
   {
     setOidType(TEXTOID, oatpp::String::Class::getType());
+    setOidType(VARCHAROID, oatpp::String::Class::getType());
 
     setOidType(INT2OID, oatpp::Int16::Class::getType());
     setOidType(INT4OID, oatpp::Int32::Class::getType());

test/oatpp-postgresql/tests.cpp

@@ -59,6 +59,16 @@ class MyClient : public oatpp::orm::DbClient {
         PARAM(oatpp::String, password),
         PARAM(oatpp::String, email))
 
+  QUERY(insertStrs,
+        "INSERT INTO test_strs "
+        "(f_str1, f_str2, f_str3) VALUES "
+        "(:f_str1, :f_str2, :f_str3);",
+        PARAM(oatpp::String, f_str1),
+        PARAM(oatpp::String, f_str2),
+        PARAM(oatpp::String, f_str3))
+
+  QUERY(selectStrs, "SELECT * FROM test_strs")
+
   QUERY(insertInts,
         "INSERT INTO test_ints "
         "(f_int8, f_uint8, f_int16, f_uint16, f_int32, f_uint32, f_int64) VALUES "
@@ -102,9 +112,13 @@ class Test : public oatpp::test::UnitTest {
     //client.insertFloats(0.32, 0.64, connection);
     //client.insertFloats(-0.32, -0.64, connection);
 
+    //client.insertStrs("Hello", "World", "Oat++", connection);
+    //client.insertStrs("Hello", "World", "oatpp", connection);
+    //client.insertStrs("Yeah", "Ops", "!!!", connection);
+
     {
 
-      auto res = client.selectFloats(connection);
+      auto res = client.selectStrs(connection);
       OATPP_LOGD(TAG, "OK=%d, count=%d", res->isSuccess(), res->count());
 
       auto dataset = res->fetch<oatpp::Vector<oatpp::Fields<oatpp::Any>>>();