Enable the use of PRAGMA Key to encrypt db

.github/dependabot.yml

@@ -0,0 +1,13 @@
+# Keep GitHub Actions up to date with GitHub's Dependabot...
+# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    groups:
+      github-actions:
+        patterns:
+          - "*"  # Group all Actions updates into a single larger pull request
+    schedule:
+      interval: weekly

.github/workflows/build.yml

@@ -12,112 +12,167 @@ on:
       - released
   workflow_dispatch: {}
 
+env:
+  # See https://github.com/nodejs/release#release-schedule
+  # Node.js v16 EOL = 2023-09-11. v21 EOL = 2024-06-01.
+  NODE_BUILD_CMD: npx --no-install prebuild -r node -t 18.0.0 -t 20.0.0 -t 22.0.0 -t 23.0.0 --include-regex 'better_sqlite3.node$'
+  # Merge with NODE_BUILD_CMD when Node.js v18 is EOL
+  NO_V18_NODE_BUILD_CMD: npx --no-install prebuild -r node -t 20.0.0 -t 22.0.0 -t 23.0.0 --include-regex 'better_sqlite3.node$'
+  # See https://www.electronjs.org/docs/latest/tutorial/electron-timelines#version-support-policy
+  # Electron v25 EOL = 2023-12-05. v26 EOL = 2024-02-20. v27 EOL = 2024-04-16. v28 EOL = 2024-06-11. v29 EOL = 2024-08-20.
+  ELECTRON_BUILD_CMD: npx --no-install prebuild -r electron -t 26.0.0 -t 27.0.0 -t 28.0.0 -t 29.0.0 -t 30.0.0 -t 31.0.0 -t 32.0.0 -t 33.0.0 --include-regex 'better_sqlite3.node$'
+
 jobs:
   test:
     strategy:
       matrix:
         os:
           - ubuntu-20.04
-          - macos-latest
+          - macos-13
+          - macos-14
           - windows-2019
         node:
-          - 14
-          - 16
           - 18
