Skip to content

Commit 0e7a6fa

Browse files
committed
fix(fs-bq-import-collection): update bigquery lib and insert api usage
1 parent 4639a63 commit 0e7a6fa

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

firestore-bigquery-export/firestore-bigquery-change-tracker/src/bigquery/index.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
} from "../tracker";
2626
import * as logs from "../logs";
2727
import { BigQuery } from "@google-cloud/bigquery";
28+
import { InsertRowsOptions } from "@google-cloud/bigquery/build/src/table";
2829

2930
export interface FirestoreBigQueryEventHistoryTrackerConfig {
3031
datasetId: string;
@@ -51,9 +52,6 @@ export class FirestoreBigQueryEventHistoryTracker
5152

5253
async record(events: FirestoreDocumentChangeEvent[]) {
5354
await this.initialize();
54-
const options = {
55-
raw: true,
56-
};
5755
const rows = events.map((event) => {
5856
return {
5957
insertId: event.eventId,
@@ -66,23 +64,23 @@ export class FirestoreBigQueryEventHistoryTracker
6664
},
6765
};
6866
});
69-
await this.insertData(rows, options);
67+
await this.insertData(rows);
7068
}
7169

7270
/**
7371
* Inserts rows of data into the BigQuery raw change log table.
7472
*/
75-
private async insertData(rows: bigquery.RowMetadata[], options: object) {
76-
const payload = {
73+
private async insertData(rows: bigquery.RowMetadata[]) {
74+
const options = {
7775
skipInvalidRows: false,
7876
ignoreUnkownValues: false,
79-
rows: rows,
80-
};
77+
raw: true
78+
} as InsertRowsOptions;
8179
try {
8280
const dataset = this.bq.dataset(this.config.datasetId);
8381
const table = dataset.table(this.rawChangeLogTableName());
8482
logs.dataInserting(rows.length);
85-
await table.insert(payload, options);
83+
await table.insert(rows, options);
8684
logs.dataInserted(rows.length);
8785
} catch (e) {
8886
// Reinitializing in case the destintation table is modified.

firestore-bigquery-export/scripts/import/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"license": "Apache-2.0",
2626
"dependencies": {
2727
"@firebaseextensions/firestore-bigquery-change-tracker": "^1.0.1",
28-
"@google-cloud/bigquery": "^2.1.0",
2928
"firebase-admin": "^7.1.1",
3029
"firebase-functions": "^2.2.1",
3130
"generate-schema": "^2.6.0",

firestore-bigquery-export/scripts/import/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* limitations under the License.
1717
*/
1818

19-
import * as bigquery from "@google-cloud/bigquery";
2019
import * as firebase from "firebase-admin";
2120
import * as fs from "fs";
2221
import * as inquirer from "inquirer";

0 commit comments

Comments
 (0)