fix(bq_driver): Fix encoding for SAP HANA

ci/cloudbuild/dockerfiles/debian-12-arm64.Dockerfile

@@ -110,10 +110,11 @@ ENV PATH=${CLOUD_SDK_LOCATION}/bin:${PATH}
 COPY ./gha/builds/lib/odbc.ini /opt/odbc-driver/odbc.ini
 COPY ./gha/builds/lib/odbcinst.ini /opt/odbc-driver/odbcinst.ini
 COPY ./gha/builds/lib/lsan.supp /opt/odbc-driver/lsan.supp
-COPY ./gha/builds/lib/google.googlebigqueryodbc.ini /opt/odbc-driver/google.googlebigqueryodbc.ini
 COPY ./gha/builds/release/odbc.ini /opt/odbc-driver/odbc_template.ini
 COPY ./gha/builds/release/odbcinst.ini /opt/odbc-driver/odbcinst_template.ini
 COPY ./gha/builds/release/googlebigqueryodbc.ini /opt/odbc-driver/googlebigqueryodbc.ini
+COPY ./etc/googlebigqueryodbc_utf16.ini /opt/odbc-driver/googlebigqueryodbc_utf16.ini
+COPY ./etc/googlebigqueryodbc_utf8.ini /opt/odbc-driver/googlebigqueryodbc_utf8.ini
 
 # glibc 2.17 or later
 RUN echo 'Installing glibc...'

ci/cloudbuild/dockerfiles/ubuntu-20.04-release.Dockerfile

@@ -161,7 +161,8 @@ COPY ./etc/roots.pem /opt/odbc-driver/roots.pem
 COPY ./gha/builds/lib/odbc.ini /opt/odbc-driver/odbc.ini
 COPY ./gha/builds/lib/odbcinst.ini /opt/odbc-driver/odbcinst.ini
 COPY ./gha/builds/lib/lsan.supp /opt/odbc-driver/lsan.supp
-COPY ./gha/builds/lib/google.googlebigqueryodbc.ini /opt/odbc-driver/google.googlebigqueryodbc.ini
 COPY ./gha/builds/release/odbc.ini /opt/odbc-driver/odbc_template.ini
 COPY ./gha/builds/release/odbcinst.ini /opt/odbc-driver/odbcinst_template.ini
 COPY ./gha/builds/release/googlebigqueryodbc.ini /opt/odbc-driver/googlebigqueryodbc.ini
+COPY ./etc/googlebigqueryodbc_utf16.ini /opt/odbc-driver/googlebigqueryodbc_utf16.ini
+COPY ./etc/googlebigqueryodbc_utf8.ini /opt/odbc-driver/googlebigqueryodbc_utf8.ini

ci/cloudbuild/dockerfiles/ubuntu-22.04-full.Dockerfile

@@ -94,10 +94,11 @@ COPY ./etc/vcpkg-version.txt /tmp/vcpkg-version.txt
 COPY ./gha/builds/lib/odbc.ini /opt/odbc-driver/odbc.ini
 COPY ./gha/builds/lib/odbcinst.ini /opt/odbc-driver/odbcinst.ini
 COPY ./gha/builds/lib/lsan.supp /opt/odbc-driver/lsan.supp
-COPY ./gha/builds/lib/google.googlebigqueryodbc.ini /opt/odbc-driver/google.googlebigqueryodbc.ini
 COPY ./gha/builds/release/odbc.ini /opt/odbc-driver/odbc_template.ini
 COPY ./gha/builds/release/odbcinst.ini /opt/odbc-driver/odbcinst_template.ini
 COPY ./gha/builds/release/googlebigqueryodbc.ini /opt/odbc-driver/googlebigqueryodbc.ini
