impl(bq_driver): add sql_wvarchar impl

NeerajDwivedii · NeerajDwivedii · commit 6aafd68dad45 · 2026-04-06T16:54:53.000+05:30
diff --git a/google/cloud/odbc/bq_driver/internal/driver_adv_opt_form.cc b/google/cloud/odbc/bq_driver/internal/driver_adv_opt_form.cc
@@ -55,7 +55,7 @@ std::string AdvanceOptions::default_string_length_ = kDefaultStringLength;
 std::string AdvanceOptions::session_location_;
 std::string AdvanceOptions::additional_projects_;
 std::string AdvanceOptions::query_properties_;
-std::string AdvanceOptions::use_wchar_;
+std::string AdvanceOptions::use_wvarchar_;
 std::string AdvanceOptions::enable_session_;
 std::string AdvanceOptions::activation_threshold_checkbox_;
 std::string AdvanceOptions::allow_large_results_;
@@ -75,7 +75,7 @@ std::string const kSessionLocation = "SessionLocation";
 std::string const kAdditionalProjects = "AdditionalProjects";
 std::string const kQueryProperties = "QueryProperties";
 std::string const kActivationThreshold = "HTAPI_ActivationThreshold";
-std::string const kUseWChar = "UseWVarChar";
+std::string const kUseWVarchar = "UseWVarChar";
 std::string const kEnableSession = "EnableSession";
 std::string const kHTAPIActivationThresholdCheck = "AllowHtapiForLargeResults";
 std::string const kAllowLargeResults = "AllowLargeResults";
