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: WiseLibs/better-sqlite3
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: makenotion/better-sqlite3
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.
  • 6 commits
  • 5 files changed
  • 5 contributors

Commits on Feb 18, 2020

  1. Copy the full SHA
    bf8f709 View commit details

Commits on Dec 12, 2020

  1. Use C++14 for Electron 11

    mduvall committed Dec 12, 2020
    Copy the full SHA
    3f546d3 View commit details

Commits on Sep 21, 2021

  1. Copy the full SHA
    85ac2ff View commit details

Commits on Sep 22, 2021

  1. Merge pull request #2 from makenotion/arty/do-not-prebuild

    [Desktop] Do not use prebuilt binaries for `better-sqlite`
    avohmincevs authored Sep 22, 2021
    Copy the full SHA
    0d1ffa1 View commit details

Commits on Dec 1, 2021

  1. Copy the full SHA
    d830220 View commit details
  2. Merge pull request #3 from makenotion/korede/upgrade-tar

    upgrade tar package to latest version
    Korede Aderele authored Dec 1, 2021
    Copy the full SHA
    cd0a0d8 View commit details
Showing with 8 additions and 8 deletions.
  1. +2 −2 binding.gyp
  2. +3 −1 deps/download.sh
  3. BIN deps/sqlite3.tar.gz
  4. +1 −1 docs/compilation.md
  5. +2 −4 package.json
4 changes: 2 additions & 2 deletions binding.gyp
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@
'dependencies': ['deps/sqlite3.gyp:sqlite3'],
'sources': ['src/better_sqlite3.cpp'],
'cflags': [
'-std=c++11',
'-std=c++14',
],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [
'-std=c++11',
'-std=c++14',
'-stdlib=libc++',
],
},
4 changes: 3 additions & 1 deletion deps/download.sh
Original file line number Diff line number Diff line change
@@ -18,7 +18,9 @@
# 3. node-gyp links the two resulting binaries to generate better_sqlite3.node.
# ===

VERSION="3290000"
# 3.30.1
# Per https://github.com/requery/sqlite-android/blob/3.30.1/sqlite-android/build.gradle#L63
VERSION="3300100"
YEAR="2019"

# TODO: SQLITE_ENABLE_GEOPOLY (determine if the emitted warnings are safe or not)
Binary file modified deps/sqlite3.tar.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/compilation.md
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ Your amalgamation directory should contain `sqlite3.c` and `sqlite3.h`. Any desi

# Bundled configuration

By default, this distribution currently uses SQLite3 **version 3.29.0** with the following [compilation options](https://www.sqlite.org/compile.html):
By default, this distribution currently uses SQLite3 **version 3.30.1** with the following [compilation options](https://www.sqlite.org/compile.html):

```
SQLITE_THREADSAFE=0
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -12,20 +12,18 @@
"dependencies": {
"bindings": "^1.5.0",
"integer": "^2.1.0",
"prebuild-install": "^5.3.2",
"tar": "4.4.10"
"tar": "6.1.11"
},
"devDependencies": {
"chai": "^4.2.0",
"cli-color": "^1.4.0",
"fs-extra": "^8.1.0",
"mocha": "^6.2.0",
"nodemark": "^0.3.0",
"prebuild": "^9.1.1",
"sqlite": "^3.0.3"
},
"scripts": {
"install": "prebuild-install || npm run build-release",
"install": "npm run build-release",
"build-release": "node-gyp rebuild --release",
"build-debug": "node-gyp rebuild --debug",
"rebuild-release": "npm run lzz && npm run build-release",