mirror of
https://gitlab.com/MrFry/mrfrys-node-server
synced 2025-04-01 20:24:18 +02:00
Merged type fixes
This commit is contained in:
mrfry
commit
85b5acc692
22 changed files with 583 additions and 150 deletions
|
|
@ -1,3 +1,23 @@
|
|||
/* ----------------------------------------------------------------------------
|
||||
|
||||
Question Server
|
||||
GitLab: <https://gitlab.com/MrFry/mrfrys-node-server>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
------------------------------------------------------------------------- */
|
||||
|
||||
// https://www.sqlitetutorial.net/sqlite-nodejs/
|
||||
// https://github.com/JoshuaWise/better-sqlite3/blob/HEAD/docs/api.md
|
||||
|
||||
|
|
@ -16,18 +36,25 @@ export default {
|
|||
sanitizeQuery: sanitizeQuery,
|
||||
}
|
||||
|
||||
import Sqlite, { Database } from 'better-sqlite3'
|
||||
import Sqlite, { Database, RunResult } from 'better-sqlite3'
|
||||
import logger from '../utils/logger'
|
||||
import utils from '../utils/utils'
|
||||
|
||||
const debugLog = process.env.NS_SQL_DEBUG_LOG
|
||||
|
||||
function sanitizeQuery(val: string): string {
|
||||
return val.replace(/'/g, '').replace(/;/g, '')
|
||||
function sanitizeQuery(val: string | number): string | number {
|
||||
if (typeof val === 'string') {
|
||||
return val.replace(/'/g, '').replace(/;/g, '')
|
||||
}
|
||||
return val
|
||||
}
|
||||
|
||||
// { asd: 'asd', basd: 4 } => asd = 'asd', basd = 4
|
||||
function GetSqlQuerry(conditions: any, type: string, joiner?: string) {
|
||||
function GetSqlQuerry(
|
||||
conditions: { [key: string]: string | number },
|
||||
type?: string,
|
||||
joiner?: string
|
||||
) {
|
||||
const res = Object.keys(conditions).reduce((acc, key) => {
|
||||
const item = conditions[key]
|
||||
const conditionKey = sanitizeQuery(key)
|
||||
|
|
@ -53,7 +80,7 @@ function GetSqlQuerry(conditions: any, type: string, joiner?: string) {
|
|||
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
function GetDB(path: string): any {
|
||||
function GetDB(path: string): Database {
|
||||
utils.CreatePath(path)
|
||||
const res = new Sqlite(path)
|
||||
res.pragma('synchronous = OFF')
|
||||
|
|
@ -66,7 +93,12 @@ function DebugLog(msg: string) {
|
|||
}
|
||||
}
|
||||
|
||||
function AddColumn(db: any, table: any, col: any): any {
|
||||
// FIXME: this might not work: what is col exactly, and how we use AddColumn?
|
||||
function AddColumn(
|
||||
db: Database,
|
||||
table: string,
|
||||
col: { [key: string]: string | number }
|
||||
): RunResult {
|
||||
try {
|
||||
const colName = Object.keys(col)[0]
|
||||
const colType = col.type
|
||||
|
|
@ -77,10 +109,17 @@ function AddColumn(db: any, table: any, col: any): any {
|
|||
return stmt.run()
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
function TableInfo(db: any, table: any): any {
|
||||
function TableInfo(
|
||||
db: Database,
|
||||
table: string
|
||||
): {
|
||||
columns: any[]
|
||||
dataCount: number
|
||||
} {
|
||||
try {
|
||||
const command = `PRAGMA table_info(${table})`
|
||||
const stmt = PrepareStatement(db, command)
|
||||
|
|
@ -98,10 +137,16 @@ function TableInfo(db: any, table: any): any {
|
|||
}
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
function Update(db: any, table: any, newData: any, conditions: any): any {
|
||||
function Update(
|
||||
db: Database,
|
||||
table: string,
|
||||
newData: { [key: string]: string | number },
|
||||
conditions: { [key: string]: string | number }
|
||||
): RunResult {
|
||||
try {
|
||||
const command = `UPDATE ${table} SET ${GetSqlQuerry(
|
||||
newData,
|
||||
|
|
@ -112,10 +157,15 @@ function Update(db: any, table: any, newData: any, conditions: any): any {
|
|||
return stmt.run()
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
function Delete(db: any, table: any, conditions: any): any {
|
||||
function Delete(
|
||||
db: Database,
|
||||
table: string,
|
||||
conditions: { [key: string]: string | number }
|
||||
): RunResult {
|
||||
try {
|
||||
const command = `DELETE FROM ${table} WHERE ${GetSqlQuerry(
|
||||
conditions,
|
||||
|
|
@ -126,10 +176,31 @@ function Delete(db: any, table: any, conditions: any): any {
|
|||
return stmt.run()
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
function CreateTable(db: any, name: any, columns: any, foreignKeys: any): any {
|
||||
interface DbColumnDescription {
|
||||
[key: string]: {
|
||||
type: string
|
||||
primary?: boolean
|
||||
autoIncrement?: boolean
|
||||
notNull?: boolean
|
||||
defaultZero?: boolean
|
||||
[key: string]: any
|
||||
}
|
||||
}
|
||||
|
||||
function CreateTable(
|
||||
db: Database,
|
||||
name: string,
|
||||
columns: DbColumnDescription,
|
||||
foreignKeys: {
|
||||
keysFrom: string[]
|
||||
table: string
|
||||
keysTo: string[]
|
||||
}[]
|
||||
): RunResult {
|
||||
// CREATE TABLE users(pw text PRIMARY KEY NOT NULL, id number, lastIP text, notes text, loginCount
|
||||
// number, lastLogin text, lastAccess text
|
||||
//
|
||||
|
|
@ -160,20 +231,14 @@ function CreateTable(db: any, name: any, columns: any, foreignKeys: any): any {
|
|||
|
||||
const fKeys: string[] = []
|
||||
if (foreignKeys) {
|
||||
foreignKeys.forEach(
|
||||
(foreignKey: {
|
||||
keysFrom: string[]
|
||||
table: string
|
||||
keysTo: string[]
|
||||
}) => {
|
||||
const { keysFrom, table, keysTo } = foreignKey
|
||||
fKeys.push(
|
||||
`, FOREIGN KEY(${keysFrom.join(
|
||||
', '
|
||||
)}) REFERENCES ${table}(${keysTo.join(', ')})`
|
||||
)
|
||||
}
|
||||
)
|
||||
foreignKeys.forEach((foreignKey) => {
|
||||
const { keysFrom, table, keysTo } = foreignKey
|
||||
fKeys.push(
|
||||
`, FOREIGN KEY(${keysFrom.join(
|
||||
', '
|
||||
)}) REFERENCES ${table}(${keysTo.join(', ')})`
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
// IF NOT EXISTS
|
||||
|
|
@ -182,10 +247,11 @@ function CreateTable(db: any, name: any, columns: any, foreignKeys: any): any {
|
|||
return stmt.run()
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
function SelectAll(db: any, from: any): any {
|
||||
function SelectAll(db: Database, from: string): any[] {
|
||||
try {
|
||||
const command = `SELECT * from ${from}`
|
||||
|
||||
|
|
@ -193,11 +259,17 @@ function SelectAll(db: any, from: any): any {
|
|||
return stmt.all()
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
// SELECT * FROM MyTable WHERE SomeColumn > LastValue ORDER BY SomeColumn LIMIT 100;
|
||||
function Select(db: any, from: any, conditions: any, options: any = {}): any {
|
||||
function Select(
|
||||
db: Database,
|
||||
from: string,
|
||||
conditions: { [key: string]: string | number },
|
||||
options: { joiner?: string; limit?: number } = {}
|
||||
): any[] {
|
||||
const { joiner, limit } = options
|
||||
|
||||
try {
|
||||
|
|
@ -215,10 +287,15 @@ function Select(db: any, from: any, conditions: any, options: any = {}): any {
|
|||
return stmt.all()
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
function Insert(db: any, table: any, data: any): any {
|
||||
function Insert(
|
||||
db: Database,
|
||||
table: string,
|
||||
data: { [key: string]: number | string }
|
||||
): RunResult {
|
||||
try {
|
||||
const cols = Object.keys(data)
|
||||
.reduce((acc, key) => {
|
||||
|
|
@ -228,15 +305,13 @@ function Insert(db: any, table: any, data: any): any {
|
|||
.join(', ')
|
||||
|
||||
const values = Object.keys(data)
|
||||
.reduce((acc, key) => {
|
||||
const item = data[key]
|
||||
.map((item) => {
|
||||
if (typeof item === 'string') {
|
||||
acc.push(`'${item}'`)
|
||||
return `'${item}'`
|
||||
} else {
|
||||
acc.push(`${item}`)
|
||||
return `${item}`
|
||||
}
|
||||
return acc
|
||||
}, [])
|
||||
})
|
||||
.join(', ')
|
||||
|
||||
const command = `INSERT INTO ${table} (${cols}) VALUES (${values})`
|
||||
|
|
@ -245,25 +320,22 @@ function Insert(db: any, table: any, data: any): any {
|
|||
return stmt.run()
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
function runStatement(db: any, command: string, runType?: string): any {
|
||||
function runStatement(db: Database, command: string, runType?: string): any {
|
||||
const stmt = PrepareStatement(db, command)
|
||||
if (!runType) {
|
||||
return stmt.all()
|
||||
} else if (runType === 'run') {
|
||||
return stmt.run()
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
function CloseDB(db: any): void {
|
||||
db.close((err: Error) => {
|
||||
if (err) {
|
||||
return console.error(err.message)
|
||||
}
|
||||
DebugLog('Close the database connection.')
|
||||
})
|
||||
function CloseDB(db: Database): void {
|
||||
db.close()
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue