From f9e9ccf9e4d2106d8a9cb94637f0d14fe7a588f0 Mon Sep 17 00:00:00 2001 From: dr666m1 Date: Sat, 1 Jul 2023 18:46:59 +0900 Subject: [PATCH] fix #209 --- expected_output/other.sql | 6 ++++++ input/other.sql | 6 ++++++ package-lock.json | 30 +++++++++++++++++------------- package.json | 2 +- src/printer.ts | 3 +++ 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/expected_output/other.sql b/expected_output/other.sql index 3cc9d04..844f26c 100644 --- a/expected_output/other.sql +++ b/expected_output/other.sql @@ -4,6 +4,12 @@ OPTIONS (uri = 'gs://bucket/folder/*.csv', format = 'CSV') AS SELECT 1 ; +EXPORT DATA +WITH CONNECTION conn +OPTIONS (uri = 'gs://bucket/folder/*.csv', format = 'CSV') +AS SELECT 1 +; + ----- LOAD statement ----- LOAD DATA INTO `mydataset.tablename` FROM FILES (uris = ['azure://sample.com/sample.parquet'], format = 'PARQUET') diff --git a/input/other.sql b/input/other.sql index 9714351..429a935 100644 --- a/input/other.sql +++ b/input/other.sql @@ -4,6 +4,12 @@ export data options( format = 'CSV' ) as select 1; +export data with connection conn +options( + uri = 'gs://bucket/folder/*.csv', + format = 'CSV' +) as select 1; + ----- LOAD statement ----- load data into `mydataset.tablename` from files ( diff --git a/package-lock.json b/package-lock.json index 2bd0f47..8191e03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.2.39", "license": "MIT", "dependencies": { - "bq2cst": "0.4.25" + "bq2cst": "0.4.26" }, "devDependencies": { "@types/jest": "^26.0.23", @@ -1741,9 +1741,9 @@ "dev": true }, "node_modules/bq2cst": { - "version": "0.4.25", - "resolved": "https://registry.npmjs.org/bq2cst/-/bq2cst-0.4.25.tgz", - "integrity": "sha512-77UXMKhEdixpswTsLohRZkIlpYXXG90jWx4jI7Ff8C7O7FEsyrhdiKNP9UIbsYlYDC4la2U6U6pZkh0BC+dYCQ==" + "version": "0.4.26", + "resolved": "https://registry.npmjs.org/bq2cst/-/bq2cst-0.4.26.tgz", + "integrity": "sha512-sTzX1FRWJugq7QIouKtmyrfU0Ifx1sZLYkeg/pRGc2nO8cGYbIjBGod0GWcz/JnBsirynZCDCghv0pC+QUKVsA==" }, "node_modules/brace-expansion": { "version": "1.1.11", @@ -1854,9 +1854,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001434", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz", - "integrity": "sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA==", + "version": "1.0.30001509", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001509.tgz", + "integrity": "sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA==", "dev": true, "funding": [ { @@ -1866,6 +1866,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -8136,9 +8140,9 @@ "dev": true }, "bq2cst": { - "version": "0.4.25", - "resolved": "https://registry.npmjs.org/bq2cst/-/bq2cst-0.4.25.tgz", - "integrity": "sha512-77UXMKhEdixpswTsLohRZkIlpYXXG90jWx4jI7Ff8C7O7FEsyrhdiKNP9UIbsYlYDC4la2U6U6pZkh0BC+dYCQ==" + "version": "0.4.26", + "resolved": "https://registry.npmjs.org/bq2cst/-/bq2cst-0.4.26.tgz", + "integrity": "sha512-sTzX1FRWJugq7QIouKtmyrfU0Ifx1sZLYkeg/pRGc2nO8cGYbIjBGod0GWcz/JnBsirynZCDCghv0pC+QUKVsA==" }, "brace-expansion": { "version": "1.1.11", @@ -8221,9 +8225,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001434", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz", - "integrity": "sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA==", + "version": "1.0.30001509", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001509.tgz", + "integrity": "sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA==", "dev": true }, "chalk": { diff --git a/package.json b/package.json index 869864a..495d91e 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "typescript": "^4.3.2" }, "dependencies": { - "bq2cst": "0.4.25" + "bq2cst": "0.4.26" }, "peerDependencies": { "prettier": "^2.3.0" diff --git a/src/printer.ts b/src/printer.ts index 48d96b2..114277e 100644 --- a/src/printer.ts +++ b/src/printer.ts @@ -2711,6 +2711,7 @@ const printExportStatement: PrintFunc = ( leading_comments: printLeadingComments(path, options, print, node), self: p.self("upper"), trailing_comments: printTrailingComments(path, options, print, node), + with_connection: p.child("with_connection"), data: p.child("data", undefined, "all"), options: p.child("options"), as: p.child("as"), @@ -2723,6 +2724,8 @@ const printExportStatement: PrintFunc = ( docs.trailing_comments, " ", docs.data, + p.has("with_connection") ? line : "", + docs.with_connection, line, docs.options, line,