diff --git a/server/lib/knex.js b/server/lib/knex.js index 7240d312..519ea5a0 100644 --- a/server/lib/knex.js +++ b/server/lib/knex.js @@ -19,11 +19,7 @@ const knex = require('knex')({ }, pool: { min: 2, - max: 10, - afterCreate: function(conn, cb) { - conn.query('SET sql_mode="ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION";', function (err) { - cb(err, conn); - }); + max: 10 } }, migrations: { diff --git a/server/models/subscriptions.js b/server/models/subscriptions.js index 57f36f97..4f475f64 100644 --- a/server/models/subscriptions.js +++ b/server/models/subscriptions.js @@ -62,7 +62,7 @@ fieldTypes.date = { afterJSON: (groupedField, entity) => { const key = getFieldColumn(groupedField); if (key in entity) { - entity[key] = entity[key] ? moment(entity[key]).toISOString() : null; + entity[key] = entity[key] ? moment(entity[key]).utc().format("YYYY-MM-DD HH:mm:ss") : null; } }, listRender: (groupedField, value) => formatDate(groupedField.settings.dateFormat, value) @@ -72,7 +72,7 @@ fieldTypes.birthday = { afterJSON: (groupedField, entity) => { const key = getFieldColumn(groupedField); if (key in entity) { - entity[key] = entity[key] ? moment(entity[key]).toISOString() : null; + entity[key] = entity[key] ? moment(entity[key]).utc().format("YYYY-MM-DD HH:mm:ss") : null; } }, listRender: (groupedField, value) => formatBirthday(groupedField.settings.dateFormat, value)