Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m4heshd/better-sqlite3-multiple-ciphers
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: FileMap/better-sqlite3-multiple-ciphers
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 18 commits
  • 43 files changed
  • 2 contributors

Commits on Dec 21, 2022

  1. add prebuildify support

    oznakn committed Dec 21, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    oznakn Ozan Akin
    Copy the full SHA
    e70ae85 View commit details
  2. update build files [skip ci]

    oznakn authored and github-actions[bot] committed Dec 21, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    1f9de69 View commit details
  3. update build files [skip ci]

    oznakn authored and github-actions[bot] committed Dec 21, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    25a75a4 View commit details
  4. update build files [skip ci]

    oznakn authored and github-actions[bot] committed Dec 21, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    2af2280 View commit details

Commits on Dec 23, 2022

  1. downgrade electron version

    oznakn committed Dec 23, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    oznakn Ozan Akin
    Copy the full SHA
    60e0849 View commit details
  2. update build files [skip ci]

    oznakn authored and github-actions[bot] committed Dec 23, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    13e3e68 View commit details
  3. update build files [skip ci]

    oznakn authored and github-actions[bot] committed Dec 23, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    9ba4913 View commit details
  4. update build files [skip ci]

    oznakn authored and github-actions[bot] committed Dec 23, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    cbce707 View commit details
  5. do not use napi builds

    oznakn committed Dec 23, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    oznakn Ozan Akin
    Copy the full SHA
    9c954ac View commit details
  6. update build files [skip ci]

    oznakn authored and github-actions[bot] committed Dec 23, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    5f4fbf2 View commit details
  7. update build files [skip ci]

    oznakn authored and github-actions[bot] committed Dec 23, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    0514b57 View commit details
  8. update build files [skip ci]

    oznakn authored and github-actions[bot] committed Dec 23, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    f618185 View commit details

Commits on Jan 13, 2023

  1. update [skip ci]

    oznakn committed Jan 13, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    oznakn Ozan Akin
    Copy the full SHA
    a94d420 View commit details

Commits on Feb 14, 2023

  1. Verified

    This commit was signed with the committer’s verified signature.
    oznakn Ozan Akin
    Copy the full SHA
    43e2db7 View commit details
  2. Merge branch 'm4heshd-master'

    oznakn committed Feb 14, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    oznakn Ozan Akin
    Copy the full SHA
    68af1c5 View commit details
  3. update build files [skip ci]

    oznakn authored and github-actions[bot] committed Feb 14, 2023

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    7418ac2 View commit details
  4. update build files [skip ci]

    oznakn authored and github-actions[bot] committed Feb 14, 2023

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    acecc79 View commit details
  5. update build files [skip ci]

    oznakn authored and github-actions[bot] committed Feb 14, 2023

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    fe274c4 View commit details
Showing with 57 additions and 353 deletions.
  1. +42 −0 .github/workflows/ci.yml
  2. +0 −118 .github/workflows/prebuild-test.yml
  3. +0 −69 .github/workflows/prebuild.yml
  4. +0 −79 .github/workflows/test.yml
  5. +0 −51 .github/workflows/update-sqlite3mc.yml
  6. +1 −8 lib/database.js
  7. +4 −28 package.json
  8. BIN prebuilds/darwin-arm64/electron.abi106.node
  9. BIN prebuilds/darwin-arm64/electron.abi107.node
  10. BIN prebuilds/darwin-arm64/electron.abi109.node
  11. BIN prebuilds/darwin-arm64/electron.abi110.node
  12. BIN prebuilds/darwin-arm64/node.abi102.node
  13. BIN prebuilds/darwin-arm64/node.abi108.node
  14. BIN prebuilds/darwin-arm64/node.abi93.node
  15. BIN prebuilds/darwin-x64/electron.abi106.node
  16. BIN prebuilds/darwin-x64/electron.abi107.node
  17. BIN prebuilds/darwin-x64/electron.abi109.node
  18. BIN prebuilds/darwin-x64/electron.abi110.node
  19. BIN prebuilds/darwin-x64/node.abi102.node
  20. BIN prebuilds/darwin-x64/node.abi108.node
  21. BIN prebuilds/darwin-x64/node.abi93.node
  22. BIN prebuilds/linux-arm64/electron.abi106.node
  23. BIN prebuilds/linux-arm64/electron.abi107.node
  24. BIN prebuilds/linux-arm64/electron.abi109.node
  25. BIN prebuilds/linux-arm64/electron.abi110.node
  26. BIN prebuilds/linux-arm64/node.abi102.node
  27. BIN prebuilds/linux-arm64/node.abi108.node
  28. BIN prebuilds/linux-arm64/node.abi93.node
  29. BIN prebuilds/linux-x64/electron.abi106.node
  30. BIN prebuilds/linux-x64/electron.abi107.node
  31. BIN prebuilds/linux-x64/electron.abi109.node
  32. BIN prebuilds/linux-x64/electron.abi110.node
  33. BIN prebuilds/linux-x64/node.abi102.node
  34. BIN prebuilds/linux-x64/node.abi108.node
  35. BIN prebuilds/linux-x64/node.abi93.node
  36. BIN prebuilds/win32-x64/electron.abi106.node
  37. BIN prebuilds/win32-x64/electron.abi107.node
  38. BIN prebuilds/win32-x64/electron.abi109.node
  39. BIN prebuilds/win32-x64/electron.abi110.node
  40. BIN prebuilds/win32-x64/node.abi102.node
  41. BIN prebuilds/win32-x64/node.abi108.node
  42. BIN prebuilds/win32-x64/node.abi93.node
  43. +10 −0 scripts/build.mjs
