google-cloud-bigquery 3.24.0__tar.gz → 3.25.0__tar.gz

{google-cloud-bigquery-3.24.0/google_cloud_bigquery.egg-info → google-cloud-bigquery-3.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-cloud-bigquery
-Version: 3.24.0
+Version: 3.25.0
 Summary: Google BigQuery API client library
 Home-page: https://github.com/googleapis/python-bigquery
 Author: Google LLC

{google-cloud-bigquery-3.24.0 → google-cloud-bigquery-3.25.0}/google/cloud/bigquery/dbapi/connection.py

@@ -35,12 +35,18 @@ class Connection(object):
             A client that uses the faster BigQuery Storage API to fetch rows from
             BigQuery. If not passed, it is created using the same credentials
             as ``client`` (provided that BigQuery Storage dependencies are installed).
-
-            If both clients are available, ``bqstorage_client`` is used for
-            fetching query results.
+        prefer_bqstorage_client (Optional[bool]):
+            Prefer the BigQuery Storage client over the REST client. If Storage
+            client isn't available, fall back to the REST client. Defaults to
+            ``True``.
     """
 
-    def __init__(self, client=None, bqstorage_client=None):
+    def __init__(
+        self,
+        client=None,
+        bqstorage_client=None,
+        prefer_bqstorage_client=True,
+    ):
         if client is None:
             client = bigquery.Client()
             self._owns_client = True
@@ -49,7 +55,10 @@ class Connection(object):
 
         # A warning is already raised by the BQ Storage client factory factory if
         # instantiation fails, or if the given BQ Storage client instance is outdated.
-        if bqstorage_client is None:
+        if not prefer_bqstorage_client:
+            bqstorage_client = None
+            self._owns_bqstorage_client = False
+        elif bqstorage_client is None:
             bqstorage_client = client._ensure_bqstorage_client()
             self._owns_bqstorage_client = bqstorage_client is not None
         else:
@@ -95,7 +104,7 @@ class Connection(object):
         return new_cursor
 
 
-def connect(client=None, bqstorage_client=None):
+def connect(client=None, bqstorage_client=None, prefer_bqstorage_client=True):
     """Construct a DB-API connection to Google BigQuery.
 
     Args:
@@ -108,11 +117,12 @@ def connect(client=None, bqstorage_client=None):
             A client that uses the faster BigQuery Storage API to fetch rows from
             BigQuery. If not passed, it is created using the same credentials
             as ``client`` (provided that BigQuery Storage dependencies are installed).
-
-            If both clients are available, ``bqstorage_client`` is used for
-            fetching query results.
+        prefer_bqstorage_client (Optional[bool]):
+            Prefer the BigQuery Storage client over the REST client. If Storage
+            client isn't available, fall back to the REST client. Defaults to
+            ``True``.
 
     Returns:
         google.cloud.bigquery.dbapi.Connection: A new DB-API connection to BigQuery.
     """
-    return Connection(client, bqstorage_client)
+    return Connection(client, bqstorage_client, prefer_bqstorage_client)

{google-cloud-bigquery-3.24.0 → google-cloud-bigquery-3.25.0}/google/cloud/bigquery/job/load.py

@@ -32,6 +32,26 @@ from google.cloud.bigquery.job.base import _JobReference
 from google.cloud.bigquery.query import ConnectionProperty
 
 
+class ColumnNameCharacterMap:
+    """Indicates the character map used for column names.
+
+    https://cloud.google.com/bigquery/docs/reference/rest/v2/Job#columnnamecharactermap
+    """
+
+    COLUMN_NAME_CHARACTER_MAP_UNSPECIFIED = "COLUMN_NAME_CHARACTER_MAP_UNSPECIFIED"
+    """Unspecified column name character map."""
+
+    STRICT = "STRICT"
+    """Support flexible column name and reject invalid column names."""
+
+    V1 = "V1"
+    """	Support alphanumeric + underscore characters and names must start with
+    a letter or underscore. Invalid column names will be normalized."""
+
+    V2 = "V2"
+    """Support flexible column name. Invalid column names will be normalized."""
+
+
 class LoadJobConfig(_JobConfig):
     """Configuration options for load jobs.
 
@@ -597,6 +617,27 @@ class LoadJobConfig(_JobConfig):
         else:
             self._del_sub_prop("parquetOptions")
 
+    @property
+    def column_name_character_map(self) -> str:
+        """Optional[google.cloud.bigquery.job.ColumnNameCharacterMap]:
+        Character map supported for column names in CSV/Parquet loads. Defaults
+        to STRICT and can be overridden by Project Config Service. Using this
+        option with unsupported load formats will result in an error.
+
+        See
+        https://cloud.google.com/bigquery/docs/reference/rest/v2/Job#JobConfigurationLoad.FIELDS.column_name_character_map
+        """
+        return self._get_sub_prop(
+            "columnNameCharacterMap",
+            ColumnNameCharacterMap.COLUMN_NAME_CHARACTER_MAP_UNSPECIFIED,
+        )
+
+    @column_name_character_map.setter
+    def column_name_character_map(self, value: Optional[str]):
+        if value is None:
+            value = ColumnNameCharacterMap.COLUMN_NAME_CHARACTER_MAP_UNSPECIFIED
+        self._set_sub_prop("columnNameCharacterMap", value)
+
 
 class LoadJob(_AsyncJob):
     """Asynchronous job for loading data into a table.

{google-cloud-bigquery-3.24.0 → google-cloud-bigquery-3.25.0}/google/cloud/bigquery/job/query.py

@@ -1532,8 +1532,9 @@ class QueryJob(_AsyncJob):
         # Setting max_results should be equivalent to setting page_size with
         # regards to allowing the user to tune how many results to download
         # while we wait for the query to finish. See internal issue:
-        # 344008814.
-        if page_size is None and max_results is not None:
+        # 344008814. But if start_index is set, user is trying to access a
+        # specific page, so we don't need to set page_size. See issue #1950.
+        if page_size is None and max_results is not None and start_index is None:
             page_size = max_results
 
         # When timeout has default sentinel value ``object()``, do not pass

{google-cloud-bigquery-3.24.0 → google-cloud-bigquery-3.25.0}/google/cloud/bigquery/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.24.0"
+__version__ = "3.25.0"

{google-cloud-bigquery-3.24.0 → google-cloud-bigquery-3.25.0/google_cloud_bigquery.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-cloud-bigquery
-Version: 3.24.0
+Version: 3.25.0
 Summary: Google BigQuery API client library
 Home-page: https://github.com/googleapis/python-bigquery
 Author: Google LLC

{google-cloud-bigquery-3.24.0 → google-cloud-bigquery-3.25.0}/tests/system/test_client.py

@@ -1788,20 +1788,35 @@ class TestBigQuery(unittest.TestCase):
         # in the sorted order.
 
         expected_data = [
+            [
+                ("by", "pg"),
+                ("id", 1),
+                (
+                    "timestamp",
+                    datetime.datetime(
+                        2006, 10, 9, 18, 21, 51, tzinfo=datetime.timezone.utc
+                    ),
+                ),
+            ],
             [
                 ("by", "phyllis"),
                 ("id", 2),
-                ("timestamp", datetime.datetime(2006, 10, 9, 18, 30, 28, tzinfo=UTC)),
+                (
+                    "timestamp",
+                    datetime.datetime(
+                        2006, 10, 9, 18, 30, 28, tzinfo=datetime.timezone.utc
+                    ),
+                ),
             ],
             [
                 ("by", "phyllis"),
                 ("id", 3),
-                ("timestamp", datetime.datetime(2006, 10, 9, 18, 40, 33, tzinfo=UTC)),
-            ],
-            [
-                ("by", "onebeerdave"),
-                ("id", 4),
-                ("timestamp", datetime.datetime(2006, 10, 9, 18, 47, 42, tzinfo=UTC)),
+                (
+                    "timestamp",
+                    datetime.datetime(
+                        2006, 10, 9, 18, 40, 33, tzinfo=datetime.timezone.utc
+                    ),
+                ),
             ],
         ]
 

{google-cloud-bigquery-3.24.0 → google-cloud-bigquery-3.25.0}/tests/unit/job/test_load_config.py

@@ -843,3 +843,42 @@ class TestLoadJobConfig(_Base):
 
         config.parquet_options = None
         self.assertNotIn("parquetOptions", config._properties["load"])
+
+    def test_column_name_character_map_missing(self):
+        from google.cloud.bigquery.job.load import ColumnNameCharacterMap
+
+        config = self._get_target_class()()
+        self.assertEqual(
+            config.column_name_character_map,
+            ColumnNameCharacterMap.COLUMN_NAME_CHARACTER_MAP_UNSPECIFIED,
+        )
+
+    def test_column_name_character_map_hit(self):
+        from google.cloud.bigquery.job.load import ColumnNameCharacterMap
+
+        config = self._get_target_class()()
+        config._properties["load"]["columnNameCharacterMap"] = "STRICT"
+        self.assertEqual(
+            config.column_name_character_map,
+            ColumnNameCharacterMap.STRICT,
+        )
+
+    def test_column_name_character_map_setter(self):
+        from google.cloud.bigquery.job.load import ColumnNameCharacterMap
+
+        config = self._get_target_class()()
+        config.column_name_character_map = "V1"
+        self.assertEqual(
+            config._properties["load"]["columnNameCharacterMap"],
+            ColumnNameCharacterMap.V1,
+        )
+
+    def test_column_name_character_map_none(self):
+        from google.cloud.bigquery.job.load import ColumnNameCharacterMap
+
+        config = self._get_target_class()()
+        config.column_name_character_map = None
+        self.assertEqual(
+            config._properties["load"]["columnNameCharacterMap"],
+            ColumnNameCharacterMap.COLUMN_NAME_CHARACTER_MAP_UNSPECIFIED,
+        )

{google-cloud-bigquery-3.24.0 → google-cloud-bigquery-3.25.0}/tests/unit/job/test_query.py

@@ -1652,7 +1652,17 @@ class TestQueryJob(_Base):
 
         start_index = 1
 
-        result = job.result(start_index=start_index)
+        # Verifies that page_size isn't overwritten by max_results when
+        # start_index is not None. See
+        # https://github.com/googleapis/python-bigquery/issues/1950
+        page_size = 10
+        max_results = 100
+
+        result = job.result(
+            page_size=page_size,
+            max_results=max_results,
+            start_index=start_index,
+        )
 
         self.assertIsInstance(result, RowIterator)
         self.assertEqual(result.total_rows, 5)
@@ -1665,6 +1675,9 @@ class TestQueryJob(_Base):
         self.assertEqual(
             tabledata_list_request[1]["query_params"]["startIndex"], start_index
         )
+        self.assertEqual(
+            tabledata_list_request[1]["query_params"]["maxResults"], page_size
+        )
 
     def test_result_error(self):
         from google.cloud import exceptions

{google-cloud-bigquery-3.24.0 → google-cloud-bigquery-3.25.0}/tests/unit/test_dbapi_connection.py

@@ -122,6 +122,26 @@ class TestConnection(unittest.TestCase):
         self.assertIs(connection._client, mock_client)
         self.assertIs(connection._bqstorage_client, mock_bqstorage_client)
 
+    def test_connect_prefer_bqstorage_client_false(self):
+        pytest.importorskip("google.cloud.bigquery_storage")
+        from google.cloud.bigquery.dbapi import connect
+        from google.cloud.bigquery.dbapi import Connection
+
+        mock_client = self._mock_client()
+        mock_bqstorage_client = self._mock_bqstorage_client()
+        mock_client._ensure_bqstorage_client.return_value = mock_bqstorage_client
+
+        connection = connect(
+            client=mock_client,
+            bqstorage_client=mock_bqstorage_client,
+            prefer_bqstorage_client=False,
+        )
+
+        mock_client._ensure_bqstorage_client.assert_not_called()
+        self.assertIsInstance(connection, Connection)
+        self.assertIs(connection._client, mock_client)
+        self.assertIs(connection._bqstorage_client, None)
+
     def test_raises_error_if_closed(self):
         from google.cloud.bigquery.dbapi.exceptions import ProgrammingError