From 9e59ce69e3b48364cd833a62a9af9c4d91bda7d3 Mon Sep 17 00:00:00 2001 From: Houmgaor Date: Mon, 23 Mar 2026 12:52:28 +0100 Subject: [PATCH] fix(tests): fix three CI failures on develop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - alliance recruiting default: change DEFAULT true → false in both 0001_init.sql and 0004_alliance_recruiting.sql; new alliances should not be open for recruitment by default (TestSetAllianceRecruiting) - guild_invites migration: add IF NOT EXISTS so re-running migrations on an existing DB does not fail with "relation already exists" (TestMigrateExistingDBWithoutSchemaVersion) - test character name: shorten "Idem_Rollover_Leader" (19 chars) to "IdemRollLeader" to fit the VARCHAR(15) constraint (TestRolloverDailyRP_Idempotent) --- server/channelserver/repo_guild_subsystems_test.go | 2 +- server/migrations/sql/0001_init.sql | 2 +- server/migrations/sql/0004_alliance_recruiting.sql | 2 +- server/migrations/sql/0012_guild_invites.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/channelserver/repo_guild_subsystems_test.go b/server/channelserver/repo_guild_subsystems_test.go index e68515a9b..d636c2c15 100644 --- a/server/channelserver/repo_guild_subsystems_test.go +++ b/server/channelserver/repo_guild_subsystems_test.go @@ -98,7 +98,7 @@ func TestRolloverDailyRP_Idempotent(t *testing.T) { defer TeardownTestDB(t, db) userID := CreateTestUser(t, db, "idem_rollover_user") - charID := CreateTestCharacter(t, db, userID, "Idem_Rollover_Leader") + charID := CreateTestCharacter(t, db, userID, "IdemRollLeader") guildID := CreateTestGuild(t, db, charID, "Idem_Rollover_Guild") repo := NewGuildRepository(db) diff --git a/server/migrations/sql/0001_init.sql b/server/migrations/sql/0001_init.sql index 3f15fdd23..92f3aa57d 100644 --- a/server/migrations/sql/0001_init.sql +++ b/server/migrations/sql/0001_init.sql @@ -998,7 +998,7 @@ CREATE TABLE public.guilds ( pugi_name_1 character varying(12) DEFAULT ''::character varying, pugi_name_2 character varying(12) DEFAULT ''::character varying, pugi_name_3 character varying(12) DEFAULT ''::character varying, - recruiting boolean DEFAULT true NOT NULL, + recruiting boolean DEFAULT false NOT NULL, pugi_outfit_1 integer DEFAULT 0 NOT NULL, pugi_outfit_2 integer DEFAULT 0 NOT NULL, pugi_outfit_3 integer DEFAULT 0 NOT NULL, diff --git a/server/migrations/sql/0004_alliance_recruiting.sql b/server/migrations/sql/0004_alliance_recruiting.sql index 500b182dd..1824a1068 100644 --- a/server/migrations/sql/0004_alliance_recruiting.sql +++ b/server/migrations/sql/0004_alliance_recruiting.sql @@ -1 +1 @@ -ALTER TABLE public.guild_alliances ADD COLUMN IF NOT EXISTS recruiting boolean NOT NULL DEFAULT true; +ALTER TABLE public.guild_alliances ADD COLUMN IF NOT EXISTS recruiting boolean NOT NULL DEFAULT false; diff --git a/server/migrations/sql/0012_guild_invites.sql b/server/migrations/sql/0012_guild_invites.sql index cd208aa40..64d91de19 100644 --- a/server/migrations/sql/0012_guild_invites.sql +++ b/server/migrations/sql/0012_guild_invites.sql @@ -2,7 +2,7 @@ -- player-initiated applications. This gives each invitation a real serial PK -- so the client's InvitationID field can map to an actual database row -- instead of being aliased to the character ID. -CREATE TABLE guild_invites ( +CREATE TABLE IF NOT EXISTS guild_invites ( id serial PRIMARY KEY, guild_id integer REFERENCES guilds(id), character_id integer REFERENCES characters(id),