diff --git a/package.json b/package.json index d4e5b9c6..5a5d129a 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "test": "grunt", "start": "node index.js", "sqlinit": "node setup/sql/init.js", - "sqldump": "node setup/sql/dump.js | sed -e '/^\\/\\*.*\\*\\/;$/d' > setup/sql/mailtrain.sql", + "sqldump": "node setup/sql/dump.js | sed -e '/^\\/\\*.*\\*\\/;$/d' -e 's/.[0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]./NOW()/g' > setup/sql/mailtrain.sql", "sqldrop": "node setup/sql/drop.js", "sqlgen": "npm run sqldrop && DB_FROM_START=Y npm run sqlinit && npm run sqldump" }, @@ -38,7 +38,7 @@ "connect-redis": "^3.0.2", "cookie-parser": "^1.4.1", "csurf": "^1.8.3", - "csv-parse": "^1.0.4", + "csv-parse": "^1.1.0", "escape-html": "^1.0.3", "express": "^4.13.4", "express-session": "^1.13.0", @@ -62,7 +62,7 @@ "serve-favicon": "^2.3.0", "shortid": "^2.2.6", "slugify": "^0.1.1", - "smtp-server": "^1.9.0", + "smtp-server": "^1.9.1", "striptags": "^2.1.1", "toml": "^2.3.0" } diff --git a/setup/sql/mailtrain.sql b/setup/sql/mailtrain.sql index a3d4e5de..f9354f77 100644 --- a/setup/sql/mailtrain.sql +++ b/setup/sql/mailtrain.sql @@ -154,7 +154,7 @@ CREATE TABLE `segments` ( `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `list` (`list`), - KEY `name` (`name`(191)), + KEY `name` (`name`), CONSTRAINT `segments_ibfk_1` FOREIGN KEY (`list`) REFERENCES `lists` (`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE `settings` ( @@ -233,7 +233,7 @@ CREATE TABLE `users` ( KEY `reset` (`reset_token`), KEY `check_reset` (`username`(191),`reset_token`,`reset_expire`) ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4; -INSERT INTO `users` (`id`, `username`, `password`, `email`, `reset_token`, `reset_expire`, `created`) VALUES (1,'admin','$2a$10$mzKU71G62evnGB2PvQA4k..Wf9jASk.c7a8zRMHh6qQVjYJ2r/g/K','admin@example.com',NULL,NULL,'2016-05-01 17:15:46'); +INSERT INTO `users` (`id`, `username`, `password`, `email`, `reset_token`, `reset_expire`, `created`) VALUES (1,'admin','$2a$10$mzKU71G62evnGB2PvQA4k..Wf9jASk.c7a8zRMHh6qQVjYJ2r/g/K','admin@example.com',NULL,NULL,NOW()); SET UNIQUE_CHECKS=1; SET FOREIGN_KEY_CHECKS=1;