added / fixed some types

This commit is contained in:
mrfry 2022-03-14 19:35:42 +01:00
parent 5f12284bb8
commit bc5c293539
41 changed files with 4378 additions and 8304 deletions

View file

@ -15,7 +15,7 @@ export default {
runStatement: runStatement,
}
import Sqlite from 'better-sqlite3'
import Sqlite, { Database } from 'better-sqlite3'
import logger from '../utils/logger'
import utils from '../utils/utils'
@ -52,7 +52,7 @@ function GetDB(path: string): any {
return res
}
function DebugLog(msg) {
function DebugLog(msg: string) {
if (debugLog) {
logger.DebugLog(msg, 'sql', 0)
}
@ -131,7 +131,7 @@ function CreateTable(db: any, name: any, columns: any, foreignKeys: any): any {
const cols = Object.keys(columns)
.reduce((acc, key) => {
const item = columns[key]
const flags = []
const flags: string[] = []
const toCheck = {
primary: 'PRIMARY KEY',
notNull: 'NOT NULL',
@ -150,16 +150,22 @@ function CreateTable(db: any, name: any, columns: any, foreignKeys: any): any {
}, [])
.join(', ')
const fKeys = []
const fKeys: string[] = []
if (foreignKeys) {
foreignKeys.forEach((foreignKey) => {
const { keysFrom, table, keysTo } = foreignKey
fKeys.push(
`, FOREIGN KEY(${keysFrom.join(
', '
)}) REFERENCES ${table}(${keysTo.join(', ')})`
)
})
foreignKeys.forEach(
(foreignKey: {
keysFrom: string[]
table: string
keysTo: string[]
}) => {
const { keysFrom, table, keysTo } = foreignKey
fKeys.push(
`, FOREIGN KEY(${keysFrom.join(
', '
)}) REFERENCES ${table}(${keysTo.join(', ')})`
)
}
)
}
// IF NOT EXISTS
@ -244,7 +250,7 @@ function runStatement(db: any, command: string, runType?: string): any {
}
function CloseDB(db: any): void {
db.close((err) => {
db.close((err: Error) => {
if (err) {
return console.error(err.message)
}
@ -254,7 +260,7 @@ function CloseDB(db: any): void {
// -------------------------------------------------------------------------
function PrepareStatement(db, command) {
function PrepareStatement(db: Database, command: string) {
if (!db) {
throw new Error(
'DB is undefined in prepare statement! DB action called with undefined db'