+COPY ./etc/googlebigqueryodbc_utf16.ini /opt/odbc-driver/googlebigqueryodbc_utf16.ini
+COPY ./etc/googlebigqueryodbc_utf8.ini /opt/odbc-driver/googlebigqueryodbc_utf8.ini
 
 # glibc 2.17 or later
 RUN echo 'Installing glibc...'

ci/cloudbuild/dockerfiles/ubuntu-22.04-install.Dockerfile

@@ -133,10 +133,11 @@ COPY ./etc/roots.pem /opt/odbc-driver/roots.pem
 COPY ./gha/builds/lib/odbc.ini /opt/odbc-driver/odbc.ini
 COPY ./gha/builds/lib/odbcinst.ini /opt/odbc-driver/odbcinst.ini
 COPY ./gha/builds/lib/lsan.supp /opt/odbc-driver/lsan.supp
-COPY ./gha/builds/lib/google.googlebigqueryodbc.ini /opt/odbc-driver/google.googlebigqueryodbc.ini
 COPY ./gha/builds/release/odbc.ini /opt/odbc-driver/odbc_template.ini
 COPY ./gha/builds/release/odbcinst.ini /opt/odbc-driver/odbcinst_template.ini
 COPY ./gha/builds/release/googlebigqueryodbc.ini /opt/odbc-driver/googlebigqueryodbc.ini
+COPY ./etc/googlebigqueryodbc_utf16.ini /opt/odbc-driver/googlebigqueryodbc_utf16.ini
+COPY ./etc/googlebigqueryodbc_utf8.ini /opt/odbc-driver/googlebigqueryodbc_utf8.ini
 
 # glibc 2.17 or later
 RUN echo 'Installing glibc...'

ci/dependencies/driver-manager-setup-google-driver.sh

@@ -50,7 +50,9 @@ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-}:/usr/local/lib/
 export ODBCSYSINI=/opt/odbc-driver
 export ODBCINI=/opt/odbc-driver/odbc.ini
 export CPP_BIGQUERY_ODBC_TEST_SERVICE_ACCOUNT_AUTH_KEY=/opt/odbc-driver/connection/key.json
-export GOOGLEBIGQUERYODBCINI=/opt/odbc-driver/google.googlebigqueryodbc.ini
+export GOOGLEBIGQUERYODBCINI=/opt/odbc-driver/googlebigqueryodbc.ini
+export GOOGLEBIGQUERYODBCINI_UTF16=/opt/odbc-driver/googlebigqueryodbc_utf16.ini
+export GOOGLEBIGQUERYODBCINI_UTF8=/opt/odbc-driver/googlebigqueryodbc_utf8.ini
 cd "$CPP_GOOGLE_BIGQUERY_ODBC_DRIVER_MANAGER_SETUP_CURR_DIR"
 
 echo '**** ODBC Driver installation END****'

ci/etc/googlebigqueryodbc.ini

@@ -0,0 +1,13 @@
+[Driver]
+LogLevel=0
+LogPath=
+# WcharEncoding sets the wire encoding of SQLWCHAR buffers on Linux/macOS
+# when the driver is built against iODBC headers (sizeof(SQLWCHAR) == 4).
+#
+# Accepted values:
+#   UTF-8     - 1-byte UTF-8 per character
+#   UTF-16LE  - 2-byte UTF-16LE per code unit
+#   UTF-32LE  - 4-byte UTF-32LE per code unit
+#   (empty)   - use sizeof(SQLWCHAR) as-is (default)
+#
+WcharEncoding=

ci/etc/googlebigqueryodbc_utf16.ini

@@ -0,0 +1,13 @@
+[Driver]
+LogLevel=0
+LogPath=
+# WcharEncoding sets the wire encoding of SQLWCHAR buffers on Linux/macOS
+# when the driver is built against iODBC headers (sizeof(SQLWCHAR) == 4).
+#
+# Accepted values:
+#   UTF-8     - 1-byte UTF-8 per character
+#   UTF-16LE  - 2-byte UTF-16LE per code unit
+#   UTF-32LE  - 4-byte UTF-32LE per code unit
+#   (empty)   - use sizeof(SQLWCHAR) as-is (default)
+#
+WcharEncoding=UTF-16LE

