From e2edeba66c6423cdbdad10407255983120164c7e Mon Sep 17 00:00:00 2001 From: Fernando Arreola Date: Thu, 14 Mar 2024 13:58:13 -0700 Subject: [PATCH 1/3] Add refs to trino package where needed. --- package.json | 1 + test/tsconfig.json | 3 +++ tsconfig.compile-no-emit.json | 1 + tsconfig.docs.json | 1 + tsconfig.json | 1 + 5 files changed, 7 insertions(+) diff --git a/package.json b/package.json index c91af6a62e..980b1eda20 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "packages/malloy-db-duckdb", "packages/malloy-db-postgres", "packages/malloy-db-snowflake", + "packages/malloy-db-trino", "packages/malloy-malloy-sql", "packages/malloy-lint", "packages/malloy-render", diff --git a/test/tsconfig.json b/test/tsconfig.json index fafddbe74f..3724e229ea 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -21,6 +21,9 @@ { "path": "../packages/malloy-db-snowflake" }, + { + "path": "../packages/malloy-db-trino" + }, { "path": "../packages/malloy-db-duckdb" }, diff --git a/tsconfig.compile-no-emit.json b/tsconfig.compile-no-emit.json index 36be984219..ef04f76234 100644 --- a/tsconfig.compile-no-emit.json +++ b/tsconfig.compile-no-emit.json @@ -7,6 +7,7 @@ {"path": "packages/malloy-db-duckdb"}, {"path": "packages/malloy-db-postgres"}, {"path": "packages/malloy-db-snowflake"}, + {"path": "packages/malloy-db-trino"}, {"path": "packages/malloy-malloy-sql"}, {"path": "test"}, {"path": "packages/malloy-render"} diff --git a/tsconfig.docs.json b/tsconfig.docs.json index fd59f936b7..9bdc878455 100644 --- a/tsconfig.docs.json +++ b/tsconfig.docs.json @@ -7,6 +7,7 @@ {"path": "packages/malloy-db-duckdb"}, {"path": "packages/malloy-db-postgres"}, {"path": "packages/malloy-db-snowflake"}, + {"path": "packages/malloy-db-trino"}, {"path": "packages/malloy-malloy-sql"}, {"path": "test"}, {"path": "packages/malloy-render"} diff --git a/tsconfig.json b/tsconfig.json index b065c6237c..76d500f3e5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,6 +7,7 @@ {"path": "packages/malloy-db-duckdb"}, {"path": "packages/malloy-db-postgres"}, {"path": "packages/malloy-db-snowflake"}, + {"path": "packages/malloy-db-trino"}, {"path": "packages/malloy-malloy-sql"}, {"path": "test"}, {"path": "packages/malloy-render"}, From fc30dad9580a9e2879d5e604d61baa91b3b97cbe Mon Sep 17 00:00:00 2001 From: Fernando Arreola Date: Thu, 14 Mar 2024 13:59:37 -0700 Subject: [PATCH 2/3] Fix pl.json --- package-lock.json | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/package-lock.json b/package-lock.json index 535b081b42..faf40e2493 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,6 +56,7 @@ "packages/malloy-db-duckdb", "packages/malloy-db-postgres", "packages/malloy-db-snowflake", + "packages/malloy-db-trino", "packages/malloy-malloy-sql", "packages/malloy-lint", "packages/malloy-render", @@ -5316,6 +5317,10 @@ "resolved": "packages/malloy-db-snowflake", "link": true }, + "node_modules/@malloydata/db-trino": { + "resolved": "packages/malloy-db-trino", + "link": true + }, "node_modules/@malloydata/eslint-plugin-lint": { "resolved": "packages/malloy-lint", "link": true @@ -25699,6 +25704,24 @@ "node": ">=8" } }, + "node_modules/trino-client": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/trino-client/-/trino-client-0.2.2.tgz", + "integrity": "sha512-TMndAbFiiGlAbJotsqsbMSqFZ8sPtE+KBIl/qYEAI9+eAXruNvz0BhxFC67PE39eouVn+JtF6L8Yr2q6/sAlAA==", + "dependencies": { + "axios": "1.6.2" + } + }, + "node_modules/trino-client/node_modules/axios": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", + "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/triple-beam": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", @@ -28170,6 +28193,64 @@ "node": ">=18" } }, + "packages/malloy-db-trino": { + "version": "0.0.1", + "license": "MIT", + "dependencies": { + "@malloydata/malloy": "^0.0.130", + "gaxios": "^4.2.0", + "trino-client": "^0.2.2" + }, + "engines": { + "node": ">=16" + } + }, + "packages/malloy-db-trino/node_modules/@malloydata/malloy": { + "version": "0.0.130", + "resolved": "https://registry.npmjs.org/@malloydata/malloy/-/malloy-0.0.130.tgz", + "integrity": "sha512-1WLuz1iKvmSvWpcvVvNsOpoaDip2TTUoHqlVa3hUqpyxCZE7bBINsK6Memi/9oP/2cgfgOfMfuFq/yMb9MnzOw==", + "dependencies": { + "antlr4ts": "^0.5.0-alpha.4", + "assert": "^2.0.0", + "jest-diff": "^29.6.2", + "lodash": "^4.17.20", + "luxon": "^2.4.0", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=16" + } + }, + "packages/malloy-db-trino/node_modules/diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "packages/malloy-db-trino/node_modules/jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "packages/malloy-db-trino/node_modules/jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, "packages/malloy-interfaces": { "name": "@malloydata/malloy-interfaces", "version": "0.0.131", From fae6028b92ca81d51659ac9ebdd129b1154f7c8d Mon Sep 17 00:00:00 2001 From: Fernando Arreola Date: Thu, 14 Mar 2024 14:02:57 -0700 Subject: [PATCH 3/3] Fix tmp index. --- packages/malloy-db-trino/src/tmp_index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/malloy-db-trino/src/tmp_index.ts b/packages/malloy-db-trino/src/tmp_index.ts index dbd66225f9..51e6c75b84 100644 --- a/packages/malloy-db-trino/src/tmp_index.ts +++ b/packages/malloy-db-trino/src/tmp_index.ts @@ -20,3 +20,5 @@ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + +export {};