Compare commits

...

7 Commits

Author SHA1 Message Date
d8455ccaa3 Merge branch 'main' into devcontainers 2026-02-03 21:42:12 -06:00
7ca617a51c Fixed annoying bullshit 2026-02-03 22:41:37 -05:00
0e2c5f8318 Merge pull request 'devcontainers' (#183) from devcontainers into main
All checks were successful
Continuous Integration / Update Development (push) Successful in 2m49s
Reviewed-on: #183
2026-02-03 21:27:50 -06:00
6811dc461c Merge branch 'main' into devcontainers 2026-02-03 21:27:30 -06:00
6f11bdb01d Merge branch 'devcontainers' of https://gitea.iceberg-gaming.com/17th-Ranger-Battalion-ORG/milsim-site-v4 into devcontainers 2026-02-03 22:27:03 -05:00
dd440a4e75 Cleaned up unused tables 2026-02-03 22:27:02 -05:00
2f7276a6c6 Merge pull request 'devcontainers' (#182) from devcontainers into main
All checks were successful
Continuous Integration / Update Development (push) Successful in 3m1s
Reviewed-on: #182
2026-02-03 21:23:10 -06:00
4 changed files with 62 additions and 52 deletions

View File

@@ -0,0 +1,53 @@
'use strict';
var dbm;
var type;
var seed;
var fs = require('fs');
var path = require('path');
var Promise;
/**
* We receive the dbmigrate dependency from dbmigrate initially.
* This enables us to not have to rely on NODE_PATH.
*/
exports.setup = function(options, seedLink) {
dbm = options.dbmigrate;
type = dbm.dataType;
seed = seedLink;
Promise = options.Promise;
};
exports.up = function(db) {
var filePath = path.join(__dirname, 'sqls', '20260204025935-remove-unused-tables-up.sql');
return new Promise( function( resolve, reject ) {
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
if (err) return reject(err);
console.log('received data: ' + data);
resolve(data);
});
})
.then(function(data) {
return db.runSql(data);
});
};
exports.down = function(db) {
var filePath = path.join(__dirname, 'sqls', '20260204025935-remove-unused-tables-down.sql');
return new Promise( function( resolve, reject ) {
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
if (err) return reject(err);
console.log('received data: ' + data);
resolve(data);
});
})
.then(function(data) {
return db.runSql(data);
});
};
exports._meta = {
"version": 1
};

View File

@@ -473,55 +473,6 @@ CREATE TABLE IF NOT EXISTS `members_unit` (
CONSTRAINT `FK_members_unit_units` FOREIGN KEY (`unit_id`) REFERENCES `units` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
CREATE TABLE IF NOT EXISTS `mission_attendee_roles` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(50) DEFAULT NULL,
`short_name` varchar(50) DEFAULT NULL,
`description` text DEFAULT NULL,
`deleted` tinyint(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`),
UNIQUE KEY `role_name` (`name`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS `mission_event_attendees` (
`id` int(11) DEFAULT NULL,
`member_id` int(11) NOT NULL,
`event_id` int(11) NOT NULL,
`member_role_id` int(11) DEFAULT NULL,
`event_type` int(11) NOT NULL,
`created_at` datetime NOT NULL DEFAULT current_timestamp(),
`updated_at` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
PRIMARY KEY (`member_id`,`event_id`) USING BTREE,
KEY `fk_mission_event_attendees_role_id` (`member_role_id`),
KEY `fk_mission_event_events_id` (`event_id`),
CONSTRAINT `fk_member_event_member_id` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE,
CONSTRAINT `fk_mission_event_attendees_role_id` FOREIGN KEY (`member_role_id`) REFERENCES `mission_attendee_roles` (`id`) ON UPDATE CASCADE,
CONSTRAINT `fk_mission_event_events_id` FOREIGN KEY (`event_id`) REFERENCES `mission_events` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS `mission_events` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`event_type_id` int(11) NOT NULL,
`event_name` varchar(100) NOT NULL,
`description` varchar(100) DEFAULT NULL,
`mission_name` varchar(100) NOT NULL,
`author_id` int(11) DEFAULT NULL,
`map_id` int(11) DEFAULT NULL,
`event_date` datetime NOT NULL,
`guilded_event_id` int(11) DEFAULT NULL,
`created_at` datetime NOT NULL DEFAULT current_timestamp(),
`updated_at` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
`deleted` tinyint(1) DEFAULT 0,
PRIMARY KEY (`id`),
UNIQUE KEY `event_name` (`event_name`),
KEY `fk_events_author_member_id` (`author_id`) USING BTREE,
KEY `fk_mission_event_type_id` (`event_type_id`),
KEY `fk_mission_event_map_id` (`map_id`),
CONSTRAINT `fk_events_author_id` FOREIGN KEY (`author_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE,
CONSTRAINT `fk_mission_event_map_id` FOREIGN KEY (`map_id`) REFERENCES `arma_maps` (`id`) ON UPDATE CASCADE,
CONSTRAINT `fk_mission_event_type_id` FOREIGN KEY (`event_type_id`) REFERENCES `event_types` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS `operation_campaigns` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(100) NOT NULL,
@@ -1006,7 +957,7 @@ BEGIN
AND ce.deleted = 0;
END;
DROP PROCEDURE `sp_update_member_rank`;
DROP PROCEDURE IF EXISTS `sp_update_member_rank`;
CREATE PROCEDURE IF NOT EXISTS `sp_update_member_rank`(
IN `p_member_id` INT,
IN `p_rank_id` INT,
@@ -1110,7 +1061,7 @@ BEGIN
END IF;
END;
DROP PROCEDURE `sp_update_member_status`;
DROP PROCEDURE IF EXISTS `sp_update_member_status`;
CREATE PROCEDURE IF NOT EXISTS `sp_update_member_status`(
IN `p_member_id` INT,
IN `p_status_id` INT,
@@ -1214,7 +1165,7 @@ BEGIN
END IF;
END;
DROP PROCEDURE `sp_update_member_unit`;
DROP PROCEDURE IF EXISTS `sp_update_member_unit`;
CREATE PROCEDURE IF NOT EXISTS `sp_update_member_unit`(
IN `p_member_id` INT,
IN `p_unit_id` INT,

View File

@@ -0,0 +1 @@
/* Replace with your SQL commands */

View File

@@ -0,0 +1,5 @@
/* Replace with your SQL commands */
DROP PROCEDURE `sp_update_member_rank_Backup_1-27-2026`;
DROP PROCEDURE `sp_update_member_status_Backup_1-27-2026`;
DROP PROCEDURE `sp_update_member_unit_Backup_1-27-2026`;