Skip to content

Commit

Permalink
Merge branch 'main' into json-field-parse-option
Browse files Browse the repository at this point in the history
  • Loading branch information
alvarowolfx committed Jul 31, 2023
2 parents b2f7a7a + 6d8e77e commit 67b0c86
Show file tree
Hide file tree
Showing 47 changed files with 187 additions and 420 deletions.
4 changes: 2 additions & 2 deletions .github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest
digest: sha256:bfa6fdba19aa7d105167d01fb51f5fd8285e8cd9fca264e43aff849e9e7fa36c
# created: 2023-07-06T17:45:12.014855061Z
digest: sha256:ef104a520c849ffde60495342ecf099dfb6256eab0fbd173228f447bc73d1aa9
# created: 2023-07-10T21:36:52.433664553Z
2 changes: 1 addition & 1 deletion .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ branchProtectionRules:
- "ci/kokoro: System test"
- docs
- lint
- test (12)
- test (14)
- test (16)
- test (18)
- cla/google
- windows
- OwlBot Post Processor
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [12, 14, 16]
node: [14, 16, 18, 20]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down
24 changes: 0 additions & 24 deletions .kokoro/continuous/node12/common.cfg

This file was deleted.

4 changes: 0 additions & 4 deletions .kokoro/continuous/node12/lint.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions .kokoro/continuous/node12/samples-test.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions .kokoro/continuous/node12/system-test.cfg

This file was deleted.

Empty file removed .kokoro/continuous/node12/test.cfg
Empty file.
24 changes: 0 additions & 24 deletions .kokoro/presubmit/node12/common.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions .kokoro/presubmit/node12/samples-test.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions .kokoro/presubmit/node12/system-test.cfg

This file was deleted.

Empty file removed .kokoro/presubmit/node12/test.cfg
Empty file.
2 changes: 1 addition & 1 deletion .kokoro/test.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@

[1]: https://www.npmjs.com/package/@google-cloud/bigquery?activeTab=versions

## [7.0.0](https://github.com/googleapis/nodejs-bigquery/compare/v6.2.1...v7.0.0) (2023-07-31)


### ⚠ BREAKING CHANGES

