[AD-767] Correct merge error

aws · Jun 17, 2022 · 5149037 · 5149037
1 parent 40a3a14
commit 5149037
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/src/odbc-test/src/odbc_test_suite.cpp b/src/odbc-test/src/odbc_test_suite.cpp
@@ -809,9 +809,8 @@ void OdbcTestSuite::CreateDsnConnectionStringForRemoteServer(
       sshTunnel ? common::GetEnv("DOC_DB_HOST", "") : "localhost";
   std::string sshUserAtHost = common::GetEnv("DOC_DB_USER", "");
   std::string sshPrivKeyFile = common::GetEnv("DOC_DB_PRIV_KEY_FILE", "");
-  std::string port = sshTunnel
-                          ? common::GetEnv("DOC_DB_REMOTE_PORT", "27017")
-                          : common::GetEnv("DOC_DB_LOCAL_PORT", "27019");
+  std::string port = sshTunnel ? common::GetEnv("DOC_DB_REMOTE_PORT", "27017")
+                               : common::GetEnv("DOC_DB_LOCAL_PORT", "27019");
 
   if (!username.empty()) {
     user = username;

diff --git a/src/odbc/include/ignite/odbc/query/foreign_keys_query.h b/src/odbc/include/ignite/odbc/query/foreign_keys_query.h
@@ -150,5 +150,4 @@ class ForeignKeysQuery : public Query {
 }  // namespace query
 }  // namespace odbc
 }  // namespace ignite
-
 #endif  //_IGNITE_ODBC_QUERY_FOREIGN_KEYS_QUERY
diff --git a/src/odbc/src/app/application_data_buffer.cpp b/src/odbc/src/app/application_data_buffer.cpp
@@ -280,7 +280,6 @@ ConversionResult::Type ApplicationDataBuffer::PutValToStrBuffer(
 template < typename OutCharT, typename InCharT >
 ConversionResult::Type ApplicationDataBuffer::PutStrToStrBuffer(
     const std::basic_string< InCharT >& value, int32_t& written) {
-
   written = 0;
 
   SqlLen outCharSize = static_cast< SqlLen >(sizeof(OutCharT));

diff --git a/src/odbc/src/impl/cache/query/query_batch.cpp b/src/odbc/src/impl/cache/query/query_batch.cpp
@@ -41,6 +41,7 @@ QueryFieldsRowImpl* QueryBatch::GetNextRow() {
 
   return new QueryFieldsRowImpl(mem, dataPos, columnNum);
 }
+
 }  // namespace query
 }  // namespace cache
 }  // namespace impl