From 56405e54f9709f32c64535564ddf70bbb6459a81 Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Wed, 23 Aug 2017 10:26:23 +0200 Subject: [PATCH] Downgraded from sqlite3 to sqlite because of connection function error. --- seasoned_api/conf/development.json | 2 +- seasoned_api/package.json | 1 + seasoned_api/src/database/sqliteDatabase.js | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/seasoned_api/conf/development.json b/seasoned_api/conf/development.json index e5d2fe1..22bde7c 100644 --- a/seasoned_api/conf/development.json +++ b/seasoned_api/conf/development.json @@ -1,6 +1,6 @@ { "database": { - "host": "shows.db" + "host": "../shows.db" }, "webserver": { "port": 31459 diff --git a/seasoned_api/package.json b/seasoned_api/package.json index 3ec5c86..52fe956 100644 --- a/seasoned_api/package.json +++ b/seasoned_api/package.json @@ -15,6 +15,7 @@ "python-shell": "^0.4.0", "request": "^2.81.0", "request-promise": "^4.2", + "sqlite": "^2.2.1", "sqlite3": "^2.5.0" } } diff --git a/seasoned_api/src/database/sqliteDatabase.js b/seasoned_api/src/database/sqliteDatabase.js index 0da7b07..3d0c5a4 100644 --- a/seasoned_api/src/database/sqliteDatabase.js +++ b/seasoned_api/src/database/sqliteDatabase.js @@ -1,19 +1,20 @@ const fs = require('fs'); const path = require('path'); -const sqlite3 = require('sqlite3'); +const sqlite = require('sqlite'); class SqliteDatabase { constructor(host) { this.host = host; - this.connection = sqlite3; + this.connection = sqlite; // this.schemaDirectory = path.join(__dirname, 'schemas'); } connect() { return Promise.resolve() - .then(() => new sqlite3.Database(this.host)) + .then(() => sqlite.open(this.host)) + .then(() => sqlite.exec('pragma foreign_keys = on;')); } all(sql, parameters) { @@ -29,4 +30,4 @@ class SqliteDatabase { } } -module.exports = SqliteDatabase; \ No newline at end of file +module.exports = SqliteDatabase;