Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
55bf05c
Added udf_resource_uri parameter to read_gbq
necnec Nov 25, 2016
dad9288
Change parameter to kwargs
necnec Nov 28, 2016
9a16a8c
Merge branch 'bigquery-udf-resources'
necnec Nov 28, 2016
f9fae0c
Fix formatting
necnec Nov 28, 2016
42dc9e6
Merge remote-tracking branch 'origin/bigquery-udf-resources'
necnec Nov 28, 2016
c66169d
add read_gbq tests: query parameters and cache
necnec Nov 28, 2016
a96811d
add unit tests read_gbq: query parameters, cache
necnec Nov 28, 2016
ad35a43
fix whatsnew text
necnec Nov 28, 2016
ddb4fd1
Merge branch 'bigquery-udf-resources'
necnec Nov 28, 2016
94fa514
test formatting
necnec Nov 29, 2016
d69ed7f
check tests
necnec Nov 29, 2016
834a2ff
Merge branch 'bigquery-udf-resources'
necnec Nov 29, 2016
640be7a
Change whatnew 0.19.0->0.19.2
necnec Nov 30, 2016
b849300
Change whatsnew 0.19.2 -> 0.20.0
necnec Nov 30, 2016
a952710
Move whatsnew BQ Enhancements -> Enhancements
necnec Dec 2, 2016
0b365da
delete newlines
necnec Dec 2, 2016
c199935
Make query configuration more general
necnec Dec 5, 2016
028c8be
Solve formating problems
necnec Dec 5, 2016
ce8ebe4
Merge branch 'bigquery-udf-resources'
necnec Dec 5, 2016
146f0f3
Merge branch 'master' into bigquery-udf-resources
necnec Dec 5, 2016
8fe77b2
Merge branch 'bigquery-udf-resources'
necnec Dec 5, 2016
c21588a
Merge remote-tracking branch 'pandas-dev/master' into bigquery-udf-re…
necnec Dec 12, 2016
395c0e9
fix formatting
necnec Dec 12, 2016
8a38650
Added example configuration & job_configuration refactoring
necnec Dec 12, 2016
929ad1a
formatting: delete whitespace
necnec Dec 13, 2016
86ed96d
Merge branch 'master' into bigquery-udf-resources
necnec Dec 13, 2016
0ac26a2
added pull request number in whitens
necnec Dec 14, 2016
99521aa
Formatting, documentation, new unit test
necnec Dec 21, 2016
df5dec6
configuration->config & formatting
necnec Dec 22, 2016
8720b03
Delete trailing whitespaces
necnec Dec 22, 2016
ec590af
Throw exception if more than 1 job type in config
necnec Dec 29, 2016
2e02d76
Merge remote-tracking branch 'pandas-dev/master' into bigquery-udf-re…
necnec Dec 29, 2016
e2f801f
hotfix
Dec 29, 2016
b97a1be
formatting
necnec Dec 30, 2016
82f4409
Add some documentation & formatting
necnec Jan 2, 2017
3a238a5
config->configuration
necnec Jan 3, 2017
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
Prev Previous commit
Next Next commit
hotfix
  • Loading branch information
Dmitry committed Dec 29, 2016
commit e2f801f83a8d9d12b407d90bc8b0384adf4d1867
2 changes: 1 addition & 1 deletion pandas/io/gbq.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ def run_query(self, query, **kwargs):
if config is not None:
if len(config) != 1:
raise ValueError("Only one job type must be specified, "
"but given {}".format(','.join(config.keys()))
"but given {}".format(','.join(config.keys())))
if 'query' in config:
if 'query' in config['query'] and query is not None:
raise ValueError("Query statement can't be specified "
Expand Down