diff --git a/db/knex_init_db.js b/db/knex_init_db.js index c5a542e29..46bff4bfa 100644 --- a/db/knex_init_db.js +++ b/db/knex_init_db.js @@ -548,20 +548,6 @@ ALTER TABLE monitor table.double("timeout").defaultTo(0).notNullable(); }); - /* - patch-add-ping-advanced-options.sql - ALTER TABLE monitor ADD ping_count INTEGER default 1 not null; - ALTER TABLE monitor ADD ping_numeric BOOLEAN default true not null; - ALTER TABLE monitor ADD ping_deadline INTEGER default 10 not null; - ALTER TABLE monitor ADD ping_timeout INTEGER default 2 not null; - */ - await knex.schema.table("monitor", function (table) { - table.integer("ping_count").defaultTo(1).notNullable(); - table.boolean("ping_numeric").defaultTo(true).notNullable(); - table.integer("ping_deadline").defaultTo(10).notNullable(); - table.integer("ping_timeout").defaultTo(2).notNullable(); - }); - /* patch-add-gamedig-given-port.sql ALTER TABLE monitor diff --git a/db/knex_migrations/2025-03-04-0000-ping-advanced-options.js b/db/knex_migrations/2025-03-04-0000-ping-advanced-options.js new file mode 100644 index 000000000..319fb18ef --- /dev/null +++ b/db/knex_migrations/2025-03-04-0000-ping-advanced-options.js @@ -0,0 +1,27 @@ +/* SQL: +ALTER TABLE monitor ADD ping_count INTEGER default 1 not null; +ALTER TABLE monitor ADD ping_numeric BOOLEAN default true not null; +ALTER TABLE monitor ADD ping_deadline INTEGER default 10 not null; +ALTER TABLE monitor ADD ping_timeout INTEGER default 2 not null; +*/ +exports.up = function (knex) { + // Add new columns to table monitor + return knex.schema + .alterTable("monitor", function (table) { + table.integer("ping_count").defaultTo(1).notNullable(); + table.boolean("ping_numeric").defaultTo(true).notNullable(); + table.integer("ping_deadline").defaultTo(10).notNullable(); + table.integer("ping_timeout").defaultTo(2).notNullable(); + }); + +}; + +exports.down = function (knex) { + return knex.schema + .alterTable("monitor", function (table) { + table.dropColumn("ping_count"); + table.dropColumn("ping_numeric"); + table.dropColumn("ping_deadline"); + table.dropColumn("ping_timeout"); + }); +}; diff --git a/db/old_migrations/patch-add-ping-advanced-options.sql b/db/old_migrations/patch-add-ping-advanced-options.sql deleted file mode 100644 index 9ce76b072..000000000 --- a/db/old_migrations/patch-add-ping-advanced-options.sql +++ /dev/null @@ -1,7 +0,0 @@ --- You should not modify if this have pushed to Github, unless it does serious wrong with the db. -BEGIN TRANSACTION; -ALTER TABLE monitor ADD ping_count INTEGER default 1 not null; -ALTER TABLE monitor ADD ping_numeric BOOLEAN default true not null; -ALTER TABLE monitor ADD ping_deadline INTEGER default 10 not null; -ALTER TABLE monitor ADD ping_timeout INTEGER default 2 not null; -COMMIT; diff --git a/server/database.js b/server/database.js index db31c2d9e..0e6a7405d 100644 --- a/server/database.js +++ b/server/database.js @@ -111,8 +111,7 @@ class Database { "patch-notification-config.sql": true, "patch-fix-kafka-producer-booleans.sql": true, "patch-timeout.sql": true, - "patch-monitor-tls-info-add-fk.sql": true, - "patch-add-ping-advanced-options.sql": true, // The last file so far converted to a knex migration file + "patch-monitor-tls-info-add-fk.sql": true, // The last file so far converted to a knex migration file }; /**