-          - 19
+          - 20
+          - 22
+          - 23
     name: Testing Node ${{ matrix.node }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
+      - if: ${{ startsWith(matrix.os, 'windows') }}
+        run: pip.exe install setuptools
+      - if: ${{ startsWith(matrix.os, 'macos') }}
+        run: brew install python-setuptools
+      - if: ${{ !startsWith(matrix.os, 'windows') && !startsWith(matrix.os, 'macos') }}
+        run: python3 -m pip install setuptools
+      - if: ${{ startsWith(matrix.os, 'ubuntu') }}
+        run: |
+          sudo apt update
+          sudo apt install gcc-10 g++-10 -y
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10
       - run: npm install --ignore-scripts
       - run: npm run build-debug
       - run: npm test
+      - name: Test SpatiaLite extension
+        if: ${{ startsWith(matrix.os, 'ubuntu') }}
+        run: |
+          sudo apt update
+          sudo apt install libsqlite3-mod-spatialite -y
+          node -e "require('./lib/index.js')(':memory:').loadExtension('mod_spatialite').exec('SELECT InitSpatialMetaData();')"
 
   publish:
     if: ${{ github.event_name == 'release' }}
     name: Publishing to NPM
     runs-on: ubuntu-20.04
-    needs: test
+    needs:
+      - prebuild
+      - prebuild-alpine
+      - prebuild-alpine-arm
+      - prebuild-linux-arm
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
           registry-url: https://registry.npmjs.org
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   prebuild:
+    if: ${{ github.event_name == 'release' }}
     strategy:
+      fail-fast: false
       matrix:
         os:
           - ubuntu-20.04
-          - macos-latest
+          - macos-13
+          - macos-14
           - windows-2019
     name: Prebuild on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    needs: publish
+    needs: test
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
+      - if: ${{ startsWith(matrix.os, 'windows') }}
+        run: pip.exe install setuptools
+      - if: ${{ startsWith(matrix.os, 'macos') }}
+        run: brew install python-setuptools
+      - if: ${{ !startsWith(matrix.os, 'windows') && !startsWith(matrix.os, 'macos') }}
+        run: python3 -m pip install setuptools
+      - if: ${{ startsWith(matrix.os, 'ubuntu') }}
+        run: |
+          sudo apt update
+          sudo apt install gcc-10 g++-10 -y
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10
       - run: npm install --ignore-scripts
-      - run: npx --no-install prebuild -r node -t 14.0.0 -t 16.0.0 -t 18.0.0 --include-regex 'better_sqlite3.node$' -u ${{ secrets.GITHUB_TOKEN }}
-      - run: npx --no-install prebuild -r electron -t 16.0.0 -t 17.0.0 -t 18.0.0 -t 19.0.0 -t 20.0.0 -t 21.0.0 -t 22.0.0 -t 23.0.0 -t 24.0.0 --include-regex 'better_sqlite3.node$' -u ${{ secrets.GITHUB_TOKEN }}
+      - run: ${{ env.NODE_BUILD_CMD }} -u ${{ secrets.GITHUB_TOKEN }}
+      - run: ${{ env.ELECTRON_BUILD_CMD }} -u ${{ secrets.GITHUB_TOKEN }}
       - if: matrix.os == 'windows-2019'
-        run: npx --no-install prebuild -r electron -t 16.0.0 -t 17.0.0 -t 18.0.0 -t 19.0.0 -t 20.0.0 -t 21.0.0 -t 22.0.0 -t 23.0.0 -t 24.0.0 --include-regex 'better_sqlite3.node$' --arch ia32 -u ${{ secrets.GITHUB_TOKEN }}
-      - if: matrix.os == 'macos-latest'
-        run: npx --no-install prebuild -r electron -t 16.0.0 -t 17.0.0 -t 18.0.0 -t 19.0.0 -t 20.0.0 -t 21.0.0 -t 22.0.0 -t 23.0.0 -t 24.0.0 --include-regex 'better_sqlite3.node$' --arch arm64 -u ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          ${{ env.NODE_BUILD_CMD }} --arch ia32 -u ${{ secrets.GITHUB_TOKEN }}
+          ${{ env.NO_V18_NODE_BUILD_CMD }} --arch arm64 -u ${{ secrets.GITHUB_TOKEN }}
+          ${{ env.ELECTRON_BUILD_CMD }} --arch ia32 -u ${{ secrets.GITHUB_TOKEN }}
+          ${{ env.ELECTRON_BUILD_CMD }} --arch arm64 -u ${{ secrets.GITHUB_TOKEN }}
 
   prebuild-alpine:
+    if: ${{ github.event_name == 'release' }}
+    strategy:
+      fail-fast: false
     name: Prebuild on alpine
     runs-on: ubuntu-latest
-    container: node:16-alpine
-    needs: publish
+    container: node:18-alpine
+    needs: test
     steps:
-      - uses: actions/checkout@v3
-      - run: apk add build-base git python3 --update-cache
+      - uses: actions/checkout@v4
+      - run: apk add build-base git python3 py3-setuptools --update-cache
       - run: npm install --ignore-scripts
-      - run: npx --no-install prebuild -r node -t 14.0.0 -t 16.0.0 -t 18.0.0 --include-regex 'better_sqlite3.node$' -u ${{ secrets.GITHUB_TOKEN }}
+      - run: ${{ env.NODE_BUILD_CMD }} -u ${{ secrets.GITHUB_TOKEN }}
 
   prebuild-alpine-arm:
+    if: ${{ github.event_name == 'release' }}
     strategy:
+      fail-fast: false
       matrix:
         arch:
           - arm/v7
           - arm64
     name: Prebuild on alpine (${{ matrix.arch }})
     runs-on: ubuntu-latest
-    needs: publish
+    needs: test
     steps:
-      - uses: actions/checkout@v3
-      - uses: docker/setup-qemu-action@v1
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
       - run: |
-          docker run --rm -v $(pwd):/tmp/project --entrypoint /bin/sh --platform linux/${{ matrix.arch }} node:16-alpine -c "\
-          apk add build-base git python3 --update-cache && \
+          docker run --rm -v $(pwd):/tmp/project --entrypoint /bin/sh --platform linux/${{ matrix.arch }} node:18-alpine -c "\
+          apk add build-base git python3 py3-setuptools --update-cache && \
           cd /tmp/project && \
           npm install --ignore-scripts && \
-          npx --no-install prebuild -r node -t 14.0.0 -t 16.0.0 -t 18.0.0 --include-regex 'better_sqlite3.node$' -u ${{ secrets.GITHUB_TOKEN }}"
+          ${{ env.NODE_BUILD_CMD }} -u ${{ secrets.GITHUB_TOKEN }}"
 
   prebuild-linux-arm:
+    if: ${{ github.event_name == 'release' }}
     strategy:
+      fail-fast: false
       matrix:
         arch:
           - arm/v7
           - arm64
     name: Prebuild on Linux (${{ matrix.arch }})
     runs-on: ubuntu-latest
-    needs: publish
+    needs: test
     steps:
-      - uses: actions/checkout@v3
-      - uses: docker/setup-qemu-action@v1
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
       - run: |
-          docker run --rm -v $(pwd):/tmp/project --entrypoint /bin/sh --platform linux/${{ matrix.arch }} node:16 -c "\
+          docker run --rm -v $(pwd):/tmp/project --entrypoint /bin/sh --platform linux/${{ matrix.arch }} node:18-bullseye -c "\
           cd /tmp/project && \
           npm install --ignore-scripts && \
-          npx --no-install prebuild -r node -t 14.0.0 -t 16.0.0 -t 18.0.0 --include-regex 'better_sqlite3.node$' -u ${{ secrets.GITHUB_TOKEN }}"
+          ${{ env.NODE_BUILD_CMD }} -u ${{ secrets.GITHUB_TOKEN }}"

.github/workflows/bump-version.yml

@@ -17,13 +17,13 @@ jobs:
     name: Bump to a new version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.PAT }}
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
       - name: Configure user
         run: |
           git config --local user.name "${{ github.actor }}"

