Skip to content

Commit

Permalink
Require rusty-store-kv (#748)
Browse files Browse the repository at this point in the history
Co-authored-by: SamTV12345 <noreply+samtv1235@github.com>
  • Loading branch information
SamTV12345 and SamTV12345 authored Sep 9, 2024
1 parent d4d33c9 commit d7d926d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 21 deletions.
13 changes: 3 additions & 10 deletions databases/rusty_db.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import AbstractDatabase from "../lib/AbstractDatabase";
import {KeyValueDB} from 'rusty-store-kv'

export default class Rusty_db extends AbstractDatabase {
db: any |null| undefined
Expand Down Expand Up @@ -33,16 +34,8 @@ export default class Rusty_db extends AbstractDatabase {
}

async init() {
let RUSTY_DB
try {
RUSTY_DB = await import('rusty-store-kv');
} catch (err) {
throw new Error(
'rusty-store-kv not found. It was removed from ueberdb\'s dependencies because it requires ' +
'compilation which fails on several systems. If you still want to use rusty store kv, run ' +
'"pnpm install rusty-store-kv" in your etherpad-lite ./src directory.');
}
this.db = new RUSTY_DB.KeyValueDB(this.settings.filename!);

this.db = new KeyValueDB(this.settings.filename!);
}

close() {
Expand Down
12 changes: 2 additions & 10 deletions databases/sqlite_db.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';
import {BulkObject} from "./cassandra_db";
import AbstractDatabase, {Settings} from "../lib/AbstractDatabase";
import {SQLite} from "rusty-store-kv";

/**
* 2011 Peter 'Pita' Martischka
Expand Down Expand Up @@ -43,16 +44,7 @@ export default class SQLiteDB extends AbstractDatabase {
}

init(callback: Function) {
let SQLITEDB
try {
SQLITEDB = require('rusty-store-kv');
} catch (err) {
throw new Error(
'rusty-store-kv not found. It was removed from ueberdb\'s dependencies because it requires ' +
'compilation which fails on several systems. If you still want to use sqlite, run ' +
'"pnpm install rusty-store-kv" in your etherpad-lite ./src directory.');
}
this.db = new SQLITEDB.SQLite(this.settings.filename as string)
this.db = new SQLite(this.settings.filename as string)
callback();
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"url": "https://github.com/ether/ueberDB.git"
},
"main": "./dist/index.js",
"version": "4.2.104",
"version": "5.0.0",
"bugs": {
"url": "https://github.com/ether/ueberDB/issues"
},
Expand Down

0 comments on commit d7d926d

Please sign in to comment.