Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add %%bqsql as an alias to the %%bigquery magic #72

Merged
merged 1 commit into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,15 @@ Perform a query
GROUP BY name
ORDER BY count DESC
LIMIT 3

Since BigQuery supports Python via BigQuery DataFrames, `%%bqsql` is offered as
an alias to clarify the language of these cells.

.. code:: python

%%bqsql
SELECT name, SUM(number) as count
FROM 'bigquery-public-data.usa_names.usa_1910_current'
GROUP BY name
ORDER BY count DESC
LIMIT 3
1 change: 1 addition & 0 deletions bigquery_magics/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ def load_ipython_extension(ipython):
ipython.register_magic_function(
_cell_magic, magic_kind="cell", magic_name="bigquery"
)
ipython.register_magic_function(_cell_magic, magic_kind="cell", magic_name="bqsql")


__all__ = (
Expand Down
9 changes: 5 additions & 4 deletions bigquery_magics/bigquery.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

"""IPython Magics

.. function:: %%bigquery
.. function:: ``%%bigquery`` or ``%%bqsql``

IPython cell magic to run a query and display the result as a DataFrame

.. code-block:: python

%%bigquery [<destination_var>] [--project <project>] [--use_legacy_sql]
%%bqsql [<destination_var>] [--project <project>] [--use_legacy_sql]
[--verbose] [--params <params>]
<query>

Expand Down Expand Up @@ -74,11 +74,12 @@
fully-qualified table ID, and the latter's data will be fetched.

Returns:
A :class:`pandas.DataFrame` with the query results.
A :class:`pandas.DataFrame` or :class:`bigframes.pandas.DataFrame`
with the query results, depending on the ``engine`` chosen.

.. note::
All queries run using this magic will run using the context
:attr:`~google.cloud.bigquery.magics.Context.credentials`.
:attr:`~bigquery_magics.config.Context.credentials`.
"""

from __future__ import print_function
Expand Down
10 changes: 8 additions & 2 deletions docs/magics.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ in a Jupyter notebook cell.

%load_ext bigquery_magics

This makes the ``%%bigquery`` magic available.
This makes the ``%%bigquery`` and ``%%bqsql`` magics available.

Code Samples
------------
Expand All @@ -30,5 +30,11 @@ Running a parameterized query:
API Reference
-------------

.. automodule:: google.cloud.bigquery.magics.magics
.. automodule:: bigquery_magics.bigquery
:members:

Configuration
~~~~~~~~~~~~~

.. automodule:: bigquery_magics.config
:members:
11 changes: 9 additions & 2 deletions tests/unit/test_bigquery.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,13 +395,20 @@ def test__create_dataset_if_necessary_not_exist():
client.create_dataset.assert_called_once()


@pytest.mark.parametrize(
("magic_name",),
(
("bigquery",),
("bqsql",),
),
)
@pytest.mark.usefixtures("ipython_interactive")
def test_extension_load():
def test_extension_load(magic_name):
ip = IPython.get_ipython()
ip.extension_manager.load_extension("bigquery_magics")

# verify that the magic is registered and has the correct source
magic = ip.magics_manager.magics["cell"].get("bigquery")
magic = ip.magics_manager.magics["cell"].get(magic_name)
assert magic.__module__ == "bigquery_magics.bigquery"


Expand Down
Loading