fix: Fix typo in driver name, DuckDB

ovr · ovr · commit c53a31c37b6b · 2023-04-10T17:55:39.000+03:00
diff --git a/.github/actions/smoke.sh b/.github/actions/smoke.sh
@@ -4,10 +4,10 @@ set -eo pipefail
 # Debug log for test containers
 export DEBUG=testcontainers
 
-echo "::group::DucksDB"
-# Should we create a separate job integration-ducksdb? I believe not, because it works fast.
-yarn lerna run --concurrency 1 --stream --no-prefix integration:ducksdb
-yarn lerna run --concurrency 1 --stream --no-prefix smoke:ducksdb
+echo "::group::DuckDB"
+# Should we create a separate job integration-duckdb? I believe not, because it works fast.
+yarn lerna run --concurrency 1 --stream --no-prefix integration:duckdb
+yarn lerna run --concurrency 1 --stream --no-prefix smoke:duckdb
 echo "::endgroup::"
 
 echo "::group::Oracle"
diff --git a/packages/cubejs-backend-shared/src/env.ts b/packages/cubejs-backend-shared/src/env.ts
@@ -1353,16 +1353,16 @@ const variables: Record<string, (...args: any) => any> = {
   },
 
   /** ****************************************************************
-   * DucksDB                                                         *
+   * duckdb                                                         *
    ***************************************************************** */
 