* migrate to node 14 ([#1236](https://github.com/googleapis/nodejs-bigquery/issues/1236))

### Bug Fixes

* **deps:** Update dependency google-auth-library to v9 ([#1228](https://github.com/googleapis/nodejs-bigquery/issues/1228)) ([22cf786](https://github.com/googleapis/nodejs-bigquery/commit/22cf786579331e3cb7a3aa63dc2f71e448553e18))


### Miscellaneous Chores

* Migrate to node 14 ([#1236](https://github.com/googleapis/nodejs-bigquery/issues/1236)) ([73bf31f](https://github.com/googleapis/nodejs-bigquery/commit/73bf31f55c4fa9e384aa76e1a7af0603ebb0d11b))

## [6.2.1](https://github.com/googleapis/nodejs-bigquery/compare/v6.2.0...v6.2.1) (2023-07-10)


Expand Down
5 changes: 3 additions & 2 deletions benchmark/bench.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ async function doQuery(queryTxt: string) {
.on('end', () => {
const timeTotalMilli = new Date().getTime() - startMilli;
console.log(
`"${queryTxt}",${numRows},${numCols},${timeFirstByteMilli /
1000},${timeTotalMilli / 1000}`
`"${queryTxt}",${numRows},${numCols},${timeFirstByteMilli / 1000},${
timeTotalMilli / 1000
}`
);
resolve();
});
Expand Down
19 changes: 7 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@google-cloud/bigquery",
"description": "Google BigQuery Client Library for Node.js",
"version": "6.2.1",
"version": "7.0.0",
"license": "Apache-2.0",
"author": "Google LLC",
"engines": {
"node": ">=12.0.0"
"node": ">=14.0.0"
},
"repository": "googleapis/nodejs-bigquery",
"main": "./build/src/index.js",
Expand Down Expand Up @@ -63,32 +63,27 @@
"devDependencies": {
"@google-cloud/storage": "^6.0.0",
"@types/big.js": "^6.0.0",
"@types/execa": "^0.9.0",
"@types/extend": "^3.0.1",
"@types/is": "0.0.22",
"@types/mocha": "^9.0.0",
"@types/mv": "^2.1.0",
"@types/ncp": "^2.0.1",
"@types/node": "^18.0.0",
"@types/proxyquire": "^1.3.28",
"@types/sinon": "^10.0.0",
"@types/tmp": "0.2.3",
"@types/uuid": "^9.0.0",
"c8": "^8.0.0",
"codecov": "^3.5.0",
"discovery-tsd": "^0.3.0",
"execa": "^5.0.0",
"gts": "^3.1.0",
"eslint-plugin-prettier": "^5.0.0",
"gts": "^5.0.0",
"jsdoc": "^4.0.0",
"jsdoc-fresh": "^2.0.0",
"jsdoc-region-tag": "^2.0.0",
"linkinator": "^5.0.0",
"mocha": "^9.2.2",
"mv": "^2.1.1",
"ncp": "^2.0.0",
"pack-n-play": "^1.0.0-2",
"prettier": "^3.0.0",
"proxyquire": "^2.1.0",
"sinon": "^15.0.0",
"tmp": "0.2.1",
"typescript": "^4.6.4"
"typescript": "^5.1.6"
}
}
5 changes: 1 addition & 4 deletions samples/addColumnLoadAppend.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ function main(
const schema = 'Name:STRING, Age:INTEGER, Weight:FLOAT, IsMagic:BOOLEAN';

// Retrieve destination table reference
const [table] = await bigquery
.dataset(datasetId)
.table(tableId)
.get();
const [table] = await bigquery.dataset(datasetId).table(tableId).get();
const destinationTableRef = table.metadata.tableReference;

// Set load job options
Expand Down
5 changes: 1 addition & 4 deletions samples/addColumnQueryAppend.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ function main(datasetId = 'my_dataset', tableId = 'my_table') {
// const tableId = 'my_table';

// Retrieve destination table reference
const [table] = await bigquery
.dataset(datasetId)
.table(tableId)
.get();
const [table] = await bigquery.dataset(datasetId).table(tableId).get();
const destinationTableRef = table.metadata.tableReference;

// In this example, the existing table contains only the 'name' column.
Expand Down
5 changes: 1 addition & 4 deletions samples/deleteTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ function main(datasetId = 'my_dataset', tableId = 'my_table') {
// const tableId = "my_table";

// Delete the table
await bigquery
.dataset(datasetId)
.table(tableId)
.delete();
await bigquery.dataset(datasetId).table(tableId).delete();

console.log(`Table ${tableId} deleted.`);
}
Expand Down
5 changes: 1 addition & 4 deletions samples/insertRowsAsStream.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,7 @@ function main(datasetId = 'my_dataset', tableId = 'my_table') {
];

// Insert data into a table
await bigquery
.dataset(datasetId)
.table(tableId)
.insert(rows);
await bigquery.dataset(datasetId).table(tableId).insert(rows);
console.log(`Inserted ${rows.length} rows`);
}
// [END bigquery_table_insert_rows]
Expand Down
5 changes: 1 addition & 4 deletions samples/insertingDataTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,7 @@ function main(datasetId = 'my_dataset', tableId = 'my_table') {
];

// Insert data into table
await bigquery
.dataset(datasetId)
.table(tableId)
.insert(rows);
await bigquery.dataset(datasetId).table(tableId).insert(rows);

console.log(`Inserted ${rows.length} rows`);
}
Expand Down
6 changes: 3 additions & 3 deletions samples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"author": "Google LLC",
"repository": "googleapis/nodejs-bigquery",
"engines": {
"node": ">=12.0.0"
"node": ">=14.0.0"
},
"scripts": {
"test": "mocha --timeout 200000"
},
"dependencies": {
"@google-cloud/bigquery": "^6.2.1",
"@google-cloud/bigquery": "^7.0.0",
"@google-cloud/storage": "^6.0.0",
"google-auth-library": "^7.0.0",
"google-auth-library": "^9.0.0",
"readline-promise": "^1.0.4",
"yargs": "^17.0.0"
},
Expand Down
5 changes: 1 addition & 4 deletions samples/relaxColumnLoadAppend.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,7 @@ function main(
const schema = 'Age:INTEGER, Weight:FLOAT, IsMagic:BOOLEAN';

// Retrieve destination table reference
const [table] = await bigquery
.dataset(datasetId)
.table(tableId)
.get();
const [table] = await bigquery.dataset(datasetId).table(tableId).get();
const destinationTableRef = table.metadata.tableReference;

// Set load job options
Expand Down
5 changes: 1 addition & 4 deletions samples/test/authViewTutorial.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ const bigquery = new BigQuery();

describe('Authorized View Tutorial', () => {
after(async () => {
await bigquery
.dataset(datasetId)
.delete({force: true})
.catch(console.warn);
await bigquery.dataset(datasetId).delete({force: true}).catch(console.warn);
await bigquery
.dataset(sourceDatasetId)
.delete({force: true})
Expand Down
5 changes: 1 addition & 4 deletions samples/test/datasets.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ describe('Datasets', () => {
});

after(async () => {
await bigquery
.dataset(datasetId)
.delete({force: true})
.catch(console.warn);
await bigquery.dataset(datasetId).delete({force: true}).catch(console.warn);
});

it('should create a dataset', async () => {
Expand Down
Loading

0 comments on commit 67b0c86

Please sign in to comment.