@@ -358,21 +358,20 @@ void AdvanceOptions::CreateAdditionalControls(HFONT h_font) {
   SetWindowLongPtr(
       h_max_retries_edit, GWL_STYLE,
       GetWindowLongPtr(h_max_retries_edit, GWL_STYLE) | ES_RIGHT | ES_NUMBER);
-  // TODO(b/497725655): Enable UI feature after public release
-  // HWND h_variables_checkbox = CreateCheckBox(
-  //     adv_hwnd, "Use SQL_WVARCHAR instead of SQL_VARCHAR", kXAxis, kYAxis +
-  //     390, kWidth * 7, kHeight, kIdcVariableCheckbox);
-  // CheckDlgButton(adv_hwnd, kIdcVariableCheckbox,
-  //                (use_wchar_ == "1") ? BST_CHECKED : BST_UNCHECKED);
-  // SendMessage(h_variables_checkbox, WM_SETFONT, (WPARAM)h_font, TRUE);
-  // SetWindowSubclass(GetDlgItem(adv_hwnd, kIdcVariableCheckbox),
-  //                   CheckboxSubclassProc, 0, 0);
+  HWND h_variables_checkbox = CreateCheckBox(
+      adv_hwnd, "Use SQL_WVARCHAR instead of SQL_VARCHAR", kXAxis, kYAxis + 415,
+      kWidth * 7, kHeight, kIdcUseWVarcharCheckbox);
+  CheckDlgButton(adv_hwnd, kIdcUseWVarcharCheckbox,
+                 (use_wvarchar_ == "1") ? BST_CHECKED : BST_UNCHECKED);
+  SendMessage(h_variables_checkbox, WM_SETFONT, (WPARAM)h_font, TRUE);
+  SetWindowSubclass(GetDlgItem(adv_hwnd, kIdcUseWVarcharCheckbox),
+                    CheckboxSubclassProc, 0, 0);
   HWND h_additional_projects_label =
-      CreateLabel(adv_hwnd, "Additional projects:", kXAxis, kYAxis + 420,
+      CreateLabel(adv_hwnd, "Additional projects:", kXAxis, kYAxis + 440,
                   kWidth * 5, kHeight, WS_VISIBLE | SS_LEFT);
   SendMessage(h_additional_projects_label, WM_SETFONT, (WPARAM)h_font, TRUE);
   HWND h_additional_projects_edit =
-      CreateScrollableEditBox(adv_hwnd, kXAxis, kYAxis + 440, kWidth + 380,
+      CreateScrollableEditBox(adv_hwnd, kXAxis, kYAxis + 460, kWidth + 380,
                               kHeight + 32, kIdcAdditionalProjectsEdit);
   SendMessage(h_additional_projects_edit, WM_SETFONT, (WPARAM)h_font, TRUE);
 
@@ -381,11 +380,11 @@ void AdvanceOptions::CreateAdditionalControls(HFONT h_font) {
                     InputSubclassProc, 0, 0);
 
   HWND h_query_properties_label =
-      CreateLabel(adv_hwnd, "Query properties:", kXAxis, kYAxis + 500,
+      CreateLabel(adv_hwnd, "Query properties:", kXAxis, kYAxis + 520,
                   kWidth * 5, kHeight, WS_VISIBLE | SS_LEFT);
   SendMessage(h_query_properties_label, WM_SETFONT, (WPARAM)h_font, TRUE);
   HWND h_query_properties_edit =
-      CreateScrollableEditBox(adv_hwnd, kXAxis, kYAxis + 520, kWidth + 385,
+      CreateScrollableEditBox(adv_hwnd, kXAxis, kYAxis + 540, kWidth + 385,
                               kHeight + 13, kIdcQueryPropertiesEdit);
   SendMessage(h_query_properties_edit, WM_SETFONT, (WPARAM)h_font, TRUE);
 
@@ -409,12 +408,12 @@ void AdvanceOptions::CreateAdditionalControls(HFONT h_font) {
 }
 
 void AdvanceOptions::CreateButtons(HFONT h_font) {
-  HWND h_ok_button = CreateButton(adv_hwnd, "OK", kOkButtonX + 2, kButtonY + 38,
+  HWND h_ok_button = CreateButton(adv_hwnd, "OK", kOkButtonX + 2, kButtonY + 58,
                                   kButtonWidth, kButtonHeight, kIdcOKButton);
   SendMessage(h_ok_button, WM_SETFONT, (WPARAM)h_font, TRUE);
 
   HWND h_cancel_button =
-      CreateButton(adv_hwnd, "Cancel", kCancelButtonX, kButtonY + 38,
+      CreateButton(adv_hwnd, "Cancel", kCancelButtonX, kButtonY + 58,
                    kButtonWidth, kButtonHeight, kIdcCancelButton);
   SendMessage(h_cancel_button, WM_SETFONT, (WPARAM)h_font, TRUE);
 }
@@ -627,11 +626,10 @@ LRESULT CALLBACK AdvanceOptions::AdvanceOptProc(HWND hwnd, UINT u_msg,
           GetWindowText(h_activation_threshold, activation_threshold_buffer,
                         sizeof(activation_threshold_buffer));
           activation_threshold_ = activation_threshold_buffer;
-          // TODO(b/497725655): Enable UI feature after public release
-          // use_wchar_ =
-          //     (IsDlgButtonChecked(hwnd, kIdcVariableCheckbox) == BST_CHECKED)
-          //         ? "1"
-          //         : "0";
+          use_wvarchar_ =
+              (IsDlgButtonChecked(hwnd, kIdcUseWVarcharCheckbox) == BST_CHECKED)
+                  ? "1"
+                  : "0";
 
           enable_session_ =
               (IsDlgButtonChecked(hwnd, kIdcEnableSessionCheckbox) ==
@@ -779,8 +777,7 @@ void AdvanceOptions::SetValues(Section const& attribute_map) {
   query_properties_ = GetValueOrDefault(attribute_map, kQueryProperties);
   activation_threshold_ =
       GetValueOrDefault(attribute_map, kActivationThreshold);
-  // TODO(b/497725655): Enable UI feature after public release
-  // use_wchar_ = GetValueOrDefault(attribute_map, kUseWChar);
+  use_wvarchar_ = GetValueOrDefault(attribute_map, kUseWVarchar);
   enable_session_ = GetValueOrDefault(attribute_map, kSessionLocation);
   activation_threshold_checkbox_ =
       GetValueOrDefault(attribute_map, kHTAPIActivationThresholdCheck);
@@ -803,7 +800,7 @@ void AdvanceOptions::ResetToDefaults() {
   additional_projects_.clear();
   query_properties_.clear();
   activation_threshold_.clear();
-  // use_wchar_.clear();
+  use_wvarchar_.clear();
   enable_session_.clear();
   activation_threshold_checkbox_.clear();
   allow_large_results_.clear();
@@ -831,7 +828,7 @@ void AdvanceOptions::Show(HWND hwnd) {
   RegisterClass(&wc_adv);
 
   int window_width = 462;
-  int window_height = 650;
+  int window_height = 670;
   int screen_width = GetSystemMetrics(SM_CXSCREEN);
   int screen_height = GetSystemMetrics(SM_CYSCREEN);
   int x_pos = (screen_width - window_width) / 2;
diff --git a/google/cloud/odbc/bq_driver/internal/driver_adv_opt_form.h b/google/cloud/odbc/bq_driver/internal/driver_adv_opt_form.h
@@ -37,7 +37,7 @@ static int const kIdcQueryPropertiesEdit = 140;
 static int const kIdcOKButton = 141;
 static int const kIdcCancelButton = 142;
 static int const kIdcLanguageDialectComboBox = 143;
-static int const kIdcVariableCheckbox = 144;
+static int const kIdcUseWVarcharCheckbox = 144;
 static int const KIdcLargeResultHeader = 145;
 static int const kIdcEncryptionKeyComboBox = 146;
 static int const kIdcHyperlink2 = 147;
@@ -85,7 +85,7 @@ class AdvanceOptions {
   inline std::string const& GetActivationThreshold() const {
     return activation_threshold_;
   }
-  inline std::string const& GetUseWchar() const { return use_wchar_; }
+  inline std::string const& GetUseWVarChar() const { return use_wvarchar_; }
   inline std::string const& GetEnableSession() const { return enable_session_; }
   inline std::string const& GetActivationThresholdCheckbox() const {
     return activation_threshold_checkbox_;
@@ -119,7 +119,7 @@ class AdvanceOptions {
   static std::string additional_projects_;
   static std::string query_properties_;
   static std::string activation_threshold_;
-  static std::string use_wchar_;
+  static std::string use_wvarchar_;
   static std::string enable_session_;
   static std::string activation_threshold_checkbox_;
   static std::string allow_large_results_;
diff --git a/google/cloud/odbc/bq_driver/internal/driver_form.cc b/google/cloud/odbc/bq_driver/internal/driver_form.cc
@@ -224,7 +224,7 @@ static Section BuildTestConnectionAttributes(
   attributes_map["QueryProperties"] = adv_form.GetQueryProperties();
   attributes_map["HTAPI_ActivationThreshold"] =
       adv_form.GetActivationThreshold();
-  attributes_map["UseWVarChar"] = adv_form.GetUseWchar();
+  attributes_map["UseWVarChar"] = adv_form.GetUseWVarChar();
   attributes_map["EnableSession"] = adv_form.GetEnableSession();
   attributes_map["AllowHtapiForLargeResults"] =
       adv_form.GetActivationThresholdCheckbox();
diff --git a/google/cloud/odbc/bq_driver/internal/odbc_conn_handle.cc b/google/cloud/odbc/bq_driver/internal/odbc_conn_handle.cc
@@ -138,6 +138,11 @@ void ConnectionHandle::SetUp(Section& dsn_section,
   dsn_.max_retries =
       !max_retries.empty() ? std::stoull(max_retries) : kDefaultMaxRetries;
 
+  std::string use_wvarchar = dsn_section["USEWVARCHAR"];
+  if (!use_wvarchar.empty()) {
+    GetUpperStr(use_wvarchar);
+    dsn_.use_wvarchar = (use_wvarchar == "1" || use_wvarchar == "TRUE");
+  }
   dsn_.pem_file = dsn_section["TRUSTEDCERTS"];
   dsn_.kms_key_name = dsn_section["KMSKEYNAME"];
   dsn_.session_location = dsn_section["SESSIONLOCATION"];
diff --git a/google/cloud/odbc/bq_driver/internal/odbc_conn_handle.h b/google/cloud/odbc/bq_driver/internal/odbc_conn_handle.h
@@ -76,6 +76,7 @@ struct Dsn {
   bool use_default_large_results_dataset = true;
   std::string large_results_dataset_id;
   bool allow_htapi = false;
+  bool use_wvarchar = false;
   std::string htapi_activation_threshold = "10000";
   std::string large_table_expiration_time = kDefaultLargeResultsTableExpiration;
 
diff --git a/google/cloud/odbc/bq_driver/internal/odbc_desc_attr.cc b/google/cloud/odbc/bq_driver/internal/odbc_desc_attr.cc
@@ -386,10 +386,12 @@ StatusRecord DescriptorRecord::SetOctetLength(SQLSMALLINT type,
       octet_length = value;
       break;
     case SQL_WCHAR:
-    case SQL_WVARCHAR:
     case SQL_WLONGVARCHAR:
       octet_length = value * sizeof(SQLWCHAR);
       break;
+    case SQL_WVARCHAR:
+      octet_length = value * 4;
+      break;
     case SQL_DECIMAL:
     case SQL_NUMERIC:
       octet_length = (precision + 2);
diff --git a/google/cloud/odbc/bq_driver/internal/odbc_internal_commons.cc b/google/cloud/odbc/bq_driver/internal/odbc_internal_commons.cc
@@ -1189,12 +1189,12 @@ odbc_internal::StatusRecordOr<std::string> GetDataTypeInStr(BQDataType type) {
 }
 
 odbc_internal::StatusRecordOr<SQLSMALLINT> GetSQLDataType(
-    std::string const& type, bool isArray) {
+    std::string const& type, bool isArray, bool UseWvarchar) {
   if (isArray) {
     return SQL_VARCHAR;
   }
   if (type == "STRING") {
-    return SQL_VARCHAR;
+    return UseWvarchar ? SQL_WVARCHAR : SQL_VARCHAR;
   }
   if (type == "INTEGER" || type == "INT64") {
     return SQL_BIGINT;
diff --git a/google/cloud/odbc/bq_driver/internal/odbc_internal_commons.h b/google/cloud/odbc/bq_driver/internal/odbc_internal_commons.h
@@ -584,7 +584,7 @@ odbc_internal::StatusRecordOr<BQDataType> ConvertDSType(
     std::string const& type);
 
 odbc_internal::StatusRecordOr<SQLSMALLINT> GetSQLDataType(
-    std::string const& type, bool isArray = false);
+    std::string const& type, bool isArray = false, bool UseWvarchar = false);
 
 odbc_internal::StatusRecordOr<
     google::cloud::bigquery_v2_minimal_internal::QueryParameter>
diff --git a/google/cloud/odbc/bq_driver/internal/odbc_stmt_handle.cc b/google/cloud/odbc/bq_driver/internal/odbc_stmt_handle.cc
@@ -354,8 +354,8 @@ StatusRecord StatementHandle::PopulateIrd(DescriptorHandle& descriptor_handle,
     DescriptorRecord descriptor_record;
     descriptor_record.SetName(res.name, res.name.length());
     descriptor_record.length = res.max_length;
-    StatusRecordOr<SQLSMALLINT> type_status_record =
-        GetSQLDataType(res.type, (res.mode == array_field));
+    StatusRecordOr<SQLSMALLINT> type_status_record = GetSQLDataType(
+        res.type, (res.mode == array_field), conn_handle.GetDsn().use_wvarchar);
 
     if (!type_status_record.Ok()) {
       LOG(ERROR) << "StatementHandle::PopulateIrd::GetSQLDataType:: "
diff --git a/google/cloud/odbc/bq_driver/odbc_sql_results.cc b/google/cloud/odbc/bq_driver/odbc_sql_results.cc
@@ -484,6 +484,7 @@ SQLRETURN SQLDescribeColInternal(
     case SQL_SMALLINT:
     case SQL_TINYINT:
     case SQL_BIGINT:
+    case SQL_WVARCHAR:
       IntValueToOutputBufferResponse<SQLSMALLINT, SQLSMALLINT>(
           desc_record.precision, column_size, nullptr);
       break;
@@ -500,9 +501,6 @@ SQLRETURN SQLDescribeColInternal(
     case SQL_INTERVAL_DAY_TO_SECOND:
     case SQL_INTERVAL_HOUR_TO_SECOND:
     case SQL_INTERVAL_MINUTE_TO_SECOND:
-      IntValueToOutputBufferResponse<SQLSMALLINT, SQLSMALLINT>(
-          desc_record.precision, decimal_digits, nullptr);
-      break;
     case SQL_DECIMAL:
     case SQL_NUMERIC:
     case SQL_SMALLINT:
diff --git a/google/cloud/odbc/bq_driver/odbc_windows.cc b/google/cloud/odbc/bq_driver/odbc_windows.cc
@@ -143,7 +143,7 @@ bool ConfigDSNInternal(HWND hwnd_parent, WORD f_request, LPCSTR lpsz_driver,
       GetValueOrDefault(section, query_properties_key);
   std::string activation_threshold =
       GetValueOrDefault(section, activation_threshold_key);
-  // std::string use_wchar = GetValueOrDefault(section, use_wchar_key);
+  std::string use_wvarchar = GetValueOrDefault(section, use_wvarchar_key);
   std::string enable_session = GetValueOrDefault(section, enable_session_key);
   std::string htapi_activation_threshold_check =
       GetValueOrDefault(section, htapi_activation_threshold_check_key);
@@ -185,7 +185,7 @@ bool ConfigDSNInternal(HWND hwnd_parent, WORD f_request, LPCSTR lpsz_driver,
         {additional_projects_key, additional_projects},
         {query_properties_key, query_properties},
         {activation_threshold_key, activation_threshold},
-        // {use_wchar_key, use_wchar},
+        {use_wvarchar_key, use_wvarchar},
         {enable_session_key, enable_session},
         {max_threads_key, max_threads},
         {max_retries_key, max_retries},
@@ -244,7 +244,7 @@ bool ConfigDSNInternal(HWND hwnd_parent, WORD f_request, LPCSTR lpsz_driver,
     additional_projects = advance_form.GetAdditionalProjects();
     query_properties = advance_form.GetQueryProperties();
     activation_threshold = advance_form.GetActivationThreshold();
-    // use_wchar = advance_form.GetUseWchar();
+    use_wvarchar = advance_form.GetUseWVarChar();
     enable_session = advance_form.GetEnableSession();
     max_threads = advance_form.GetMaxThreads();
     max_retries = advance_form.GetMaxRetries();
diff --git a/google/cloud/odbc/bq_driver/odbc_windows.h b/google/cloud/odbc/bq_driver/odbc_windows.h
@@ -45,7 +45,7 @@ std::string const query_properties_key = "QueryProperties";
 std::string const max_threads_key = "MaxThreads";
 std::string const max_retries_key = "MaxRetries";
 std::string const activation_threshold_key = "HTAPI_ActivationThreshold";
-std::string const use_wchar_key = "UseWVarChar";
+std::string const use_wvarchar_key = "UseWVarChar";
 std::string const enable_session_key = "EnableSession";
 std::string const htapi_activation_threshold_check_key =
     "AllowHtapiForLargeResults";
diff --git a/google/cloud/odbc/integration_tests/odbc_driver_tests/statement_test.cc b/google/cloud/odbc/integration_tests/odbc_driver_tests/statement_test.cc
@@ -4211,4 +4211,108 @@ TEST(SQLMoreResults, ProcedureWithDescriptorAndQueryParams) {
   EXPECT_EQ(Disconnect(conn), SQL_SUCCESS);
 }
 
+TEST(StatementTest, UseWVarcharInsteadOfVarchar) {
+  auto conn = std::make_shared<ODBCHandles>();
+  std::string const conn_str = kDefaultConnectionString + ";UseWVarChar=1";
+  EXPECT_EQ(Connect(conn_str, conn, true), SQL_SUCCESS);
+
+  // create table
+  auto const table_name =
+      kDatasetWithTablePrefix + "ODBC_WVARCHAR_INSTEaD_OF_VARCHAR_TEST";
+  Table table(table_name);
+  table.CreateWithPrepare(conn, "(StringField STRING)");
+  EXPECT_EQ(Disconnect(conn), SQL_SUCCESS);
+
+  // insert data
+  EXPECT_EQ(Connect(conn_str, conn, true), SQL_SUCCESS);
+  auto query =
+      "INSERT INTO " + table_name + " VALUES ('Samplestringofsqlvarchar')";
+  EXPECT_EQ(ExecWithPrepare(conn, query), SQL_SUCCESS);
+  EXPECT_EQ(Disconnect(conn), SQL_SUCCESS);
+
+  std::string select_query = "SELECT StringField FROM " + table_name;
+  {
+    // Descriptor validation
+    EXPECT_EQ(Connect(conn_str, conn, true), SQL_SUCCESS);
+    EXPECT_EQ(ExecWithPrepare(conn, select_query), SQL_SUCCESS);
+
+    SQLHDESC ird = SQL_NULL_HDESC;
+    EXPECT_EQ(
+        SQLGetStmtAttr(conn->hstmt, SQL_ATTR_IMP_ROW_DESC, &ird, 0, nullptr),
+        SQL_SUCCESS);
+
+    SQLSMALLINT desc_type = 0;
+    EXPECT_EQ(SQLGetDescField(ird, 1, SQL_DESC_TYPE, &desc_type, 0, nullptr),
+              SQL_SUCCESS);
+    EXPECT_EQ(desc_type, SQL_WVARCHAR);
+
+    SQLSMALLINT concise_type = 0;
+    EXPECT_EQ(SQLGetDescField(ird, 1, SQL_DESC_CONCISE_TYPE, &concise_type, 0,
+                              nullptr),
+              SQL_SUCCESS);
+    EXPECT_EQ(concise_type, SQL_WVARCHAR);
+
+    SQLLEN octet_length = 0;
+    EXPECT_EQ(SQLGetDescField(ird, 1, SQL_DESC_OCTET_LENGTH, &octet_length, 0,
+                              nullptr),
+              SQL_SUCCESS);
+
+    EXPECT_GT(octet_length, 0);
+
+    SQLCHAR col_name[128] = {0};
+    SQLSMALLINT name_len = 0;
+    SQLSMALLINT type = 0;
+    SQLULEN column_size = 0;
+    SQLSMALLINT decimal_digits = 0;
+    SQLSMALLINT nullable = 0;
+    auto status =
+        SQLDescribeCol(conn->hstmt, 1, col_name, sizeof(col_name), &name_len,
+                       &type, &column_size, &decimal_digits, &nullable);
+    EXPECT_EQ(status, SQL_SUCCESS);
+    EXPECT_STREQ(reinterpret_cast<char*>(col_name), "StringField");
+    EXPECT_EQ(type, SQL_WVARCHAR);
+    EXPECT_GT(column_size, 0);
+    EXPECT_EQ(decimal_digits, 0);
+    EXPECT_EQ(nullable, SQL_NULLABLE);
+
+    // verify using SQLColAttribute
+    SQLLEN concis_type = 0;
+    EXPECT_EQ(SQLColAttribute(conn->hstmt, 1, SQL_DESC_CONCISE_TYPE, nullptr, 0,
+                              nullptr, &concis_type),
+              SQL_SUCCESS);
+    EXPECT_EQ(concis_type, SQL_WVARCHAR);
+    EXPECT_EQ(Disconnect(conn), SQL_SUCCESS);
+  }
+
+  {  // Test using SQLGetData
+    EXPECT_EQ(Connect(conn_str, conn, true), SQL_SUCCESS);
+    EXPECT_EQ(ExecWithPrepare(conn, select_query), SQL_SUCCESS);
+
+    SQLWCHAR buffer[256] = {0};
+    SQLLEN ind = 0;
+    EXPECT_EQ(SQLFetch(conn->hstmt), SQL_SUCCESS);
+    EXPECT_EQ(
+        SQLGetData(conn->hstmt, 1, SQL_C_WCHAR, buffer, sizeof(buffer), &ind),
+        SQL_SUCCESS);
+    EXPECT_GT(ind, 0);
+    EXPECT_EQ(Disconnect(conn), SQL_SUCCESS);
+  }
+
+  {
+    // Test using SQLBindCol
+    EXPECT_EQ(Connect(conn_str, conn, true), SQL_SUCCESS);
+    EXPECT_EQ(ExecWithPrepare(conn, select_query), SQL_SUCCESS);
+
+    SQLWCHAR bind_buffer[256] = {0};
+    SQLLEN bind_ind = 0;
+
+    EXPECT_EQ(SQLBindCol(conn->hstmt, 1, SQL_C_WCHAR, bind_buffer,
+                         sizeof(bind_buffer), &bind_ind),
+              SQL_SUCCESS);
+    EXPECT_EQ(SQLFetch(conn->hstmt), SQL_SUCCESS);
+    EXPECT_GT(bind_ind, 0);
+
+    EXPECT_EQ(Disconnect(conn), SQL_SUCCESS);
+  }
+}
 }  // namespace google::cloud::odbc_tests

Original file line number	Diff line number	Diff line change
`@@ -1189,12 +1189,12 @@ odbc_internal::StatusRecordOr<std::string> GetDataTypeInStr(BQDataType type) {`
`1189`	`1189`	`}`
`1190`	`1190`
`1191`	`1191`	`odbc_internal::StatusRecordOr<SQLSMALLINT> GetSQLDataType(`
`1192`		`- std::string const& type, bool isArray) {`
	`1192`	`+ std::string const& type, bool isArray, bool UseWvarchar) {`
`1193`	`1193`	`if (isArray) {`
`1194`	`1194`	`return SQL_VARCHAR;`
`1195`	`1195`	`}`
`1196`	`1196`	`if (type == "STRING") {`
`1197`		`- return SQL_VARCHAR;`
	`1197`	`+ return UseWvarchar ? SQL_WVARCHAR : SQL_VARCHAR;`
`1198`	`1198`	`}`
`1199`	`1199`	`if (type == "INTEGER" \|\| type == "INT64") {`
`1200`	`1200`	`return SQL_BIGINT;`