Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Changes the behavior of BigQueryImpl's getTableId #3873

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

Merged
JesseLovelace merged 1 commit into from
Oct 30, 2018
Merged

Changes the behavior of BigQueryImpl's getTableId #3873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion ...d-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import com.google.cloud.bigquery.spi.v2.BigQueryRpc;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Strings;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
Expand Down Expand Up @@ -401,7 +402,12 @@ public Table getTable(final String datasetId, final String tableId, TableOption.

@Override
public Table getTable(TableId tableId, TableOption... options) {
final TableId completeTableId = tableId.setProjectId(getOptions().getProjectId());
// More context about why this: https://github.com/googleapis/google-cloud-java/issues/3808
final TableId completeTableId = tableId.setProjectId(
Strings.isNullOrEmpty(tableId.getProject())
? getOptions().getProjectId()
: tableId.getProject()
);
final Map<BigQueryRpc.Option, ?> optionsMap = optionMap(options);
try {
com.google.api.services.bigquery.model.Table answer =
Expand Down
14 changes: 14 additions & 0 deletions ...ients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,20 @@ public void testGetTableFromTableIdWithProject() {
assertEquals(new Table(bigquery, new TableInfo.BuilderImpl(tableInfo)), table);
}

@Test
public void testGetTableFromTableIdWithoutProject() {
TableInfo tableInfo = TABLE_INFO.setProjectId(PROJECT);
TableId tableId = TableId.of("", TABLE_ID.getDataset(), TABLE_ID.getTable());
EasyMock.expect(bigqueryRpcMock.getTable(PROJECT, DATASET, TABLE, EMPTY_RPC_OPTIONS))
.andReturn(tableInfo.toPb());
EasyMock.replay(bigqueryRpcMock);
BigQueryOptions bigQueryOptions =
createBigQueryOptionsForProject(PROJECT, rpcFactoryMock);
bigquery = bigQueryOptions.getService();
Table table = bigquery.getTable(tableId);
assertEquals(new Table(bigquery, new TableInfo.BuilderImpl(tableInfo)), table);
}

@Test
public void testGetTableWithSelectedFields() {
Capture<Map<BigQueryRpc.Option, Object>> capturedOptions = Capture.newInstance();
Expand Down