ci/etc/googlebigqueryodbc_utf8.ini

@@ -0,0 +1,13 @@
+[Driver]
+LogLevel=0
+LogPath=
+# WcharEncoding sets the wire encoding of SQLWCHAR buffers on Linux/macOS
+# when the driver is built against iODBC headers (sizeof(SQLWCHAR) == 4).
+#
+# Accepted values:
+#   UTF-8     - 1-byte UTF-8 per character
+#   UTF-16LE  - 2-byte UTF-16LE per code unit
+#   UTF-32LE  - 4-byte UTF-32LE per code unit
+#   (empty)   - use sizeof(SQLWCHAR) as-is (default)
+#
+WcharEncoding=UTF-8

ci/gha/builds/lib/googlebigqueryodbc.ini

@@ -0,0 +1,13 @@
+[Driver]
+LogLevel=0
+LogPath=
+# WcharEncoding sets the wire encoding of SQLWCHAR buffers on Linux/macOS
+# when the driver is built against iODBC headers (sizeof(SQLWCHAR) == 4).
+#
+# Accepted values:
+#   UTF-8     - 1-byte UTF-8 per character
+#   UTF-16LE  - 2-byte UTF-16LE per code unit
+#   UTF-32LE  - 4-byte UTF-32LE per code unit
+#   (empty)   - use sizeof(SQLWCHAR) as-is (default)
+#
+WcharEncoding=

ci/gha/builds/macos-cmake.sh

@@ -49,12 +49,16 @@ mv /Users/runner/work/connection/external_account_auth_keys.json.tmp /Users/runn
 
 cp ci/gha/builds/lib/odbc_osx.ini /Users/runner/work/connection/odbc-driver/odbc.ini
 cp ci/gha/builds/lib/odbcinst_osx.ini /Users/runner/work/connection/odbc-driver/odbcinst.ini
-cp ci/gha/builds/lib/google.googlebigqueryodbc.ini /Users/runner/work/connection/google.googlebigqueryodbc.ini
+cp ci/gha/builds/lib/googlebigqueryodbc.ini /Users/runner/work/connection/googlebigqueryodbc.ini
+cp ci/etc/googlebigqueryodbc_utf16.ini /Users/runner/work/connection/googlebigqueryodbc_utf16.ini
+cp ci/etc/googlebigqueryodbc_utf8.ini /Users/runner/work/connection/googlebigqueryodbc_utf8.ini
 # Copy the roots.pem file to the .so directory to run test cases.
 cp ci/etc/roots.pem /Users/runner/work/cpp-bigquery-odbc/cpp-bigquery-odbc/cmake-out/google/cloud/odbc/roots.pem
 export ODBCINI=/Users/runner/work/connection/odbc-driver/odbc.ini
 export ODBCINSTINI=/Users/runner/work/connection/odbc-driver/odbcinst.ini
-export GOOGLEBIGQUERYODBCINI=/Users/runner/work/connection/google.googlebigqueryodbc.ini
+export GOOGLEBIGQUERYODBCINI=/Users/runner/work/connection/googlebigqueryodbc.ini
+export GOOGLEBIGQUERYODBCINI_UTF16=/Users/runner/work/connection/googlebigqueryodbc_utf16.ini
+export GOOGLEBIGQUERYODBCINI_UTF8=/Users/runner/work/connection/googlebigqueryodbc_utf8.ini
 export ODBC_TESTS_DSN="SampleDSNGoogleDriver"
 export CPP_BIGQUERY_ODBC_TEST_SERVICE_ACCOUNT_AUTH_KEY=/Users/runner/work/connection/key.json
 export CPP_BIGQUERY_ODBC_TEST_EXTERNAL_ACCOUNT_AUTH_KEY=/Users/runner/work/connection/external_account_auth_keys.json

