Skip to content

Commit 13b55dc

Browse files
committed
implement best-practices for better-sqlite3
1 parent 45c0b4a commit 13b55dc

7 files changed

Lines changed: 13 additions & 15 deletions

File tree

databases/catdat/scripts/deduce-category-implications.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function deduce_category_implications(db: Database) {
1515
* Clears all deduced implications. This is done as a first step.
1616
*/
1717
function clear_deduced_category_implications(db: Database) {
18-
db.exec(`DELETE FROM category_implications WHERE is_deduced = TRUE`)
18+
db.prepare(`DELETE FROM category_implications WHERE is_deduced = TRUE`).run()
1919
}
2020

2121
/**

databases/catdat/scripts/deduce-category-properties.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,7 @@ function get_properties_dict(db: Database) {
195195
* This runs before the deduction starts.
196196
*/
197197
function delete_deduced_category_properties(db: Database) {
198-
db.exec(`
199-
DELETE FROM category_property_assignments
200-
WHERE is_deduced = TRUE`)
198+
db.prepare(`DELETE FROM category_property_assignments WHERE is_deduced = TRUE`).run()
201199
}
202200

203201
/**
@@ -285,7 +283,7 @@ function deduce_satisfied_category_properties(
285283
`
286284

287285
try {
288-
db.prepare(insert_sql).run(...values)
286+
db.prepare(insert_sql).run(values)
289287
} catch (err) {
290288
if (err instanceof SqliteError) {
291289
if (err.code.startsWith('SQLITE_CONSTRAINT')) {
@@ -395,7 +393,7 @@ function deduce_unsatisfied_category_properties(
395393
`
396394

397395
try {
398-
db.prepare(insert_query).run(...values)
396+
db.prepare(insert_query).run(values)
399397
} catch (err) {
400398
if (err instanceof SqliteError) {
401399
if (err.code.startsWith('SQLITE_CONSTRAINT')) {
@@ -461,7 +459,7 @@ function deduce_dual_category_properties(
461459
(category_id, property_id, is_satisfied, reason, is_deduced)
462460
VALUES ${value_fragments.join(',\n')}`
463461

464-
db.prepare(insert_query).run(...values)
462+
db.prepare(insert_query).run(values)
465463

466464
console.info(
467465
`Deduced ${new_satisfied.size} satisfied properties by duality for ${category.id}`,
@@ -486,7 +484,7 @@ function deduce_dual_category_properties(
486484
(category_id, property_id, is_satisfied, reason, is_deduced)
487485
VALUES ${value_fragments.join(',\n')}`
488486

489-
db.prepare(insert_query).run(...values)
487+
db.prepare(insert_query).run(values)
490488

491489
console.info(
492490
`Deduced ${new_unsatisfied.size} unsatisfied properties by duality for ${category.id}`,

databases/catdat/scripts/deduce-functor-implications.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export function deduce_functor_implications(db: Database) {
1717
* Clears all deduced functor implications. This is done as a first step.
1818
*/
1919
function clear_deduced_functor_implications(db: Database) {
20-
db.exec(`DELETE FROM functor_implications WHERE is_deduced = TRUE`)
20+
db.prepare(`DELETE FROM functor_implications WHERE is_deduced = TRUE`).run()
2121
}
2222

2323
/**

databases/catdat/scripts/deduce-functor-properties.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ function get_functor_properties_dict(db: Database) {
204204
* This runs before the deduction starts.
205205
*/
206206
function delete_deduced_functor_properties(db: Database) {
207-
db.exec('DELETE FROM functor_property_assignments WHERE is_deduced = TRUE')
207+
db.prepare('DELETE FROM functor_property_assignments WHERE is_deduced = TRUE').run()
208208
}
209209

210210
/**
@@ -283,7 +283,7 @@ function deduce_satisfied_functor_properties(
283283
${value_fragments.join(',\n')}
284284
`
285285

286-
db.prepare(insert_sql).run(...values)
286+
db.prepare(insert_sql).run(values)
287287
}
288288

289289
console.info(
@@ -371,7 +371,7 @@ function deduce_unsatisfied_functor_properties(
371371
VALUES
372372
${value_fragments.join(',\n')}`
373373

374-
db.prepare(insert_query).run(...values)
374+
db.prepare(insert_query).run(values)
375375
}
376376

377377
console.info(

databases/catdat/scripts/deduce.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { get_client } from './shared'
1212
function deduce() {
1313
const db = get_client()
1414

15-
db.exec('PRAGMA foreign_keys = ON')
15+
db.pragma('foreign_keys = ON')
1616

1717
deduce_category_implications(db)
1818
deduce_category_properties(db)

databases/catdat/scripts/setup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function setup() {
1111
console.info('\n--- Setup CatDat database ---')
1212

1313
const db = get_client()
14-
db.exec('PRAGMA foreign_keys = ON')
14+
db.pragma('foreign_keys = ON')
1515

1616
const schema_folder = path.join(process.cwd(), 'databases', 'catdat', 'schema')
1717

src/lib/server/db.catdat.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const db_path = join(process.cwd(), 'databases', 'catdat', 'catdat.db')
77
/**
88
* Database client for the CatDat database holding all mathematical knowledge
99
*/
10-
const db = new Database(db_path, { readonly: true })
10+
const db = new Database(db_path, { readonly: true, fileMustExist: true })
1111

1212
/**
1313
* Small wrapper around db.prepare.all to handle errors,

0 commit comments

Comments
 (0)