Merge pull request #96 from deepcrawl/upgrade

feat: bleeding edge upgrade

.github/workflows/build.yml

@@ -35,6 +35,7 @@ jobs:
         run: |
           yarn install --frozen-lockfile
           yarn lint:check
+          yarn audit
           yarn test
         env:
           NODE_AUTH_TOKEN: ${{secrets.GIT_REGISTRY_TOKEN}}

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.68](https://github.com/deepcrawl/node-duckdb/compare/v0.0.67...v0.0.68) (2021-05-19)
+
 ### [0.0.67](https://github.com/deepcrawl/node-duckdb/compare/v0.0.66...v0.0.67) (2021-04-07)
 
 

addon/duckdb.cc

@@ -32,7 +32,6 @@ Napi::Object DuckDB::Init(Napi::Env env, Napi::Object exports) {
           InstanceAccessor<&DuckDB::GetCollation>("collation"),
           InstanceAccessor<&DuckDB::GetDefaultOrderType>("defaultOrderType"),
           InstanceAccessor<&DuckDB::GetDefaultNullOrder>("defaultNullOrder"),
-          InstanceAccessor<&DuckDB::GetEnableCopy>("enableCopy"),
       });
   constructor = Napi::Persistent(func);
   constructor.SuppressDestruct();
@@ -127,8 +126,4 @@ Napi::Value DuckDB::GetDefaultNullOrder(const Napi::CallbackInfo &info) {
   return Napi::Number::New(
       env, static_cast<double>(database->instance->config.default_null_order));
 }
-Napi::Value DuckDB::GetEnableCopy(const Napi::CallbackInfo &info) {
-  Napi::Env env = info.Env();
-  return Napi::Boolean::New(env, database->instance->config.enable_copy);
-}
 } // namespace NodeDuckDB

addon/duckdb.h

@@ -25,7 +25,6 @@ class DuckDB : public Napi::ObjectWrap<DuckDB> {
   Napi::Value GetCollation(const Napi::CallbackInfo &info);
   Napi::Value GetDefaultOrderType(const Napi::CallbackInfo &info);
   Napi::Value GetDefaultNullOrder(const Napi::CallbackInfo &info);
-  Napi::Value GetEnableCopy(const Napi::CallbackInfo &info);
 };
 } // namespace NodeDuckDB
 

addon/type-converters.cc

@@ -102,8 +102,4 @@ void NodeDuckDB::TypeConverters::setDBConfig(const Napi::Env &env,
                     static_cast<int>(duckdb::OrderByNullType::INVALID),
                     static_cast<int>(duckdb::OrderByNullType::NULLS_LAST)));
   }
-
-  if (!optionsObject.Get("enableCopy").IsUndefined()) {
-    nativeConfig.enable_copy = convertBoolean(env, optionsObject, "enableCopy");
-  }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-duckdb",
-  "version": "0.0.67",
+  "version": "0.0.69",
   "private": false,
   "description": "DuckDB for Node.JS",
   "keywords": [
@@ -31,6 +31,7 @@
     ]
   },
   "scripts": {
+    "audit:fix": "yarn-audit-fix",
     "build": "yarn build:duckdb && yarn build:addon && yarn build:ts",
     "build:addon": "rimraf build && cmake-js compile --CDnapi_build_version=6",
     "build:duckdb": "cd duckdb && make && cd -",
@@ -39,11 +40,10 @@
     "clang:check": "yarn clang-format --dry-run --Werror addon/**",
     "clang:fix": "yarn clang-format -i addon/**",
     "cleanup:binaries": "rm -rf build prebuilds duckdb",
-    "download-duckdb": "rm -rf duckdb && curl -L https://github.com/cwida/duckdb/archive/d5030f666e4685a1df0bb76cb4073bec828dd8fa.tar.gz > duckdb.tar.gz && tar xf duckdb.tar.gz && mv duckdb-d5030f666e4685a1df0bb76cb4073bec828dd8fa duckdb && rm duckdb.tar.gz",
+    "download-duckdb": "rm -rf duckdb && curl -L https://github.com/cwida/duckdb/archive/7c1a2f2867dfe5b02717e7bd7cf7ed46fbe08a34.tar.gz > duckdb.tar.gz && tar xf duckdb.tar.gz && mv duckdb-7c1a2f2867dfe5b02717e7bd7cf7ed46fbe08a34 duckdb && rm duckdb.tar.gz",
     "eslint:check": "eslint --ext .js,.json,.ts ./",
     "eslint:fix": "eslint --fix --ext .js,.json,.ts ./",
     "generate-doc": "yarn build:ts && rm -rf temp etc && mkdir etc && yarn api-extractor run --local --verbose &&  yarn api-documenter markdown -i temp -o docs/api && ./docs/replace.sh",
-    "preinstall": "yarn audit",
     "install": "prebuild-install --verbose -d -r napi || (yarn download-duckdb && yarn build:duckdb && yarn prebuild:current-target)",
     "lint:check": "yarn prettier:check && yarn eslint:check && yarn clang:check",
     "lint:fix": "yarn prettier:fix && yarn eslint:fix && yarn clang:fix",
@@ -98,7 +98,8 @@
     "rimraf": "^3.0.2",
     "standard-version": "^9.1.1",
     "ttypescript": "^1.5.12",
-    "typescript": "^4.0.3"
+    "typescript": "^4.0.3",
+    "yarn-audit-fix": "^5.0.0"
   },
   "engines": {
     "node": ">= 12.17.0"

src/addon-bindings/duckdb-binding.ts

@@ -20,7 +20,6 @@ export declare class DuckDBClass {
   public collation: string;
   public defaultOrderType: OrderType;
   public defaultNullOrder: OrderByNullType;
-  public enableCopy: boolean;
 }
 
 export const DuckDBBinding: typeof DuckDBClass = DuckDB;

src/addon-types/duckdb-config.ts

@@ -83,10 +83,6 @@ export interface IDuckDBOptionsConfig {
    * Default order for Null values
    */
   defaultNullOrder?: OrderByNullType;
-  /**
-   * Enable Copy
-   */
-  enableCopy?: boolean;
 }
 /**
  * Configuration object for DuckDB

src/addon/duckdb.ts

@@ -131,11 +131,4 @@ export class DuckDB {
   public get defaultNullOrder(): OrderByNullType {
     return this.duckdb.defaultNullOrder;
   }
-  /**
-   * Returns true of copying is enabled, false otherwise.
-   * @public
-   */
-  public get enableCopy(): boolean {
-    return this.duckdb.enableCopy;
-  }
 }

src/tests/duckdb-config.test.ts

@@ -154,16 +154,6 @@ describe("DuckDB configuration", () => {
     );
   });
 
-  it("allows to specify enable copy", () => {
-    const db = new DuckDB({ options: { enableCopy: false } });
-    expect(db.enableCopy).toBe(false);
-    db.close();
-  });
-
-  it("does not allow to specify invalid enableCopy", () => {
-    expect(() => new DuckDB(<any>{ options: { enableCopy: 10 } })).toThrow("Invalid enableCopy: must be a boolean");
-  });
-
   it("returns package version", async () => {
     const version = await DuckDB.getBindingsVersion();
     expect(version).toMatch(/\d+\.\d+\.\d+/);