42 changes: 42 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Build

on:
- push

jobs:
build:
name: Build for ${{ matrix.target.name }}
runs-on: ${{ matrix.target.os }}
strategy:
fail-fast: false
matrix:
target:
[
{ os: "windows-latest", name: "windows" },
{ os: "macos-latest", name: "macos" },
{ os: "ubuntu-latest", name: "linux" },
]
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}

- name: Checkout
uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: "16"

- run: npm install

- run: npx zx scripts/build.mjs

- run: git pull

- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: update build files [skip ci]
file_pattern: "prebuilds"
118 changes: 0 additions & 118 deletions .github/workflows/prebuild-test.yml

This file was deleted.

69 changes: 0 additions & 69 deletions .github/workflows/prebuild.yml

This file was deleted.

79 changes: 0 additions & 79 deletions .github/workflows/test.yml

This file was deleted.

51 changes: 0 additions & 51 deletions .github/workflows/update-sqlite3mc.yml

This file was deleted.

9 changes: 1 addition & 8 deletions lib/database.js
Original file line number Diff line number Diff line change
@@ -33,22 +33,15 @@ function Database(filenameGiven, options) {
const fileMustExist = util.getBooleanOption(options, 'fileMustExist');
const timeout = 'timeout' in options ? options.timeout : 5000;
const verbose = 'verbose' in options ? options.verbose : null;
const nativeBindingPath = 'nativeBinding' in options ? options.nativeBinding : null;

// Validate interpreted options
if (readonly && anonymous && !buffer) throw new TypeError('In-memory/temporary databases cannot be readonly');
if (!Number.isInteger(timeout) || timeout < 0) throw new TypeError('Expected the "timeout" option to be a positive integer');
if (timeout > 0x7fffffff) throw new RangeError('Option "timeout" cannot be greater than 2147483647');
if (verbose != null && typeof verbose !== 'function') throw new TypeError('Expected the "verbose" option to be a function');
if (nativeBindingPath != null && typeof nativeBindingPath !== 'string') throw new TypeError('Expected the "nativeBinding" option to be a string');

// Load the native addon
let addon;
if (nativeBindingPath == null) {
addon = DEFAULT_ADDON || (DEFAULT_ADDON = require('bindings')('better_sqlite3.node'));
} else {
addon = require(path.resolve(nativeBindingPath).replace(/(\.node)?$/, '.node'));
}
const addon = require('node-gyp-build')(path.dirname(__dirname));
if (!addon.isInitialized) {
addon.setErrorConstructor(SqliteError);
addon.isInitialized = true;
Loading