diff --git a/server/config/default.yaml b/server/config/default.yaml index 14b07bf9..e23cc9c0 100644 --- a/server/config/default.yaml +++ b/server/config/default.yaml @@ -128,7 +128,8 @@ mysql: # The timezone configured on the MySQL server. This can be 'local', 'Z', or an offset in the form +HH:MM or -HH:MM # If the MySQL server runs on the same server as Mailtrain, use 'local' timezone: local - + multipleStatements: true + verp: # Enable to start an MX server that detects bounced messages using VERP # In most cases you do not want to use it diff --git a/server/models/lists.js b/server/models/lists.js index ada16cf8..84282977 100644 --- a/server/models/lists.js +++ b/server/models/lists.js @@ -207,13 +207,13 @@ async function create(context, entity) { await knex.schema.raw('CREATE TABLE `subscription__' + id + '` (\n' + ' `id` int(10) unsigned NOT NULL AUTO_INCREMENT,\n' + - ' `cid` varchar(255) CHARACTER SET ascii NOT NULL,\n' + - ' `email` varchar(255) CHARACTER SET utf8 DEFAULT NULL,\n' + - ' `hash_email` varchar(255) CHARACTER SET ascii NOT NULL,\n' + + ' `cid` varchar(255) NOT NULL,\n' + + ' `email` varchar(255) DEFAULT NULL,\n' + + ' `hash_email` varchar(255) NOT NULL,\n' + ' `source_email` int(11) DEFAULT NULL,\n' + // Altough this is a reference to an import, it is represented as signed int(11). This is because we use negative values for constant from SubscriptionSource ' `opt_in_ip` varchar(100) DEFAULT NULL,\n' + ' `opt_in_country` varchar(2) DEFAULT NULL,\n' + - ' `tz` varchar(100) CHARACTER SET ascii DEFAULT NULL,\n' + + ' `tz` varchar(100) DEFAULT NULL,\n' + ' `status` tinyint(4) unsigned NOT NULL DEFAULT \'1\',\n' + ' `is_test` tinyint(4) unsigned NOT NULL DEFAULT \'0\',\n' + ' `status_change` timestamp NULL DEFAULT NULL,\n' + @@ -233,7 +233,7 @@ async function create(context, entity) { ' KEY `latest_click` (`latest_click`),\n' + ' KEY `created` (`created`),\n' + ' KEY `updated` (`updated`)\n' + - ') ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;\n'); + ') ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci;\n'); await shares.rebuildPermissionsTx(tx, { entityTypeId: 'list', entityId: id }); diff --git a/server/setup/knex/migrations/20200824160149_convert_to_utf8mb4.js b/server/setup/knex/migrations/20200824160149_convert_to_utf8mb4.js new file mode 100644 index 00000000..e1a184f3 --- /dev/null +++ b/server/setup/knex/migrations/20200824160149_convert_to_utf8mb4.js @@ -0,0 +1,17 @@ + +exports.up = function(knex, Promise) { + return knex.raw('SELECT table_name FROM information_schema.tables WHERE table_schema = ?', [knex.client.database()]) + .then(function(tablas) { + let sql=""; + tablas=tablas[0]; + for(let i=0; i