---

Praful Makani · chingor13 · commit 2120c6dff7c6 · 2018-11-29T16:55:10.000-08:00
yaml --- r: 11417 b: refs/heads/autosynth-logging c: e53621b h: refs/heads/master i: 11415: 139be4f
diff --git a/[refs] b/[refs]
@@ -105,7 +105,7 @@ refs/tags/v0.61.0: e4b526656bb1bf5eefd0ee578b7405147821225e
 refs/tags/v0.62.0: bbede7385d48ba08f487bdd29ec10668ace96396
 refs/heads/0.60.0-alpha: 10939381ffe0b8da32db4fe3087c86e3aa7f3e55
 refs/heads/autosynth-dlp: b09fbe4790ce98bd3c91d8061e488276836ad60b
-refs/heads/autosynth-logging: 8da11b0dc3acf69fa8a060b0877f89efbe1f2117
+refs/heads/autosynth-logging: e53621bd2d9e1bfe1b24677c43c86f0e4cf0bce0
 refs/heads/dupes: 3478c5d81fd242d0e985656645a679420a2060c2
 refs/tags/v0.63.0: 94f19b71d40f46b36120e7b9d78a1a3d41bfcbd6
 refs/tags/v0.64.0: 456e8fbd129deced3ca025f239a2d8a82bde1d0a
diff --git a/branches/autosynth-logging/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/branches/autosynth-logging/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
@@ -161,7 +161,12 @@ public com.google.api.services.bigquery.model.Dataset call() {
   @Override
   public Table create(TableInfo tableInfo, TableOption... options) {
     final com.google.api.services.bigquery.model.Table tablePb =
-        tableInfo.setProjectId(getOptions().getProjectId()).toPb();
+        tableInfo
+            .setProjectId(
+                Strings.isNullOrEmpty(tableInfo.getTableId().getProject())
+                    ? getOptions().getProjectId()
+                    : tableInfo.getTableId().getProject())
+            .toPb();
     final Map<BigQueryRpc.Option, ?> optionsMap = optionMap(options);
     try {
       return Table.fromPb(this,
@@ -345,7 +350,11 @@ public boolean delete(String datasetId, String tableId) {
 
   @Override
   public boolean delete(TableId tableId) {
-    final TableId completeTableId = tableId.setProjectId(getOptions().getProjectId());
+    final TableId completeTableId = tableId.setProjectId(
+        Strings.isNullOrEmpty(tableId.getProject())
+            ? getOptions().getProjectId()
+            : tableId.getProject()
+    );
     try {
       return runWithRetries(new Callable<Boolean>() {
         @Override
@@ -380,7 +389,12 @@ public com.google.api.services.bigquery.model.Dataset call() {
   @Override
   public Table update(TableInfo tableInfo, TableOption... options) {
     final com.google.api.services.bigquery.model.Table tablePb =
-        tableInfo.setProjectId(getOptions().getProjectId()).toPb();
+        tableInfo
+            .setProjectId(
+                Strings.isNullOrEmpty(tableInfo.getTableId().getProject())
+                    ? getOptions().getProjectId()
+                    : tableInfo.getTableId().getProject())
+            .toPb();
     final Map<BigQueryRpc.Option, ?> optionsMap = optionMap(options);
     try {
       return Table.fromPb(this,
diff --git a/branches/autosynth-logging/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/branches/autosynth-logging/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
@@ -552,6 +552,20 @@ public void testCreateTable() {
     assertEquals(new Table(bigquery, new TableInfo.BuilderImpl(tableInfo)), table);
   }
 
+  @Test
+  public void testCreateTableWithoutProject() {
+    TableInfo tableInfo = TABLE_INFO.setProjectId(PROJECT);
+    TableId tableId = TableId.of("", TABLE_ID.getDataset(), TABLE_ID.getTable());
+    tableInfo.toBuilder().setTableId(tableId);
+    EasyMock.expect(bigqueryRpcMock.create(tableInfo.toPb(), EMPTY_RPC_OPTIONS))
+        .andReturn(tableInfo.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    BigQueryOptions bigQueryOptions = createBigQueryOptionsForProject(PROJECT, rpcFactoryMock);
+    bigquery = bigQueryOptions.getService();
+    Table table = bigquery.create(tableInfo);
+    assertEquals(new Table(bigquery, new TableInfo.BuilderImpl(tableInfo)), table);
+  }
+
   @Test
   public void testCreateTableWithSelectedFields() {
     Capture<Map<BigQueryRpc.Option, Object>> capturedOptions = Capture.newInstance();
@@ -728,6 +742,16 @@ public void testDeleteTableFromTableIdWithProject() {
     assertTrue(bigquery.delete(tableId));
   }
 
+  @Test
+  public void testDeleteTableFromTableIdWithoutProject() {
+    TableId tableId = TableId.of("", TABLE_ID.getDataset(), TABLE_ID.getTable());
+    EasyMock.expect(bigqueryRpcMock.deleteTable(PROJECT, DATASET, TABLE)).andReturn(true);
+    EasyMock.replay(bigqueryRpcMock);
+    BigQueryOptions bigQueryOptions = createBigQueryOptionsForProject(PROJECT, rpcFactoryMock);
+    bigquery = bigQueryOptions.getService();
+    assertTrue(bigquery.delete(tableId)); 
+  }
+
   @Test
   public void testUpdateTable() {
     TableInfo updatedTableInfo =
@@ -741,6 +765,20 @@ public void testUpdateTable() {
     assertEquals(new Table(bigquery, new TableInfo.BuilderImpl(updatedTableInfo)), table);
   }
 
+  @Test
+  public void testUpdateTableWithoutProject() {
+    TableInfo tableInfo = TABLE_INFO.setProjectId(PROJECT);
+    TableId tableId = TableId.of("", TABLE_ID.getDataset(), TABLE_ID.getTable());
+    tableInfo.toBuilder().setTableId(tableId);
+    EasyMock.expect(bigqueryRpcMock.patch(tableInfo.toPb(), EMPTY_RPC_OPTIONS))
+        .andReturn(tableInfo.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    BigQueryOptions bigQueryOptions = createBigQueryOptionsForProject(PROJECT, rpcFactoryMock);
+    bigquery = bigQueryOptions.getService();
+    Table table = bigquery.update(tableInfo);
+    assertEquals(new Table(bigquery, new TableInfo.BuilderImpl(tableInfo)), table);
+  }
+
   @Test
   public void testUpdateTableWithSelectedFields() {
     Capture<Map<BigQueryRpc.Option, Object>> capturedOptions = Capture.newInstance();