.github/workflows/update-sqlite.yml

@@ -18,13 +18,13 @@ jobs:
       ENV_YEAR: ${{ github.event.inputs.year }}
       ENV_VERSION: ${{ github.event.inputs.version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.PAT }}
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
       - name: Create new update branch
         run: git checkout -b sqlite-update-${{ env.ENV_VERSION }}
       - name: Update download script
@@ -35,7 +35,7 @@ jobs:
       - name: Download, compile and package SQLite
         run: npm run download
       - name: Push update branch
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Update SQLite to version ${{ env.ENV_TRUE_VERSION }}
           branch: sqlite-update-${{ env.ENV_VERSION }}

binding.gyp

@@ -9,14 +9,14 @@
       'target_name': 'better_sqlite3',
       'dependencies': ['deps/sqlite3.gyp:sqlite3'],
       'sources': ['src/better_sqlite3.cpp'],
-      'cflags_cc': ['-std=c++17'],
+      'cflags_cc': ['-std=c++20'],
       'xcode_settings': {
-        'OTHER_CPLUSPLUSFLAGS': ['-std=c++17', '-stdlib=libc++'],
+        'OTHER_CPLUSPLUSFLAGS': ['-std=c++20', '-stdlib=libc++'],
       },
       'msvs_settings': {
         'VCCLCompilerTool': {
           'AdditionalOptions': [
-            '/std:c++17',
+            '/std:c++20',
           ],
         },
       },

deps/copy.js

