mirror/spacedeck-open
1
0
Fork 0
mirror of https://github.com/spacedeck/spacedeck-open.git synced 2025-12-16 01:47:30 +01:00
Code Issues Projects Releases Wiki Activity

unify config, add postgres decimal fix

Browse Source
This commit is contained in:
dm
2021-01-07 15:26:13 +01:00
parent b2cf8cf336
commit 18d09b49be
2 changed files with 20 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config/default.json
View File

@@ -7,11 +7,12 @@
"endpoint": "http://localhost:9666", "endpoint": "http://localhost:9666",
"invite_code": "top-sekrit", "invite_code": "top-sekrit",
"storage_type": "postgres", "storage_dialect": "sqlite",
"storage_postgres_host": "localhost",
"storage_postgres_database": "spacedeck", "storage_host": "localhost",
"storage_postgres_username": "postgres", "storage_database": "spacedeck",
"storage_postgres_password": "postgres", "storage_username": "username",
"storage_password": "password",
"storage_local_path": "./storage", "storage_local_path": "./storage",
"storage_local_db": "./database.sqlite", "storage_local_db": "./database.sqlite",

44
models/db.js
View File

@@ -6,17 +6,13 @@ function sequel_log(a,b,c) {
} }
const Sequelize = require('sequelize'); const Sequelize = require('sequelize');
let sequelize; const sequelize = new Sequelize(
config.get('storage_database'),
if(config.has('storage_type') && config.get('storage_type') === 'postgres') { config.get('storage_username'),
console.log('connecting to postgres'); config.get('storage_password'),
sequelize = new Sequelize(
config.get('storage_postgres_database'),
config.get('storage_postgres_username'),
config.get('storage_postgres_password'),
{ {
host: config.get('storage_postgres_host'), host: config.get('storage_host'),
dialect: 'postgres', dialect: config.get('storage_dialect'),
pool: { pool: {
max: 5, max: 5,
min: 0, min: 0,
@@ -25,31 +21,13 @@ if(config.has('storage_type') && config.get('storage_type') === 'postgres') {
}, },
logging: sequel_log, logging: sequel_log,
// http://docs.sequelizejs.com/manual/tutorial/querying.html#operators // http://docs.sequelizejs.com/manual/tutorial/querying.html#operators
operatorsAliases: false operatorsAliases: false,
// SQLite only
storage: config.get('storage_local_db')
} }
); );
// https://github.com/sequelize/sequelize/issues/8019#issuecomment-384316346
} else { Sequelize.postgres.DECIMAL.parse = function (value) { return parseFloat(value); };
console.log('connecting to sqlite');
sequelize = new Sequelize('database', 'username', 'password', {
host: 'localhost',
dialect: 'sqlite',
pool: {
max: 5,
min: 0,
acquire: 30000,
idle: 10000
},
// SQLite only
storage: config.get('storage_local_db'),
logging: sequel_log,
// http://docs.sequelizejs.com/manual/tutorial/querying.html#operators
operatorsAliases: false
});
}
var User; var User;
var Session; var Session;