Skip to content

fix(db): move clan_members table definition before data migrations (closes #82) #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
trexfr-ops wants to merge 3 commits into from
Closed

fix(db): move clan_members table definition before data migrations (closes #82) #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c5e761
fix(db): move clan_members table definition before data migrations (c…
trexfr-ops Aug 20, 2026
83c03aa
fix(db): remove psql meta-command and wrap migrate.ts in atomic trans…
trexfr-ops Aug 20, 2026
186ac1e
Merge branch 'main' into fix/issue-82-clan-members-schema-order
leocagli Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 33 additions & 31 deletions api/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,39 @@ CREATE TABLE IF NOT EXISTS clans (
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
);

ALTER TABLE characters
ADD COLUMN IF NOT EXISTS clan_id UUID REFERENCES clans(id) ON DELETE SET NULL;

CREATE TABLE IF NOT EXISTS clan_members (
clan_id UUID NOT NULL REFERENCES clans(id) ON DELETE CASCADE,
character_id UUID NOT NULL REFERENCES characters(id) ON DELETE CASCADE,
role TEXT NOT NULL DEFAULT 'member' CHECK (role IN ('leader', 'co_leader', 'member')),
joined_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
PRIMARY KEY (clan_id, character_id),
UNIQUE (character_id)
);

ALTER TABLE clan_members
DROP CONSTRAINT IF EXISTS clan_members_role_check;

ALTER TABLE clan_members
ADD CONSTRAINT clan_members_role_check
CHECK (role IN ('leader', 'co_leader', 'member'));

CREATE TABLE IF NOT EXISTS clan_requests (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
clan_id UUID NOT NULL REFERENCES clans(id) ON DELETE CASCADE,
character_id UUID NOT NULL REFERENCES characters(id) ON DELETE CASCADE,
message TEXT NOT NULL DEFAULT '',
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
UNIQUE (character_id)
);

CREATE INDEX IF NOT EXISTS idx_clans_leader_character_id ON clans(leader_character_id);
CREATE INDEX IF NOT EXISTS idx_characters_clan_id ON characters(clan_id);
CREATE INDEX IF NOT EXISTS idx_clan_members_clan_id ON clan_members(clan_id);
CREATE INDEX IF NOT EXISTS idx_clan_requests_clan_id ON clan_requests(clan_id);

ALTER TABLE clans
DROP CONSTRAINT IF EXISTS clans_alignment_check;

Expand Down Expand Up @@ -141,38 +174,7 @@ ALTER TABLE clans
ADD CONSTRAINT clans_alignment_check
CHECK (alignment IN ('citizen', 'criminal'));

ALTER TABLE characters
ADD COLUMN IF NOT EXISTS clan_id UUID REFERENCES clans(id) ON DELETE SET NULL;

CREATE TABLE IF NOT EXISTS clan_members (
clan_id UUID NOT NULL REFERENCES clans(id) ON DELETE CASCADE,
character_id UUID NOT NULL REFERENCES characters(id) ON DELETE CASCADE,
role TEXT NOT NULL DEFAULT 'member' CHECK (role IN ('leader', 'co_leader', 'member')),
joined_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
PRIMARY KEY (clan_id, character_id),
UNIQUE (character_id)
);

ALTER TABLE clan_members
DROP CONSTRAINT IF EXISTS clan_members_role_check;

ALTER TABLE clan_members
ADD CONSTRAINT clan_members_role_check
CHECK (role IN ('leader', 'co_leader', 'member'));

CREATE TABLE IF NOT EXISTS clan_requests (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
clan_id UUID NOT NULL REFERENCES clans(id) ON DELETE CASCADE,
character_id UUID NOT NULL REFERENCES characters(id) ON DELETE CASCADE,
message TEXT NOT NULL DEFAULT '',
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
UNIQUE (character_id)
);

CREATE INDEX IF NOT EXISTS idx_clans_leader_character_id ON clans(leader_character_id);
CREATE INDEX IF NOT EXISTS idx_characters_clan_id ON characters(clan_id);
CREATE INDEX IF NOT EXISTS idx_clan_members_clan_id ON clan_members(clan_id);
CREATE INDEX IF NOT EXISTS idx_clan_requests_clan_id ON clan_requests(clan_id);

ALTER TABLE characters
ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMPTZ;
Expand Down
34 changes: 22 additions & 12 deletions api/src/migrate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,28 @@ async function migrate(): Promise<void> {
const schemaPath = path.resolve(__dirname, "..", "schema.sql");
const schemaSql = fs.readFileSync(schemaPath, "utf8");

await pool.query(schemaSql);
await pool.query(`
CREATE INDEX IF NOT EXISTS idx_market_listings_active_price_created
ON market_listings(price ASC, created_at ASC)
WHERE status = 'active'
`);
await pool.query(`
CREATE INDEX IF NOT EXISTS idx_market_listings_seller_active_created
ON market_listings(seller_character_id, created_at DESC)
WHERE status = 'active'
`);
console.log("Database schema applied successfully");
const client = await pool.connect();
try {
await client.query("BEGIN");
await client.query(schemaSql);
await client.query(`
CREATE INDEX IF NOT EXISTS idx_market_listings_active_price_created
ON market_listings(price ASC, created_at ASC)
WHERE status = 'active'
`);
await client.query(`
CREATE INDEX IF NOT EXISTS idx_market_listings_seller_active_created
ON market_listings(seller_character_id, created_at DESC)
WHERE status = 'active'
`);
await client.query("COMMIT");
console.log("Database schema applied successfully");
} catch (error) {
await client.query("ROLLBACK");
throw error;
} finally {
client.release();
}
}

void migrate()
Expand Down
Loading