Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 2 additions & 1 deletion cli/api/dbadapters/bigquery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ export class BigQueryDbAdapter implements IDbAdapter {
rowLimit: options.limit,
},
);
return await Promise.all(
const tables = await Promise.all(
results.rows.map((row) =>
this.table({
database: row.table_catalog,
Expand All @@ -327,6 +327,7 @@ export class BigQueryDbAdapter implements IDbAdapter {
}),
),
);
return tables.filter((table) => Boolean(table));
}

public async table(target: dataform.ITarget): Promise<dataform.ITableMetadata> {
Expand Down
59 changes: 59 additions & 0 deletions cli/api/dbadapters/bigquery_test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Dataset, Table } from "@google-cloud/bigquery";
import { expect } from "chai";
import { EventEmitter } from "events";
import { AuthClient, gaxios, Impersonated } from "google-auth-library";
import { anything, instance, mock, when } from "ts-mockito";

Expand Down Expand Up @@ -319,4 +320,62 @@ suite("BigQueryDbAdapter", () => {

await adapter.setMetadata(action);
});

test("search() filters out tables whose metadata is not found", async () => {
const projectId = "project1";
const liveSchema = "live_schema";
const deletedSchema = "deleted_schema";
const tableName = "table1";

const mockBigQuery: any = {
createQueryStream: () => {
const stream = new EventEmitter();
process.nextTick(() => {
stream.emit("data", {
table_catalog: projectId,
table_schema: liveSchema,
table_name: tableName,
});
stream.emit("data", {
table_catalog: projectId,
table_schema: deletedSchema,
table_name: tableName,
});
stream.emit("end");
});
return stream;
},
dataset: (schema: string) => ({
table: (name: string) => ({
getMetadata: () => {
if (schema === deletedSchema) {
return Promise.reject({ errors: [{ reason: "notFound" }] });
}
return Promise.resolve([
{
type: "TABLE",
tableReference: { projectId, datasetId: schema, tableId: name },
schema: { fields: [{ name: "col1", type: "STRING" }] },
lastModifiedTime: "123456789",
},
]);
},
}),
}),
};

const credentials = dataform.BigQuery.create({ projectId, location: "US" });
const adapter = new BigQueryDbAdapter(credentials, {
clientProvider: () => mockBigQuery,
});

const result = await adapter.search("schema");

expect(result.length).to.equal(1);
expect(result[0].target).to.eql({
database: projectId,
schema: liveSchema,
name: tableName,
});
});
});
Loading