Changed configuration parameters' names to match sequelize nomemclature

Fixed seed/initial_tasks data which created tasks in a non-sequential order (tested on Postgres)
Added production-like example configuration
This commit is contained in:
DC*
2014-08-08 00:47:38 -03:00
parent d33305986c
commit ebab3b60a8
5 changed files with 29 additions and 14 deletions
+5 -5
View File
@@ -8,10 +8,10 @@
"storage": "db/test.sqlite" "storage": "db/test.sqlite"
}, },
"production": { "production": {
"username": "root", "username": "postgres",
"password": null, "password": "",
"database": "database_production", "database": "hackflowy",
"host": "127.0.0.1", "host" : "localhost",
"dialect": "mysql" "dialect" : "postgres"
} }
} }
+13
View File
@@ -0,0 +1,13 @@
{
"port": 3000,
"database": {
"username": "postgres",
"password": "",
"database": "hackflowy",
"options" : {
"dialect": "postgres",
"host" : "localhost",
"port" : "5432"
}
}
}
+2 -2
View File
@@ -3,9 +3,9 @@ var Sequelize = require('sequelize');
module.exports = { module.exports = {
instance: function(orm) { instance: function(orm) {
task = orm.define('Tasks', { task = orm.define('Tasks', {
id : {type: Sequelize.INTEGER, primaryKey: true, autoIncrement: true}, id : {type: Sequelize.INTEGER, primaryKey: true, autoIncrement: true},
content : {type: Sequelize.TEXT, allowNull: false}, content : {type: Sequelize.TEXT, allowNull: false},
parent : Sequelize.INTEGER, parent : Sequelize.INTEGER,
isCompleted: Sequelize.BOOLEAN, isCompleted: Sequelize.BOOLEAN,
createdAt : Sequelize.DATE, createdAt : Sequelize.DATE,
updatedAt : Sequelize.DATE updatedAt : Sequelize.DATE
+8 -6
View File
@@ -2,11 +2,13 @@ var config = require('config'),
orm = require('../../orm').configure(config.get('database')), orm = require('../../orm').configure(config.get('database')),
Tasks = require('../../db/models/task').instance(orm); Tasks = require('../../db/models/task').instance(orm);
Tasks.create({content: 'Welcome to HackFlowy!', isCompleted: false}); Tasks.bulkCreate([
Tasks.create({content: 'An open-source WorkFlowy clone', isCompleted: false}); {content: 'Welcome to HackFlowy!', isCompleted: false},
Tasks.create({content: 'Built using Backbone + Socket.IO', isCompleted: false}); {content: 'An open-source WorkFlowy clone', isCompleted: false},
Tasks.create({content: 'I pulled this together in a few hours to learn Backbone', isCompleted: false}); {content: 'Built using Backbone + Socket.IO', isCompleted: false},
Tasks.create({content: 'Feel free to try it out and hack on it', isCompleted: false}); {content: 'I pulled this together in a few hours to learn Backbone', isCompleted: false},
Tasks.create({content: 'Good Luck!', isCompleted: false}); {content: 'Feel free to try it out and hack on it', isCompleted: false},
{content: 'Good Luck!', isCompleted: false}
]);
orm.sync(); orm.sync();
+1 -1
View File
@@ -2,6 +2,6 @@ var Sequelize = require('sequelize');
module.exports = { module.exports = {
configure: function(db) { configure: function(db) {
return new Sequelize(db.name, db.user, db.password, db.options); return new Sequelize(db.database, db.username, db.password, db.options);
} }
} }