Merge branch 'master' of github.com:getredash/redash

Author: arikfr

redash/query_runner/big_query.py

@@ -116,7 +116,6 @@ def configuration_schema(cls):
                 'location': {
                     "type": "string",
                     "title": "Processing Location",
-                    "default": "US",
                 },
                 'loadSchema': {
                     "type": "boolean",
@@ -154,15 +153,17 @@ def _get_project_id(self):
         return self.configuration["projectId"]
 
     def _get_location(self):
-        return self.configuration.get("location", "US")
+        return self.configuration.get("location")
 
     def _get_total_bytes_processed(self, jobs, query):
         job_data = {
             "query": query,
             "dryRun": True,
-            'location': self._get_location()
         }
 
+        if self._get_location():
+            job_data['location'] = self._get_location()
+
         if self.configuration.get('useStandardSql', False):
             job_data['useLegacySql'] = False
 
@@ -178,9 +179,11 @@ def _get_query_result(self, jobs, query):
                 }
             }
         }
-        job_data['jobReference'] = {
+
+        if self._get_location():
+            job_data['jobReference'] = {
                 'location': self._get_location()
-        }
+            }
 
         if self.configuration.get('useStandardSql', False):
             job_data['configuration']['query']['useLegacySql'] = False
@@ -207,10 +210,17 @@ def _get_query_result(self, jobs, query):
                 rows.append(transform_row(row, query_reply["schema"]["fields"]))
 
             current_row += len(query_reply['rows'])
-            query_reply = jobs.getQueryResults(projectId=project_id,
-                                               location=self._get_location(),
-                                               jobId=query_reply['jobReference']['jobId'],
-                                               startIndex=current_row).execute()
+
+            query_result_request = {
+                'projectId': project_id,
+                'jobId': query_reply['jobReference']['jobId'],
+                'startIndex': current_row
+            }
+
+            if self._get_location():
+                query_result_request['location'] = self._get_location()
+
+            query_reply = jobs.getQueryResults(**query_result_request).execute()
 
         columns = [{'name': f["name"],
                     'friendly_name': f["name"],