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

Add browsing data sample #201

Merged
merged 5 commits into from
Sep 4, 2016
Merged
Show file tree
Hide file tree
Changes from 4 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
39 changes: 25 additions & 14 deletions bigquery/system-test/tables.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,17 @@ describe('bigquery:tables', function () {
});

after(function (done) {
// Delete srcDataset
bigquery.dataset(srcDataset).delete({ force: true }, function () {
// Delete destDataset
bigquery.dataset(destDataset).delete({ force: true }, function () {
// Delete files
storage.bucket(options.bucket).deleteFiles({ force: true }, function (err) {
if (err) {
return done(err);
}
// Delete bucket
setTimeout(function () {
storage.bucket(options.bucket).delete(done);
}, 2000);
});
// Delete testing dataset/table
bigquery.dataset(options.dataset).delete({ force: true }, function () {
// Delete files
storage.bucket(options.bucket).deleteFiles({ force: true }, function (err) {
if (err) {
return done(err);
}
// Delete bucket
setTimeout(function () {
storage.bucket(options.bucket).delete(done);
}, 2000);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why these changes? Don't we still need to delete both srcDataset and destDataset?

});
});
});
Expand Down Expand Up @@ -191,6 +188,20 @@ describe('bigquery:tables', function () {
});
});

describe('browseRows', function () {
it('should display rows in a table', function (done) {
program.browseRows(options.dataset, options.table, function (err, rows) {
assert.equal(err, null);
assert.notEqual(rows, null);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're asserting that rows is an array (asserting a type), then I think it's redundant to assert that rows is not null (asserting a type).

assert.equal(Array.isArray(rows), true);
assert.equal(rows.length > 0, true);
assert.equal(console.log.calledOnce, true);
assert.deepEqual(console.log.firstCall.args, ['Found %d row(s)!', rows.length]);
done();
});
});
});

describe('deleteTable', function () {
it('should delete table', function (done) {
program.deleteTable(options, function (err) {
Expand Down
23 changes: 22 additions & 1 deletion bigquery/tables.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,19 @@ function listTables (options, callback) {
}
// [END list_tables]

function browseRows (dataset, table, callback) {
var bigquery = BigQuery();
var tableObj = bigquery.dataset(dataset).table(table);
tableObj.getRows(function (err, rows) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a space between tableObj and table.getRows for readability. Also, add the following above tableObject.getRows:

// See https://googlecloudplatform.github.io/google-cloud-node/#/docs/bigquery/latest/bigquery/table?method=getRows

if (err) {
return callback(err);
}

console.log('Found %d row(s)!', rows.length);
return callback(null, rows);
});
}

// [START delete_table]
/**
* Deletes a table with the specified name from the specified dataset.
Expand Down Expand Up @@ -236,6 +249,7 @@ var fs = require('fs');
var program = module.exports = {
createTable: createTable,
listTables: listTables,
browseRows: browseRows,
deleteTable: deleteTable,
importFile: importFile,
exportTableToGCS: exportTableToGCS,
Expand Down Expand Up @@ -270,6 +284,9 @@ cli
);
}
)
.command('browse <dataset> <table>', 'List the rows in a BigQuery table.', {}, function (options) {
program.browseRows(options.dataset, options.table, utils.makeHandler());
})
.command('import <dataset> <table> <file>', 'Import data from a local file or a Google Cloud Storage file into BigQuery.', {
bucket: {
alias: 'b',
Expand Down Expand Up @@ -331,6 +348,10 @@ cli
'node $0 list my_dataset',
'List tables in "my_dataset".'
)
.example(
'node $0 browse my_dataset my_table',
'Display rows from "my_table" in "my_dataset".'
)
.example(
'node $0 delete my_dataset my_table',
'Delete "my_table" from "my_dataset".'
Expand Down Expand Up @@ -363,7 +384,7 @@ cli
'node $0 copy src_dataset src_table dest_dataset dest_table',
'Copy src_dataset:src_table to dest_dataset:dest_table.'
)
.wrap(100)
.wrap(120)
.recommendCommands()
.epilogue('For more information, see https://cloud.google.com/bigquery/docs');

Expand Down
42 changes: 40 additions & 2 deletions bigquery/test/tables.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ function getSample () {
var tableMock = {
export: sinon.stub().yields(null, jobMock),
copy: sinon.stub().yields(null, jobMock),
delete: sinon.stub().yields(null),
import: sinon.stub().yields(null, jobMock),
insert: sinon.stub().yields(null, errorList)
insert: sinon.stub().yields(null, errorList),
getRows: sinon.stub().yields(null, jsonArray),
delete: sinon.stub().yields(null)
};
var datasetMock = {
table: sinon.stub().returns(tableMock),
Expand Down Expand Up @@ -185,6 +186,34 @@ describe('bigquery:tables', function () {
});
});

describe('browseRows', function () {
it('should display rows', function () {
var sample = getSample();
var callback = sinon.stub();

sample.program.browseRows(dataset, table, callback);

assert.equal(sample.mocks.table.getRows.calledOnce, true);
assert.deepEqual(sample.mocks.table.getRows.firstCall.args.slice(0, -1), []);
assert.equal(callback.calledOnce, true);
assert.deepEqual(callback.firstCall.args, [null, jsonArray]);
assert.equal(console.log.calledOnce, true);
assert.deepEqual(console.log.firstCall.args, ['Found %d row(s)!', jsonArray.length]);
});

it('should handle error', function () {
var error = new Error('error');
var sample = getSample();
var callback = sinon.stub();
sample.mocks.table.getRows.yields(error);

sample.program.browseRows(dataset, table, callback);

assert.equal(callback.calledOnce, true);
assert.deepEqual(callback.firstCall.args, [error]);
});
});

describe('deleteTable', function () {
it('should delete a table', function () {
var sample = getSample();
Expand Down Expand Up @@ -400,6 +429,15 @@ describe('bigquery:tables', function () {
assert.deepEqual(program.listTables.firstCall.args.slice(0, -1), [{ dataset: dataset }]);
});

it('should call browseRows', function () {
var program = getSample().program;
program.browseRows = sinon.stub();

program.main(['browse', dataset, table]);
assert.equal(program.browseRows.calledOnce, true);
assert.deepEqual(program.browseRows.firstCall.args.slice(0, -1), [dataset, table]);
});

it('should call deleteTable', function () {
var program = getSample().program;
program.deleteTable = sinon.stub();
Expand Down