From fcb0bc68c972c2c98bb8542f54e9228308177ecb Mon Sep 17 00:00:00 2001
From: Jim Fulton <jim@jimfulton.info>
Date: Tue, 31 Aug 2021 16:56:40 -0600
Subject: [PATCH] fix: underscores weren't allowed in struct field names when
 passing parameters to the DB API (#930)

---
 google/cloud/bigquery/dbapi/_helpers.py | 2 +-
 google/cloud/bigquery/dbapi/cursor.py   | 2 +-
 tests/unit/test_dbapi__helpers.py       | 8 ++++----
 tests/unit/test_dbapi_cursor.py         | 4 ++++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/google/cloud/bigquery/dbapi/_helpers.py b/google/cloud/bigquery/dbapi/_helpers.py
index 9c134b47c..72e711bcf 100644
--- a/google/cloud/bigquery/dbapi/_helpers.py
+++ b/google/cloud/bigquery/dbapi/_helpers.py
@@ -173,7 +173,7 @@ def _parse_type(
         \s*
         (ARRAY|STRUCT|RECORD)  # Type
         \s*
-        <([A-Z0-9<> ,()]+)>      # Subtype(s)
+        <([A-Z0-9_<> ,()]+)>   # Subtype(s)
         \s*$
         """,
         re.IGNORECASE | re.VERBOSE,
diff --git a/google/cloud/bigquery/dbapi/cursor.py b/google/cloud/bigquery/dbapi/cursor.py
index 587598d5f..b1239ff57 100644
--- a/google/cloud/bigquery/dbapi/cursor.py
+++ b/google/cloud/bigquery/dbapi/cursor.py
@@ -494,7 +494,7 @@ def _extract_types(
         ([^:)]*)      # name
         (?::          # ':' introduces type
           (             # start of type group
-            [a-zA-Z0-9<>, ]+  # First part, no parens
+            [a-zA-Z0-9_<>, ]+ # First part, no parens
 
             (?:               # start sets of parens + non-paren text
               \([0-9 ,]+\)      # comma-separated groups of digits in parens
diff --git a/tests/unit/test_dbapi__helpers.py b/tests/unit/test_dbapi__helpers.py
index b33203354..5965a4817 100644
--- a/tests/unit/test_dbapi__helpers.py
+++ b/tests/unit/test_dbapi__helpers.py
@@ -612,8 +612,8 @@ def test_complex_query_parameter_type_errors(type_, value, expect):
     "parameters,parameter_types,expect",
     [
         (
-            [[], dict(name="ch1", bdate=datetime.date(2021, 1, 1))],
-            ["ARRAY<INT64>", "struct<name string, bdate date>"],
+            [[], dict(name="ch1", b_date=datetime.date(2021, 1, 1))],
+            ["ARRAY<INT64>", "struct<name string, b_date date>"],
             [
                 {
                     "parameterType": {"arrayType": {"type": "INT64"}, "type": "ARRAY"},
@@ -623,13 +623,13 @@ def test_complex_query_parameter_type_errors(type_, value, expect):
                     "parameterType": {
                         "structTypes": [
                             {"name": "name", "type": {"type": "STRING"}},
-                            {"name": "bdate", "type": {"type": "DATE"}},
+                            {"name": "b_date", "type": {"type": "DATE"}},
                         ],
                         "type": "STRUCT",
                     },
                     "parameterValue": {
                         "structValues": {
-                            "bdate": {"value": "2021-01-01"},
+                            "b_date": {"value": "2021-01-01"},
                             "name": {"value": "ch1"},
                         }
                     },
diff --git a/tests/unit/test_dbapi_cursor.py b/tests/unit/test_dbapi_cursor.py
index 026810aaf..cb55da889 100644
--- a/tests/unit/test_dbapi_cursor.py
+++ b/tests/unit/test_dbapi_cursor.py
@@ -809,6 +809,10 @@ def test__format_operation_no_placeholders(self):
             "values(%%%%%(foo:INT64)s, %(bar)s)",
             ("values(%%%%%(foo)s, %(bar)s)", dict(foo="INT64")),
         ),
+        (
+            "values(%%%%%(foo:struct<x_1 string, y_ int64>)s, %(bar)s)",
+            ("values(%%%%%(foo)s, %(bar)s)", dict(foo="struct<x_1 string, y_ int64>")),
+        ),
         (
             "values(%%%%%(foo:struct<x string, y int64>)s, %(bar)s)",
             ("values(%%%%%(foo)s, %(bar)s)", dict(foo="struct<x string, y int64>")),