@@ -18,9 +18,14 @@ if (process.argv[3]) {
 }
 
 for (const { filename, optional } of files) {
-	if (optional && !fs.existsSync(path.join(source, filename))) {
+	const sourceFilepath = path.join(source, filename);
+	const destFilepath = path.join(dest, filename);
+
+	if (optional && !fs.existsSync(sourceFilepath)) {
 		continue;
 	}
-	fs.accessSync(path.join(source, filename));
-	fs.copyFileSync(path.join(source, filename), path.join(dest, filename));
+
+	fs.accessSync(sourceFilepath);
+	fs.mkdirSync(path.dirname(destFilepath), { recursive: true });
+	fs.copyFileSync(sourceFilepath, destFilepath);
 }

deps/defines.gypi

@@ -9,12 +9,14 @@
     'HAVE_UINT16_T=1',
     'HAVE_UINT32_T=1',
     'HAVE_UINT8_T=1',
+    'HAVE_USLEEP=1',
     'SQLITE_DEFAULT_CACHE_SIZE=-16000',
     'SQLITE_DEFAULT_FOREIGN_KEYS=1',
     'SQLITE_DEFAULT_MEMSTATUS=0',
     'SQLITE_DEFAULT_WAL_SYNCHRONOUS=1',
     'SQLITE_DQS=0',
     'SQLITE_ENABLE_COLUMN_METADATA',
+    'SQLITE_ENABLE_DBSTAT_VTAB',
     'SQLITE_ENABLE_DESERIALIZE',
     'SQLITE_ENABLE_FTS3',
     'SQLITE_ENABLE_FTS3_PARENTHESIS',
@@ -26,10 +28,8 @@
     'SQLITE_ENABLE_RTREE',
     'SQLITE_ENABLE_STAT4',
     'SQLITE_ENABLE_UPDATE_DELETE_LIMIT',
-    'SQLITE_INTROSPECTION_PRAGMAS',
     'SQLITE_LIKE_DOESNT_MATCH_BLOBS',
     'SQLITE_OMIT_DEPRECATED',
-    'SQLITE_OMIT_GET_TABLE',
     'SQLITE_OMIT_PROGRESS_CALLBACK',
     'SQLITE_OMIT_SHARED_CACHE',
     'SQLITE_OMIT_TCL_VARIABLE',

deps/download.sh

@@ -18,8 +18,8 @@
 # 4. node-gyp links the two resulting binaries to generate better_sqlite3.node.
 # ===
 
-YEAR="2023"
-VERSION="3410200"
+YEAR="2024"
+VERSION="3470000"
 
 # Defines below are sorted alphabetically
 DEFINES="
@@ -30,12 +30,14 @@ HAVE_STDINT_H=1
 HAVE_UINT16_T=1
 HAVE_UINT32_T=1
 HAVE_UINT8_T=1
+HAVE_USLEEP=1
 SQLITE_DEFAULT_CACHE_SIZE=-16000
 SQLITE_DEFAULT_FOREIGN_KEYS=1
 SQLITE_DEFAULT_MEMSTATUS=0
 SQLITE_DEFAULT_WAL_SYNCHRONOUS=1
 SQLITE_DQS=0
 SQLITE_ENABLE_COLUMN_METADATA
+SQLITE_ENABLE_DBSTAT_VTAB
 SQLITE_ENABLE_DESERIALIZE
 SQLITE_ENABLE_FTS3
 SQLITE_ENABLE_FTS3_PARENTHESIS
@@ -47,10 +49,8 @@ SQLITE_ENABLE_MATH_FUNCTIONS
 SQLITE_ENABLE_RTREE
 SQLITE_ENABLE_STAT4
 SQLITE_ENABLE_UPDATE_DELETE_LIMIT
-SQLITE_INTROSPECTION_PRAGMAS
 SQLITE_LIKE_DOESNT_MATCH_BLOBS
 SQLITE_OMIT_DEPRECATED
-SQLITE_OMIT_GET_TABLE
 SQLITE_OMIT_PROGRESS_CALLBACK
 SQLITE_OMIT_SHARED_CACHE
 SQLITE_OMIT_TCL_VARIABLE
@@ -88,6 +88,15 @@ make sqlite3.c > /dev/null || exit 1
 echo "copying amalgamation..."
 cp sqlite3.c sqlite3.h sqlite3ext.h "$OUTPUT/" || exit 1
 
+echo "applying patches..."
+cd "$DEPS" || exit 1
+for patch in patches/*.patch; do
+  # If a patch fails, just skip it an move on.
+  # By default `patch` tries to be clever and reverse the patch, so we have to specify `--forward`.
+  # If the patch fails, we # don't write .orig and .rej files, so we have to specify `--no-backup-if-mismatch` and `--reject-file=-`.
+  patch --batch --forward --no-backup-if-mismatch --reject-file=- -p2 < "$patch"
+done
+
 echo "updating gyp configs..."
 GYP="$DEPS/defines.gypi"
 printf "# THIS FILE IS AUTOMATICALLY GENERATED BY deps/download.sh (DO NOT EDIT)\n\n{\n  'defines': [\n" > "$GYP"

deps/patches/1208.patch

@@ -0,0 +1,15 @@
+diff --git a/deps/sqlite3/sqlite3.c b/deps/sqlite3/sqlite3.c
+index b1a807f..38bd1e6 100644
+--- a/deps/sqlite3/sqlite3.c
++++ b/deps/sqlite3/sqlite3.c
+@@ -24887,8 +24887,8 @@ static const struct {
+   /* 1 */ { 6, "minute",   7.7379e+12,        60.0  },
+   /* 2 */ { 4, "hour",     1.2897e+11,      3600.0  },
+   /* 3 */ { 3, "day",      5373485.0,      86400.0  },
+-  /* 4 */ { 5, "month",    176546.0,  30.0*86400.0  },
+-  /* 5 */ { 4, "year",     14713.0,  365.0*86400.0  },
++  /* 4 */ { 5, "month",    176546.0,     2592000.0  },
++  /* 5 */ { 4, "year",     14713.0,     31536000.0  },
+ };
+
+ /*