ci/gha/builds/release/googlebigqueryodbc.ini

@@ -21,3 +21,14 @@ LogFileSize=2000
 
 # MaxThreads(Optional): Maximum threads the driver will spawn for catalog APIs
 MaxThreads=8
+
+# WcharEncoding sets the wire encoding of SQLWCHAR buffers on Linux/macOS
+# when the driver is built against iODBC headers (sizeof(SQLWCHAR) == 4).
+#
+# Accepted values:
+#   UTF-8     - 1-byte UTF-8 per character
+#   UTF-16LE  - 2-byte UTF-16LE per code unit
+#   UTF-32LE  - 4-byte UTF-32LE per code unit
+#   (empty)   - use sizeof(SQLWCHAR) as-is (default)
+#
+WcharEncoding=

google/cloud/odbc/CMakeLists.txt

@@ -159,6 +159,15 @@ else ()
     find_package(google_cloud_cpp_serviceusage REQUIRED)
 endif ()
 
+find_package(re2 CONFIG QUIET)
+if (NOT TARGET re2::re2)
+    if (TARGET re2)
+        add_library(re2::re2 ALIAS re2)
+    else ()
+        find_package(re2 REQUIRED)
+    endif ()
+endif ()
+
 # Restore the original BUILD_SHARED_LIBS value
 set(BUILD_SHARED_LIBS ${ORIGINAL_BUILD_SHARED_LIBS})
 

google/cloud/odbc/bq_driver/internal/data_translation.cc

@@ -104,7 +104,7 @@ odbc_internal::StatusRecord ConvertFromNumericDSValue(DSValue const& src_dsval,
                                      "DSValueToWchar Conversion Failed"};
         break;
       }
