[
https://issues.apache.org/jira/browse/AIRFLOW-3355?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16690077#comment-16690077
]
ASF GitHub Bot commented on AIRFLOW-3355:
-----------------------------------------
kaxil closed pull request #4198: [AIRFLOW-3355] Fix BigQueryCursor.execute to
work with Python3
URL: https://github.com/apache/incubator-airflow/pull/4198
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/airflow/contrib/hooks/bigquery_hook.py
b/airflow/contrib/hooks/bigquery_hook.py
index d300dbe6b7..98e66c405c 100644
--- a/airflow/contrib/hooks/bigquery_hook.py
+++ b/airflow/contrib/hooks/bigquery_hook.py
@@ -25,6 +25,7 @@
import time
from builtins import range
from copy import deepcopy
+from six import iteritems
from past.builtins import basestring
@@ -1683,7 +1684,7 @@ def _bind_parameters(operation, parameters):
""" Helper method that binds parameters to a SQL query. """
# inspired by MySQL Python Connector (conversion.py)
string_parameters = {}
- for (name, value) in parameters.iteritems():
+ for (name, value) in iteritems(parameters):
if value is None:
string_parameters[name] = 'NULL'
elif isinstance(value, basestring):
diff --git a/tests/contrib/hooks/test_bigquery_hook.py
b/tests/contrib/hooks/test_bigquery_hook.py
index 8f350ff2ee..82bd00e4f4 100644
--- a/tests/contrib/hooks/test_bigquery_hook.py
+++ b/tests/contrib/hooks/test_bigquery_hook.py
@@ -295,6 +295,14 @@ def test_duplication_check(self):
"key_one", key_one, {"key_one": True}))
+class TestBigQueryCursor(unittest.TestCase):
+ @mock.patch.object(hook.BigQueryBaseCursor, 'run_with_configuration')
+ def test_execute_with_parameters(self, mocked_rwc):
+ hook.BigQueryCursor("test", "test").execute(
+ "SELECT %(foo)s", {"foo": "bar"})
+ mocked_rwc.assert_called_once()
+
+
class TestLabelsInRunJob(unittest.TestCase):
@mock.patch.object(hook.BigQueryBaseCursor, 'run_with_configuration')
def test_run_query_with_arg(self, mocked_rwc):
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Fix BigQueryCursor.execute to work with Python3
> -----------------------------------------------
>
> Key: AIRFLOW-3355
> URL: https://issues.apache.org/jira/browse/AIRFLOW-3355
> Project: Apache Airflow
> Issue Type: Bug
> Components: gcp, hooks
> Reporter: Kengo Seki
> Assignee: Kengo Seki
> Priority: Major
> Fix For: 2.0.0
>
>
> {{BigQueryCursor.execute}} uses {{dict.iteritems}} internally, so it fails
> with Python3 if binding parameters are provided.
> {code}
> In [1]: import sys
> In [2]: sys.version
> Out[2]: '3.6.6 (default, Sep 12 2018, 18:26:19) \n[GCC 8.0.1 20180414
> (experimental) [trunk revision 259383]]'
> In [3]: from airflow.contrib.hooks.bigquery_hook import BigQueryHook
> In [4]: hook = BigQueryHook()
> In [5]: conn = hook.get_conn()
> [2018-11-15 19:01:35,856] {discovery.py:267} INFO - URL being requested: GET
> https://www.googleapis.com/discovery/v1/apis/bigquery/v2/rest
> In [6]: cur = conn.cursor()
> In [7]: cur.execute("SELECT count(*) FROM ds.t WHERE c = %(v)d", {"v": 0})
> ---------------------------------------------------------------------------
> AttributeError Traceback (most recent call last)
> <ipython-input-7-54c59af50270> in <module>
> ----> 1 cur.execute("SELECT count(*) FROM ds.t WHERE c = %(v)d", {"v": 0})
> ~/dev/incubator-airflow/airflow/contrib/hooks/bigquery_hook.py in
> execute(self, operation, parameters)
> 1561 """
> 1562 sql = _bind_parameters(operation,
> -> 1563 parameters) if parameters else
> operation
> 1564 self.job_id = self.run_query(sql)
> 1565
> ~/dev/incubator-airflow/airflow/contrib/hooks/bigquery_hook.py in
> _bind_parameters(operation, parameters)
> 1684 # inspired by MySQL Python Connector (conversion.py)
> 1685 string_parameters = {}
> -> 1686 for (name, value) in parameters.iteritems():
> 1687 if value is None:
> 1688 string_parameters[name] = 'NULL'
> AttributeError: 'dict' object has no attribute 'iteritems'
> {code}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
