diff --git a/.sequelizerc.example b/.sequelizerc.example index 29a0d145e..81248936b 100644 --- a/.sequelizerc.example +++ b/.sequelizerc.example @@ -1,8 +1,31 @@ +var fs = require('fs'); var path = require('path'); +const envs = ['development', 'test', 'production']; + +if (!fs.existsSync(path.resolve('config'))) { + fs.mkdirSync(path.resolve('config')); +} + +const configJson = JSON.parse(fs.readFileSync('config.json')); + +let database = {}; +envs.forEach(function (env, i) { + if (configJson[env]) { + database[env] = { + ...configJson[env].db + } + } +}); + +fs.writeFile(path.resolve('config', 'database.json'), JSON.stringify(database), 'utf8', function (err) { + if (err) { + console.log("An error occured while writing JSON Object to File."); + return console.log(err); + } +}); module.exports = { - 'config': path.resolve('config.json'), + 'config': path.resolve('config', 'database.json'), 'migrations-path': path.resolve('lib', 'migrations'), - 'models-path': path.resolve('lib', 'models'), - 'url': 'change this' -} \ No newline at end of file + 'models-path': path.resolve('lib', 'models') +} diff --git a/lib/migrations/20150915153700-change-notes-title-to-text.js b/lib/migrations/20150915153700-change-notes-title-to-text.js index 9d00f15fd..628a5acf6 100644 --- a/lib/migrations/20150915153700-change-notes-title-to-text.js +++ b/lib/migrations/20150915153700-change-notes-title-to-text.js @@ -1,5 +1,8 @@ 'use strict' -const isSQLite = require('../utils').isSQLite +function isSQLite (sequelize) { + return sequelize.options.dialect === 'sqlite' +} + module.exports = { up: function (queryInterface, Sequelize) { return queryInterface.changeColumn('Notes', 'title', { diff --git a/lib/utils.ts b/lib/utils.ts index b9c46725f..4a5769ac7 100644 --- a/lib/utils.ts +++ b/lib/utils.ts @@ -1,14 +1,9 @@ -import { Sequelize } from 'sequelize-typescript' import { logger } from './logger' import { realtime } from './realtime' import { config } from './config' import fs from 'fs' import { Revision } from './models' -export function isSQLite (sequelize: Sequelize): boolean { - return sequelize.options.dialect === 'sqlite' -} - export function getImageMimeType (imagePath: string): string | undefined { const fileExtension = /[^.]+$/.exec(imagePath) switch (fileExtension?.[0]) {