-      SQLLEN wchar_capacity = dest_data.buflen / sizeof(SQLWCHAR);
+      SQLLEN wchar_capacity = dest_data.buflen / WireWcharSize();
       auto src_len = static_cast<SQLINTEGER>(wstr->length());
       SQLINTEGER required_chars = src_len + 1;
       WStrToOutputBufferResponse(wstr.GetValue(), dest_data.buf, wchar_capacity,
@@ -326,7 +326,7 @@ odbc_internal::StatusRecord ConvertFromStringDSValue(DSValue const& src_dsval,
     }
 
     auto src_len = static_cast<SQLINTEGER>(wide_str.length());
-    SQLLEN wchar_capacity = dest_data.buflen / sizeof(SQLWCHAR);
+    SQLLEN wchar_capacity = dest_data.buflen / WireWcharSize();
     SQLINTEGER required_chars = src_len + 1;
     return WStrToOutputBufferResponse(wide_str, dest_data.buf, wchar_capacity,
                                       src_len, required_chars,
@@ -907,7 +907,7 @@ odbc_internal::StatusRecord ConvertFromTimeDSValue(DSValue const& src_dsval,
                                      "DSValueToWchar Conversion Failed"};
         break;
       }
-      SQLLEN wchar_capacity = buffer_length / sizeof(SQLWCHAR);
+      SQLLEN wchar_capacity = buffer_length / WireWcharSize();
       SQLLEN required_chars = static_cast<SQLLEN>(wstr->length()) + 1;
       return WStrToOutputBufferResponse(
           wstr.GetValue(), dest_buf, wchar_capacity, k_time_src_len,
@@ -1007,30 +1007,22 @@ odbc_internal::StatusRecord ConvertFromTimestampDSValue(
                                      "DSValueToWchar Conversion Failed"};
         break;
       }
-      std::wstring wstr_val = wstr.GetValue();
-      if (!wstr_val.empty() && wstr_val.back() == L'\0') {
-        wstr_val.pop_back();
-      }
-      std::vector<SQLWCHAR> wstr_data(wstr_val.begin(), wstr_val.end());
-      wstr_data.emplace_back(L'\0');
-
-      auto* dest = reinterpret_cast<SQLWCHAR*>(dest_buf);
-      SQLLEN wchar_capacity = buffer_length / sizeof(SQLWCHAR);
+      size_t const wire_sz = WireWcharSize();
+      SQLLEN wchar_capacity = buffer_length / static_cast<SQLLEN>(wire_sz);
       if (wchar_capacity > k_timestamp_src_len) {
         if (res_len) {
-          *res_len = k_timestamp_src_len * sizeof(SQLWCHAR);
+          *res_len = static_cast<SQLLEN>(wstr.GetValue().size() * wire_sz);
         }
-        std::memcpy(dest, wstr_data.data(),
-                    (k_timestamp_src_len) * sizeof(SQLWCHAR));
-        dest[k_timestamp_src_len] = L'\0';
+        WriteWideToWireBuffer(wstr.GetValue(), dest_buf, wstr.GetValue().size(),
+                              /*null_terminate=*/true);
       } else if (20 <= wchar_capacity &&
                  wchar_capacity <= k_timestamp_src_len) {
         if (res_len) {
-          *res_len = wchar_capacity * sizeof(SQLWCHAR);
+          *res_len = wchar_capacity * static_cast<SQLLEN>(wire_sz);
         }
-        std::memcpy(dest, wstr_data.data(),
-                    (wchar_capacity) * sizeof(SQLWCHAR));
-        dest[wchar_capacity - 1] = L'\0';
+        WriteWideToWireBuffer(wstr.GetValue(), dest_buf,
+                              static_cast<size_t>(wchar_capacity - 1),
+                              /*null_terminate=*/true);
         LOG(WARNING)
             << "ConvertFromTimestampDSValue:: Data truncated for SQL_C_WCHAR.";
         status_record = StatusRecord{SQLStates::k_01004(), "Data truncated"};
@@ -1189,29 +1181,21 @@ odbc_internal::StatusRecord ConvertFromDatetimeDSValue(DSValue const& src_dsval,
                                      "DSValueToWchar Conversion Failed"};
         break;
       }
-      std::wstring wstr_val = wstr.GetValue();
-      if (!wstr_val.empty() && wstr_val.back() == L'\0') {
-        wstr_val.pop_back();
-      }
-      std::vector<SQLWCHAR> wstr_data(wstr_val.begin(), wstr_val.end());
-      wstr_data.emplace_back(L'\0');
-
-      auto* dest = reinterpret_cast<SQLWCHAR*>(dest_buf);
-      SQLLEN wchar_capacity = buffer_length / sizeof(SQLWCHAR);
+      size_t const wire_sz = WireWcharSize();
+      SQLLEN wchar_capacity = buffer_length / static_cast<SQLLEN>(wire_sz);
       if (wchar_capacity > k_datetime_src_len) {
         if (res_len) {
-          *res_len = k_datetime_src_len * sizeof(SQLWCHAR);
+          *res_len = static_cast<SQLLEN>(wstr.GetValue().size() * wire_sz);
         }
-        std::memcpy(dest, wstr_data.data(),
-                    (k_datetime_src_len) * sizeof(SQLWCHAR));
-        dest[k_datetime_src_len] = L'\0';
+        WriteWideToWireBuffer(wstr.GetValue(), dest_buf, wstr.GetValue().size(),
+                              /*null_terminate=*/true);
       } else if (20 <= wchar_capacity && wchar_capacity <= k_datetime_src_len) {
         if (res_len) {
-          *res_len = wchar_capacity * sizeof(SQLWCHAR);
+          *res_len = wchar_capacity * static_cast<SQLLEN>(wire_sz);
         }
-        std::memcpy(dest, wstr_data.data(),
-                    (wchar_capacity) * sizeof(SQLWCHAR));
-        dest[wchar_capacity - 1] = L'\0';
+        WriteWideToWireBuffer(wstr.GetValue(), dest_buf,
+                              static_cast<size_t>(wchar_capacity - 1),
+                              /*null_terminate=*/true);
         LOG(WARNING)
             << "ConvertFromDatetimeDSValue:: Data truncated for SQL_C_WCHAR.";
         status_record = StatusRecord{SQLStates::k_01004(), "Data truncated"};
@@ -1398,7 +1382,7 @@ odbc_internal::StatusRecord ConvertFromDateDSValue(DSValue const& src_dsval,
         return StatusRecord{SQLStates::k_HY000(),
                             "DSValueToWchar Conversion Failed"};
       }
-      SQLLEN wchar_capacity = buffer_length / sizeof(SQLWCHAR);
+      SQLLEN wchar_capacity = buffer_length / WireWcharSize();
       auto src_len = static_cast<SQLINTEGER>(wstr->length());
       SQLINTEGER required_chars = src_len + 1;
       return WStrToOutputBufferResponse(
@@ -1434,7 +1418,7 @@ StatusRecord ConvertStringToJsonOutputBuffer(std::string const& src_str,
         return StatusRecord{SQLStates::k_HY000(),
                             "Conversion to UTF-16 failed"};
       }
-      SQLLEN wchar_capacity = buffer_length / sizeof(SQLWCHAR);
+      SQLLEN wchar_capacity = buffer_length / WireWcharSize();
       auto src_len = static_cast<SQLINTEGER>(wide_string->length());
       SQLINTEGER required_chars = src_len + 1;
       return WStrToOutputBufferResponse(wide_string.GetValue(), dest_buf,
@@ -1498,15 +1482,11 @@ StatusRecord ConvertFromArrayDSValue(DSValue const& src_dsval,
       if (!wide_string.Ok()) {
         return StatusRecord{SQLStates::k_HY000(), "Conversion Failed"};
       }
-      std::wstring wide_val = wide_string.GetValue();
-      if (!wide_val.empty() && wide_val.back() == L'\0') {
-        wide_val.pop_back();
-      }
-      SQLLEN wchar_capacity = dest_data.buflen / sizeof(SQLWCHAR);
-      auto src_len = static_cast<SQLINTEGER>(wide_val.length());
+      SQLLEN wchar_capacity = dest_data.buflen / WireWcharSize();
+      auto src_len = static_cast<SQLINTEGER>(wide_string->length());
       SQLINTEGER required_chars = src_len + 1;
       return WStrToOutputBufferResponse(
-          wide_val, dest_data.buf, wchar_capacity, src_len, required_chars,
+          *wide_string, dest_data.buf, wchar_capacity, src_len, required_chars,
           reinterpret_cast<SQLLEN*>(dest_data.result_len));
     }
     case SQL_C_BINARY: {
@@ -1621,7 +1601,7 @@ odbc_internal::StatusRecord ConvertFromIntervalDSValue(DSValue const& src_dsval,
             StatusRecord{SQLStates::k_HY000(), wstr.GetStatusRecord().message};
         break;
       }
-      SQLLEN wchar_capacity = buffer_length / sizeof(SQLWCHAR);
+      SQLLEN wchar_capacity = buffer_length / WireWcharSize();
       auto interval_char_length =
           static_cast<SQLINTEGER>(wstr.GetValue().length());
       return WStrIntervalBufferResponse(
@@ -1907,7 +1887,7 @@ StatusRecord ConvertFromGeographyDSValue(DSValue const& src_dsval,
       }
       std::memset(dest_data.buf, 0, buffer_length);
       std::wstring const& wide_str = wstr.GetValue();
-      SQLLEN wchar_capacity = buffer_length / sizeof(SQLWCHAR);
+      SQLLEN wchar_capacity = buffer_length / WireWcharSize();
       SQLLEN src_len = static_cast<SQLLEN>(wide_str.length());
       SQLLEN required_chars = src_len + 1;
       status_record = WStrToOutputBufferResponse(
@@ -2054,38 +2034,35 @@ StatusRecord ConvertBytesToWChar(DSValue const& conn_val,
                         "UTF-8 to UTF-16 conversion failed."};
   }
 
-  std::wstring utf16_value = utf16_str.GetValue();
-  if (!utf16_value.empty() && utf16_value.back() == L'\0') {
-    utf16_value.pop_back();
-  }
-  size_t const required_size = utf16_value.length() * sizeof(SQLWCHAR);
+  std::wstring const& utf16_value = utf16_str.GetValue();
 
-  auto* buffer = reinterpret_cast<SQLWCHAR*>(dest_data.buf);
-
-  // Handle truncation if buffer is insufficient
-  if (dest_data.buflen < required_size) {
-    size_t num_chars_to_copy = (dest_data.buflen / sizeof(SQLWCHAR)) - 1;
-    std::memcpy(buffer, utf16_value.data(),
-                num_chars_to_copy * sizeof(SQLWCHAR));
-    buffer[num_chars_to_copy] = L'\0';
+  // Narrow wchar_t -> wire encoding directly into the caller's buffer.
+  // No intermediate vector; WriteWideToWireBuffer is a memcpy when the wire
+  // SQLWCHAR width matches sizeof(wchar_t) and a per-element narrowing loop
+  // only on the iODBC-built / unixODBC-loaded path.
+  size_t const wire_sz = WireWcharSize();
+  size_t const src_chars = utf16_value.size();
+  size_t const required_size = src_chars * wire_sz;
 
+  if (static_cast<size_t>(dest_data.buflen) < required_size) {
+    size_t num_chars_to_copy = dest_data.buflen / wire_sz;
+    if (num_chars_to_copy > 0) {
+      num_chars_to_copy--;  // leave one slot for the null terminator
+      WriteWideToWireBuffer(utf16_value, dest_data.buf, num_chars_to_copy,
+                            /*null_terminate=*/true);
+    }
     if (dest_data.result_len) {
-      *dest_data.result_len = dest_data.buflen;
+      *dest_data.result_len = required_size;
     }
     LOG(WARNING) << "ConvertBytesToWChar:: String data, right truncated.";
     return StatusRecord{SQLStates::k_01004(), "String data, right truncated"};
   }
-  for (size_t i = 0; i < utf16_str.GetValue().size(); ++i) {
-    buffer[i] = static_cast<SQLWCHAR>(utf16_str.GetValue()[i]);
-  }
-  size_t buffer_chars = dest_data.buflen / sizeof(SQLWCHAR);
-  if (utf16_str.GetValue().size() < buffer_chars) {
-    buffer[utf16_str.GetValue().size()] = L'\0';
-  }
-
-  // Set output length
+  bool const can_null_terminate =
+      static_cast<size_t>(dest_data.buflen) >= required_size + wire_sz;
+  WriteWideToWireBuffer(utf16_value, dest_data.buf, src_chars,
+                        can_null_terminate);
   if (dest_data.result_len) {
-    *dest_data.result_len = utf16_str.GetValue().size() * sizeof(SQLWCHAR);
+    *dest_data.result_len = required_size;
   }
   return status_record;
 }
@@ -2253,7 +2230,7 @@ StatusRecord ConvertFromRangeDSValue(DSValue const& src_dsval,
         return StatusRecord{SQLStates::k_HY000(),
                             "Conversion to SQL_C_WCHAR failed."};
       }
-      SQLLEN wchar_capacity = buffer_length / sizeof(SQLWCHAR);
+      SQLLEN wchar_capacity = buffer_length / WireWcharSize();
       SQLLEN src_len = static_cast<SQLLEN>(wstr->length());
       SQLLEN required_chars = src_len + 1;
       return WStrToOutputBufferResponse(