-  ducksdbHttpFs: ({
+  duckdbHttpFs: ({
     dataSource
   }: {
     dataSource: string,
   }) => (
     process.env[
-      keyByDataSource('CUBEJS_DB_DUCKSDB_HTTP_FS', dataSource)
+      keyByDataSource('CUBEJS_DB_DUCKDB_HTTP_FS', dataSource)
     ]
   ),
 
diff --git a/packages/cubejs-duckdb-driver/CHANGELOG.md b/packages/cubejs-duckdb-driver/CHANGELOG.md
@@ -8,4 +8,4 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Features
 
-* **ducksdb-driver:** Initial support ([#6403](https://github.com/cube-js/cube/issues/6403)) ([00e41bf](https://github.com/cube-js/cube/commit/00e41bfe8084e9dc7831ff14e2302199af2a8fe3))
+* **duckdb-driver:** Initial support ([#6403](https://github.com/cube-js/cube/issues/6403)) ([00e41bf](https://github.com/cube-js/cube/commit/00e41bfe8084e9dc7831ff14e2302199af2a8fe3))
diff --git a/packages/cubejs-duckdb-driver/README.md b/packages/cubejs-duckdb-driver/README.md
@@ -5,10 +5,10 @@
 [![npm version](https://badge.fury.io/js/%40cubejs-backend%2Fserver.svg)](https://badge.fury.io/js/%40cubejs-backend%2Fserver)
 [![GitHub Actions](https://github.com/cube-js/cube.js/workflows/Build/badge.svg)](https://github.com/cube-js/cube.js/actions?query=workflow%3ABuild+branch%3Amaster)
 
-# Cube.js DucksDB Database Driver
+# Cube.js DuckDB Database Driver
 
 [Learn more](https://github.com/cube-js/cube.js#getting-started)
 
 ### License
 
-Cube.js DucksDB driver is [Apache 2.0 licensed](./LICENSE).
+Cube.js DuckDB driver is [Apache 2.0 licensed](./LICENSE).
diff --git a/packages/cubejs-duckdb-driver/index.js b/packages/cubejs-duckdb-driver/index.js
@@ -1,7 +1,7 @@
 const fromExports = require('./dist/src');
-const { DucksDBDriver } = require('./dist/src/DucksDBDriver');
+const { DuckDBDriver } = require('./dist/src/DuckDBDriver');
 
-const toExport = DucksDBDriver;
+const toExport = DuckDBDriver;
 
 // eslint-disable-next-line no-restricted-syntax
 for (const [key, module] of Object.entries(fromExports)) {
diff --git a/packages/cubejs-duckdb-driver/package.json b/packages/cubejs-duckdb-driver/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "@cubejs-backend/ducksdb-driver",
-  "description": "Cube.js DucksDB database driver",
+  "name": "@cubejs-backend/duckdb-driver",
+  "description": "Cube.js DuckDB database driver",
   "author": "Cube Dev, Inc.",
   "version": "0.32.22",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
-    "directory": "packages/cubejs-ducksdb-driver"
+    "directory": "packages/cubejs-duckdb-driver"
   },
   "engines": {
     "node": "^14.0.0 || ^16.0.0 || >=17.0.0"
@@ -21,8 +21,8 @@
     "build": "rm -rf dist && npm run tsc",
     "tsc": "tsc",
     "watch": "tsc -w",
-    "integration": "npm run integration:ducksdb",
-    "integration:ducksdb": "jest --verbose dist/test",
+    "integration": "npm run integration:duckdb",
+    "integration:duckdb": "jest --verbose dist/test",
     "lint": "eslint src/* --ext .ts",
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
diff --git a/packages/cubejs-duckdb-driver/src/DuckDBDriver.ts b/packages/cubejs-duckdb-driver/src/DuckDBDriver.ts
@@ -10,22 +10,22 @@ import * as stream from 'stream';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Connection, Database } from 'duckdb';
 
-import { DucksDBQuery } from './DucksDBQuery';
+import { DuckDBQuery } from './DuckDBQuery';
 import { HydrationStream, transformRow } from './HydrationStream';
 
-export type DucksDBDriverConfiguration = {
+export type DuckDBDriverConfiguration = {
   dataSource?: string,
   enableHttpFs?: boolean,
   initSql?: string,
 };
 
-export class DucksDBDriver extends BaseDriver implements DriverInterface {
-  protected readonly config: DucksDBDriverConfiguration;
+export class DuckDBDriver extends BaseDriver implements DriverInterface {
+  protected readonly config: DuckDBDriverConfiguration;
 
   protected initPromise: Promise<Database> | null = null;
 
   public constructor(
-    config: DucksDBDriverConfiguration,
+    config: DuckDBDriverConfiguration,
   ) {
     super();
 
@@ -34,7 +34,7 @@ export class DucksDBDriver extends BaseDriver implements DriverInterface {
       assertDataSource('default');
 
     this.config = {
-      enableHttpFs: getEnv('ducksdbHttpFs', { dataSource }) || true,
+      enableHttpFs: getEnv('duckdbHttpFs', { dataSource }) || true,
       ...config,
     };
   }
@@ -48,7 +48,7 @@ export class DucksDBDriver extends BaseDriver implements DriverInterface {
         await this.handleQuery(conn, 'INSTALL httpfs', []);
       } catch (e) {
         if (this.logger) {
-          console.error('DucksDB - error on httpfs installation', {
+          console.error('DuckDB - error on httpfs installation', {
             e
           });
         }
@@ -60,7 +60,7 @@ export class DucksDBDriver extends BaseDriver implements DriverInterface {
         await this.handleQuery(conn, this.config.initSql, []);
       } catch (e) {
         if (this.logger) {
-          console.error('DucksDB - error on init sql (skipping)', {
+          console.error('DuckDB - error on init sql (skipping)', {
             e
           });
         }
@@ -86,7 +86,7 @@ export class DucksDBDriver extends BaseDriver implements DriverInterface {
   }
 
   public static dialectClass() {
-    return DucksDBQuery;
+    return DuckDBQuery;
   }
 
   protected handleQuery<R>(connection: Connection, query: string, values: unknown[] = [], _options?: QueryOptions): Promise<R[]> {
diff --git a/packages/cubejs-duckdb-driver/src/DuckDBQuery.ts b/packages/cubejs-duckdb-driver/src/DuckDBQuery.ts
@@ -11,12 +11,12 @@ const GRANULARITY_TO_INTERVAL: Record<string, (date: string) => string> = {
   year: date => `DATE_TRUNC('year', ${date})`
 };
 
-class DucksDBFilter extends BaseFilter {
+class DuckDBFilter extends BaseFilter {
 }
 
-export class DucksDBQuery extends BaseQuery {
+export class DuckDBQuery extends BaseQuery {
   public newFilter(filter: any) {
-    return new DucksDBFilter(this, filter);
+    return new DuckDBFilter(this, filter);
   }
 
   public convertTz(field: string) {
diff --git a/packages/cubejs-duckdb-driver/src/index.ts b/packages/cubejs-duckdb-driver/src/index.ts
@@ -1,5 +1,5 @@
-import { DucksDBDriver } from './DucksDBDriver';
+import { DuckDBDriver } from './DuckDBDriver';
 
-export * from './DucksDBDriver';
+export * from './DuckDBDriver';
 
-export default DucksDBDriver;
+export default DuckDBDriver;
diff --git a/packages/cubejs-duckdb-driver/test/DuckDBDriver.test.ts b/packages/cubejs-duckdb-driver/test/DuckDBDriver.test.ts
@@ -1,13 +1,13 @@
-import { oldStreamToArray, streamToArray } from '@cubejs-backend/shared';
-import { DucksDBDriver } from '../src';
+import { streamToArray } from '@cubejs-backend/shared';
+import { DuckDBDriver } from '../src';
 
-describe('DucksDBDriver', () => {
-  let driver: DucksDBDriver;
+describe('DuckDBDriver', () => {
+  let driver: DuckDBDriver;
 
   jest.setTimeout(2 * 60 * 1000);
 
   beforeAll(async () => {
-    driver = new DucksDBDriver({});
+    driver = new DuckDBDriver({});
     await driver.query('CREATE SCHEMA IF NOT EXISTS test;', []);
   });
 
diff --git a/packages/cubejs-server-core/src/core/DriverDependencies.js b/packages/cubejs-server-core/src/core/DriverDependencies.js
@@ -21,7 +21,7 @@ module.exports = {
   elasticsearch: '@cubejs-backend/elasticsearch-driver',
   dremio: '@cubejs-backend/dremio-driver',
   druid: '@cubejs-backend/druid-driver',
-  ducksdb: '@cubejs-backend/ducksdb-driver',
+  duckdb: '@cubejs-backend/duckdb-driver',
   cubestore: '@cubejs-backend/cubestore-driver',
   ksql: '@cubejs-backend/ksql-driver',
   questdb: '@cubejs-backend/questdb-driver',
diff --git a/packages/cubejs-testing/birdbox-fixtures/duckdb/schema/Orders.js b/packages/cubejs-testing/birdbox-fixtures/duckdb/schema/Orders.js
diff --git a/packages/cubejs-testing/package.json b/packages/cubejs-testing/package.json
@@ -77,8 +77,8 @@
     "smoke:trino:snapshot": "jest --verbose --forceExit --updateSnapshot -i dist/test/smoke-trino.test.js",
     "smoke:mssql": "jest --verbose -i dist/test/smoke-mssql.test.js",
     "smoke:mssql:snapshot": "jest --verbose --forceExit --updateSnapshot -i dist/test/smoke-mssql.test.js",
-    "smoke:ducksdb": "jest --verbose -i dist/test/smoke-ducksdb.test.js",
-    "smoke:ducksdb:snapshot": "jest --verbose --updateSnapshot -i dist/test/smoke-ducksdb.test.js"
+    "smoke:duckdb": "jest --verbose -i dist/test/smoke-duckdb.test.js",
+    "smoke:duckdb:snapshot": "jest --verbose --updateSnapshot -i dist/test/smoke-duckdb.test.js"
   },
   "files": [
     "dist/src",
diff --git a/packages/cubejs-testing/src/REQUIRED_ENV_VARS.ts b/packages/cubejs-testing/src/REQUIRED_ENV_VARS.ts
@@ -48,5 +48,5 @@ export const REQUIRED_ENV_VARS: {[key: string]: string[]} = {
   prestodb: [],
   trino: [],
   mssql: [],
-  ducksdb: [],
+  duckdb: [],
 };
diff --git a/packages/cubejs-testing/src/birdbox.ts b/packages/cubejs-testing/src/birdbox.ts
@@ -48,7 +48,7 @@ interface Args {
   log: Log,
 }
 
-export type DriverType = 'postgresql' | 'postgres' | 'multidb' | 'materialize' | 'crate' | 'bigquery' | 'athena' | 'postgresql-cubestore' | 'firebolt' | 'questdb' | 'redshift' | 'databricks-jdbc' | 'prestodb' | 'mssql' | 'trino' | 'oracle' | 'ducksdb';
+export type DriverType = 'postgresql' | 'postgres' | 'multidb' | 'materialize' | 'crate' | 'bigquery' | 'athena' | 'postgresql-cubestore' | 'firebolt' | 'questdb' | 'redshift' | 'databricks-jdbc' | 'prestodb' | 'mssql' | 'trino' | 'oracle' | 'duckdb';
 
 export type Schemas = string[];
 
@@ -107,7 +107,7 @@ const driverNameToFolderNameMapper: Record<DriverType, string> = {
   mssql: 'mssql',
   trino: 'postgresql',
   oracle: 'oracle',
-  ducksdb: 'postgresql',
+  duckdb: 'postgresql',
 };
 
 /**
diff --git a/packages/cubejs-testing/test/__snapshots__/smoke-duckdb.test.ts.snap b/packages/cubejs-testing/test/__snapshots__/smoke-duckdb.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ducksdb query measure: query 1`] = `
+exports[`duckdb query measure: query 1`] = `
 Array [
   Object {
     "Orders.totalAmount": "1700",
diff --git a/packages/cubejs-testing/test/smoke-duckdb.test.ts b/packages/cubejs-testing/test/smoke-duckdb.test.ts
@@ -4,21 +4,21 @@ import { afterAll, beforeAll, jest } from '@jest/globals';
 import { BirdBox, getBirdbox } from '../src';
 import { DEFAULT_API_TOKEN, DEFAULT_CONFIG, testQueryMeasure } from './smoke-tests';
 
-describe('ducksdb', () => {
+describe('duckdb', () => {
   jest.setTimeout(60 * 5 * 1000);
   let birdbox: BirdBox;
   let client: CubejsApi;
 
   beforeAll(async () => {
     birdbox = await getBirdbox(
-      'ducksdb',
+      'duckdb',
       {
-        CUBEJS_DB_TYPE: 'ducksdb',
+        CUBEJS_DB_TYPE: 'duckdb',
 
         ...DEFAULT_CONFIG,
       },
       {
-        schemaDir: 'ducksdb/schema',
+        schemaDir: 'duckdb/schema',
       }
     );
     client = cubejs(async () => DEFAULT_API_TOKEN, {

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline`
`8`	`8`
`9`	`9`	`### Features`
`10`	`10`
`11`		`-* ducksdb-driver: Initial support ([#6403](https://github.com/cube-js/cube/issues/6403)) ([00e41bf](https://github.com/cube-js/cube/commit/00e41bfe8084e9dc7831ff14e2302199af2a8fe3))`
	`11`	`+* duckdb-driver: Initial support ([#6403](https://github.com/cube-js/cube/issues/6403)) ([00e41bf](https://github.com/cube-js/cube/commit/00e41bfe8084e9dc7831ff14e2302199af2a8fe3))`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@ const GRANULARITY_TO_INTERVAL: Record<string, (date: string) => string> = {`
`11`	`11`	year: date => `DATE_TRUNC('year', ${date})`
`12`	`12`	`};`
`13`	`13`
`14`		`-class DucksDBFilter extends BaseFilter {`
	`14`	`+class DuckDBFilter extends BaseFilter {`
`15`	`15`	`}`
`16`	`16`
`17`		`-export class DucksDBQuery extends BaseQuery {`
	`17`	`+export class DuckDBQuery extends BaseQuery {`
`18`	`18`	`public newFilter(filter: any) {`
`19`		`- return new DucksDBFilter(this, filter);`
	`19`	`+ return new DuckDBFilter(this, filter);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public convertTz(field: string) {`