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.

Sign up for GitHub

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

Jump to bottom

return Total Rows #431

Closed
wants to merge 7 commits into from
Closed

return Total Rows #431

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26bca6b
return totalRows
sunnychow Mar 5, 2015
854efc5
repoistory
sunnychow Mar 5, 2015
aceae60
Revert "repoistory"
sunnychow Mar 6, 2015
6e34ca8
fix no jobReference when job is not completed
sunnychow Mar 6, 2015
79cdf5c
resp
sunnychow Mar 6, 2015
e745f51
rows
sunnychow Mar 7, 2015
f8f4d71
formatting
sunnychow Mar 7, 2015
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
41 changes: 20 additions & 21 deletions lib/bigquery/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,28 +391,27 @@ BigQuery.prototype.query = function(options, callback) {
return;
}

var job = that.job(resp.jobReference.jobId);
var nextQuery = null;
var rows = Table.mergeSchemaWithRows_(resp.schema, resp.rows || []);

if (resp.jobComplete === false) {
// Query is still running.
nextQuery = extend({
job: job
}, options);
} else if (resp.pageToken) {
// More results exist.
nextQuery = extend({
job: job
}, options, {
pageToken: resp.pageToken
});
}

onComplete(null, rows, nextQuery);
var nextQuery = null;
var rows = Table.mergeSchemaWithRows_(resp.schema, resp.rows || []);

if (resp.jobComplete === false) {
// Query is still running.
nextQuery = extend({
job: that.job(options.job.id)
}, options);
} else if (resp.pageToken) {
// More results exist.
nextQuery = extend({
job: that.job(resp.jobReference.jobId)
}, options, {
pageToken: resp.pageToken
});
}

onComplete(null, rows, nextQuery, resp);
}

function onComplete(err, rows, nextQuery) {
function onComplete(err, rows, nextQuery, resp) {
if (err) {
if (stream) {
stream.emit('error', err);
Expand All @@ -434,7 +433,7 @@ BigQuery.prototype.query = function(options, callback) {
stream.end();
}
} else {
callback(null, rows, nextQuery);
callback(null, rows, nextQuery, resp);
}
}
}
Expand Down