mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-04-21 02:38:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixes for DB initalization and import of demo data

Browse Source
This commit is contained in:
azivner
2017-12-23 13:55:13 -05:00
parent cf8334607e
commit 79a4a6eb01
8 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/sql.js
+9 -22
View File
@@ -28,36 +28,23 @@ const dbReady = new Promise((resolve, reject) => {
if (tableResults.length !== 1) {
log.info("Connected to db, but schema doesn't exist. Initializing schema ...");
const schema = fs.readFileSync('schema.sql', 'UTF-8');
const schema = fs.readFileSync('db/schema.sql', 'UTF-8');
const notesSql = fs.readFileSync('db/main_notes.sql', 'UTF-8');
const notesTreeSql = fs.readFileSync('db/main_notes_tree.sql', 'UTF-8');
await doInTransaction(async () => {
await executeScript(schema);
await executeScript(notesSql);
await executeScript(notesTreeSql);
const noteId = utils.newNoteId();
const now = utils.nowDate();
await insert('notes_tree', {
note_tree_id: utils.newNoteTreeId(),
note_id: noteId,
parent_note_id: 'root',
note_position: 1,
is_deleted: 0,
date_modified: now
});
await insert('notes', {
note_id: noteId,
note_title: 'Welcome to Trilium!',
note_text: 'Text',
is_protected: 0,
is_deleted: 0,
date_created: now,
date_modified: now
});
const noteId = await getFirstValue("SELECT note_id FROM notes_tree WHERE parent_note_id = 'root' ORDER BY note_position");
await require('./options').initOptions(noteId);
await require('./sync_table').fillAllSyncRows();
});
log.info("Schema and initial content generated. Waiting for user to enter username/password to finish setup.");
// we don't resolve dbReady promise because user needs to setup the username and password to initialize
// the database
}