impl(bq_driver): add sql_wvarchar impl

Author: Khushikathuria008

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

@@ -56,7 +56,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_;
@@ -76,7 +76,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";
@@ -359,21 +359,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);
 
@@ -382,11 +381,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);
 
@@ -410,12 +409,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);
 }
@@ -628,11 +627,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) ==
@@ -785,8 +783,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);
@@ -809,7 +806,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();
@@ -837,7 +834,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;

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_;

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();

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"];

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;
 

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);

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;

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>

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:: "

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;