Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sqlite3 v5 #953

Merged
merged 21 commits into from
Sep 7, 2022
Merged

Sqlite3 v5 #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9e211d9
Use sqlite3@5
gjsjohnmurray Jul 29, 2022
be7f85e
:up: sass-loader to v10 fix build breakage caused by node-sass@7
gjsjohnmurray Jul 29, 2022
d351507
:up: sass-loader to fix build breakage caused by node-sass@7
gjsjohnmurray Jul 29, 2022
cf87929
:up: use node 16 (current LTS) to fix broken build
gjsjohnmurray Jul 29, 2022
f5f8b37
Try building with node 14
gjsjohnmurray Jul 29, 2022
c9fa9c3
Merge branch 'dev' into sqlite3-v5
gjsjohnmurray Jul 29, 2022
18fdacb
add missing `void` return type to Promise constructor call
gjsjohnmurray Aug 1, 2022
cb2a4e7
Merge remote-tracking branch 'upstream/dev' into sqlite3-v5
gjsjohnmurray Aug 10, 2022
f7d76f2
Set SQLite3Version constant to match package.json
gjsjohnmurray Sep 5, 2022
d5ecb01
No longer need to build/load sqlite3 at runtime
gjsjohnmurray Sep 5, 2022
4e100ca
Move sqlite3 to devDependencies
gjsjohnmurray Sep 5, 2022
3b09bab
Tell esbuild that three sqlite3 dependencies are external
gjsjohnmurray Sep 5, 2022
eb2d71c
Merge remote-tracking branch 'upstream/dev' into sqlite3-v5
gjsjohnmurray Sep 5, 2022
05cb91d
Revert "Tell esbuild that three sqlite3 dependencies are external"
gjsjohnmurray Sep 5, 2022
e9524d2
Revert "Move sqlite3 to devDependencies"
gjsjohnmurray Sep 5, 2022
810d46b
Revert "No longer need to build/load sqlite3 at runtime"
gjsjohnmurray Sep 5, 2022
d0e893a
Use sqlite3@5.011 instead of @5.0.10
gjsjohnmurray Sep 5, 2022
a31bf2e
Make driver.sqlite build task work cross-env
gjsjohnmurray Sep 5, 2022
271240b
Updated yarn.lock
gjsjohnmurray Sep 5, 2022
aaca5c2
Remove -dev.953 suffix from VSIX version
gjsjohnmurray Sep 5, 2022
d2eb00c
Make changes after review by @mtxr
gjsjohnmurray Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/driver.sqlite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "sqltools-driver-sqlite",
"displayName": "SQLTools SQLite",
"description": "SQLTools SQLite",
"version": "0.3.0",
"version": "0.3.1",
"engines": {
"vscode": "^1.42.0"
},
Expand Down Expand Up @@ -46,7 +46,7 @@
"predev": "yarn run clean",
"dev": "concurrently -k \"npm:dev:*\"",
"prebuild": "yarn run clean && yarn run tsc-check",
"build": "NODE_ENV=production concurrently \"npm:build:*\"",
"build": "cross-env NODE_ENV=production concurrently \"npm:build:*\"",
"build:ext": "yarn run compile:ext --define:process.env.NODE_ENV=\"'production'\" --minify",
"build:ls": "yarn run compile:ls --define:process.env.NODE_ENV=\"'production'\" --minify",
"esbuild": "esbuild --platform=node --tsconfig=./tsconfig.json --external:vscode --log-level=error --color=true --format=cjs",
Expand All @@ -64,10 +64,11 @@
},
"devDependencies": {
"@sqltools/base-driver": "latest",
"@types/sqlite3": "^3.1.6",
"@types/sqlite3": "^3.1.8",
"@types/vscode": "^1.42.0",
"chokidar-cli": "^2.1.0",
"concurrently": "^5.2.0",
"cross-env": "^7.0.2",
"esbuild": "0.14.50",
"rimraf": "^3.0.2",
"typescript": "~4.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/driver.sqlite/src/ls/driver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { parse as queryParse } from '@sqltools/util/query';
import generateId from '@sqltools/util/internal-id';
import keywordsCompletion from './keywords';

const SQLite3Version = '4.2.0';
const SQLite3Version = '5.0.11';

export default class SQLite extends AbstractDriver<SQLiteLib.Database, any> implements IConnectionDriver {

Expand Down Expand Up @@ -57,7 +57,7 @@ export default class SQLite extends AbstractDriver<SQLiteLib.Database, any> impl
public async close() {
if (!this.connection) return Promise.resolve();
const db = await this.connection
await new Promise((resolve, reject) => {
await new Promise<void>((resolve, reject) => {
db.close(err => err ? reject(err) : resolve());
});
this.connection = null;
Expand Down
Loading