diff --git a/src/settingsdb.js b/src/settingsdb.js index 31e043931..fb00d2886 100644 --- a/src/settingsdb.js +++ b/src/settingsdb.js @@ -4,11 +4,7 @@ exports = module.exports = { get, - getAll, set, - getBlob, - setBlob, - _clear: clear }; const assert = require('assert'), @@ -29,15 +25,6 @@ function get(key, callback) { }); } -// won't get the blobs -function getAll(callback) { - database.query(`SELECT ${SETTINGS_FIELDS} FROM settings WHERE value IS NOT NULL ORDER BY name`, function (error, results) { - if (error) return callback(new BoxError(BoxError.DATABASE_ERROR, error)); - - callback(null, results); - }); -} - function set(key, value, callback) { assert.strictEqual(typeof key, 'string'); assert(value === null || typeof value === 'string'); @@ -49,11 +36,3 @@ function set(key, value, callback) { callback(null); }); } - -function clear(callback) { - database.query('DELETE FROM settings', function (error) { - if (error) return callback(new BoxError(BoxError.DATABASE_ERROR, error)); - - callback(error); - }); -} diff --git a/src/test/database-test.js b/src/test/database-test.js index 24f2b4438..f1bf7156c 100644 --- a/src/test/database-test.js +++ b/src/test/database-test.js @@ -13,7 +13,6 @@ const appdb = require('../appdb.js'), domains = require('../domains.js'), expect = require('expect.js'), reverseProxy = require('../reverseproxy.js'), - settingsdb = require('../settingsdb.js'), _ = require('underscore'); const DOMAIN_0 = { @@ -395,46 +394,6 @@ describe('database', function () { }); }); - describe('settings', function () { - it('can set value', function (done) { - settingsdb.set('somekey', 'somevalue', function (error) { - expect(error).to.be(null); - done(); - }); - }); - it('can get the set value', function (done) { - settingsdb.get('somekey', function (error, value) { - expect(error).to.be(null); - expect(value).to.be('somevalue'); - done(); - }); - }); - it('can get all values', function (done) { - settingsdb.getAll(function (error, result) { - expect(error).to.be(null); - expect(result).to.be.an(Array); - expect(result[0].name).to.be('somekey'); - expect(result[0].value).to.be('somevalue'); - expect(result.length).to.be(1); // the value set above - done(); - }); - }); - it('can update a value', function (done) { - settingsdb.set('somekey', 'someothervalue', function (error) { - expect(error).to.be(null); - done(); - }); - }); - it('can get updated value', function (done) { - settingsdb.get('somekey', function (error, value) { - expect(error).to.be(null); - expect(value).to.be('someothervalue'); - done(); - }); - }); - - }); - describe('importFromFile', function () { before(function (done) { async.series([