Skip to content

Commit 7d7ef31

Browse files
authored
fix all warnings (#155)
* fix all warnings * lint bench * Remove sqlite ignore flag from lint step in CI workflow * Remove sqlite from deno fmt ignore list in CI workflow * ignore sqlite3 dir from deno lsp * ignore sqlite3 dir from deno lsp * Trigger CI
1 parent 0046158 commit 7d7ef31

File tree

10 files changed

+39
-16
lines changed

10 files changed

+39
-16
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
deno-version: "v2.x"
2020

2121
- name: Check Formatting
22-
run: deno fmt --check --ignore=sqlite
22+
run: deno fmt --check
2323

2424
- name: Lint
25-
run: deno lint --ignore=sqlite,bench
25+
run: deno lint
2626

2727
- name: Check
2828
run: deno check src/ test/ scripts/ mod.ts

bench/bench_bun.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import process from "node:process";
12
import { Database } from "bun:sqlite";
23

34
// Unsafe concurrency is default.

bench/bench_bun_ffi.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import process from "node:process";
12
import { dlopen, ptr } from "bun:ffi";
23

34
import {

bench/bench_deno_wasm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DB } from "https://deno.land/x/sqlite/mod.ts";
1+
import { DB } from "https://deno.land/x/sqlite@v3.9.1/mod.ts";
22
import { nextTick } from "https://deno.land/std@0.126.0/node/_next_tick.ts";
33

44
const db = new DB(":memory:");

bench/bench_node.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import process from "node:process";
12
const db = require("better-sqlite3")(":memory:");
23

34
db.exec("PRAGMA auto_vacuum = none");

bench/northwind/deno_old.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Database } from "https://deno.land/x/sqlite3@0.4.3/mod.ts";
2-
import { bench, run } from "../node_modules/mitata/src/cli.mjs";
2+
import { bench, run } from "../../node_modules/mitata/src/cli.mjs";
33

44
const db = new Database("./bench/northwind.sqlite");
55

bench/northwind/node.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { bench, run } from "mitata";
2-
import { createRequire } from "module";
2+
import { createRequire } from "node:module";
33

44
const require = createRequire(import.meta.url);
55
const db = require("better-sqlite3")("./bench/northwind.sqlite");

deno.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@
2727
"bench-bun:northwind": "bun run bench/northwind/bun.js"
2828
},
2929

30-
"fmt": {
31-
"exclude": [
32-
"sqlite"
33-
]
34-
},
35-
3630
"lint": {
3731
"exclude": ["bench"],
3832
"rules": {
@@ -46,5 +40,10 @@
4640
"explicit-module-boundary-types"
4741
]
4842
}
43+
},
44+
"compilerOptions": {
45+
"types": [
46+
"./node_modules/bun-types/index.d.ts"
47+
]
4948
}
5049
}

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@
2323
"dependencies": {
2424
"better-sqlite3": "^7.6.2",
2525
"mitata": "^0.1.6"
26+
},
27+
"devDependencies": {
28+
"bun-types": "^1.2.14"
2629
}
2730
}

src/statement.ts

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,13 @@ export class Statement<TStatement extends object = Record<string, any>> {
468468
)(getColumn);
469469
let status = sqlite3_step(handle);
470470
while (status === SQLITE3_ROW) {
471-
result.push(getRowArray(handle, this.int64 ?? this.db.int64, this.parseJson ?? this.db.parseJson));
471+
result.push(
472+
getRowArray(
473+
handle,
474+
this.int64 ?? this.db.int64,
475+
this.parseJson ?? this.db.parseJson,
476+
),
477+
);
472478
status = sqlite3_step(handle);
473479
}
474480
if (status !== SQLITE3_DONE) {
@@ -501,7 +507,13 @@ export class Statement<TStatement extends object = Record<string, any>> {
501507
)(getColumn);
502508
let status = sqlite3_step(handle);
503509
while (status === SQLITE3_ROW) {
504-
result.push(getRowArray(handle, this.int64 ?? this.db.int64, this.parseJson ?? this.db.parseJson));
510+
result.push(
511+
getRowArray(
512+
handle,
513+
this.int64 ?? this.db.int64,
514+
this.parseJson ?? this.db.parseJson,
515+
),
516+
);
505517
status = sqlite3_step(handle);
506518
}
507519
if (!this.#hasNoArgs && !this.#bound && params.length) {
@@ -514,9 +526,15 @@ export class Statement<TStatement extends object = Record<string, any>> {
514526
return result as T[];
515527
}
516528

517-
#rowObjectFn: ((h: Deno.PointerValue, int64: boolean, parseJson: boolean) => any) | undefined;
529+
#rowObjectFn:
530+
| ((h: Deno.PointerValue, int64: boolean, parseJson: boolean) => any)
531+
| undefined;
518532

519-
getRowObject(): (h: Deno.PointerValue, int64: boolean, parseJson: boolean) => any {
533+
getRowObject(): (
534+
h: Deno.PointerValue,
535+
int64: boolean,
536+
parseJson: boolean,
537+
) => any {
520538
if (!this.#rowObjectFn || !this.#unsafeConcurrency) {
521539
const columnNames = this.columnNames();
522540
const getRowObject = new Function(
@@ -733,7 +751,7 @@ export class Statement<TStatement extends object = Record<string, any>> {
733751

734752
/** Iterate over resultant rows from query. */
735753
*iter(...params: RestBindParameters): IterableIterator<any> {
736-
this.#begin();
754+
this.#begin();
737755
this.#bindAll(params);
738756
const getRowObject = this.getRowObject();
739757
const int64 = this.int64 ?? this.db.int64;

0 commit comments

Comments
 (0)