Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ private DatabaseUserManager(

@Override
public CarbonPlayerCommon loadOrCreate(final UUID uuid) {
return this.jdbi.withHandle(handle -> {
return this.jdbi.inTransaction(handle -> {
final @Nullable CarbonPlayerCommon carbonPlayerCommon = handle.createQuery(this.locator.query("select-player"))
.bind("id", uuid)
.mapTo(CarbonPlayerCommon.class)
Expand Down Expand Up @@ -170,7 +170,7 @@ public void saveSync(final CarbonPlayerCommon player) {

@Override
protected @Nullable PartyImpl loadParty(final UUID uuid) {
return this.jdbi.withHandle(handle -> {
return this.jdbi.inTransaction(handle -> {
final @Nullable PartyImpl party = this.selectParty(handle, uuid);
if (party == null) {
return null;
Expand Down Expand Up @@ -239,7 +239,6 @@ protected void saveSync(final PartyImpl party, final Map<UUID, PartyImpl.ChangeT
public void disbandSync(final UUID id) {
this.jdbi.useHandle(handle -> {
handle.createUpdate(this.locator.query("drop-party")).bind("partyid", id).execute();
handle.createUpdate(this.locator.query("clear-party-members")).bind("partyid", id).execute();
});
}

Expand Down
1 change: 0 additions & 1 deletion common/src/main/resources/queries/clear-party-members.sql

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
ALTER TABLE carbon_ignores
ADD CONSTRAINT carbon_ignores_owner
FOREIGN KEY (id) REFERENCES carbon_users (id) ON DELETE CASCADE;
ALTER TABLE carbon_ignores
ADD CONSTRAINT carbon_ignores_ignored
FOREIGN KEY (ignoredplayer) REFERENCES carbon_users (id) ON DELETE CASCADE;

ALTER TABLE carbon_leftchannels
ADD CONSTRAINT carbon_leftchannels_owner
FOREIGN KEY (id) REFERENCES carbon_users (id) ON DELETE CASCADE;

ALTER TABLE carbon_party_members
ADD CONSTRAINT carbon_party_members_member
FOREIGN KEY (playerid) REFERENCES carbon_users (id) ON DELETE CASCADE;
ALTER TABLE carbon_party_members
ADD CONSTRAINT carbon_party_members_party
FOREIGN KEY (partyid) REFERENCES carbon_parties (partyid) ON DELETE CASCADE;

ALTER TABLE carbon_users
ADD CONSTRAINT carbon_users_party
FOREIGN KEY (party) REFERENCES carbon_parties (partyid) ON DELETE SET NULL;
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
ALTER TABLE carbon_ignores
ADD CONSTRAINT carbon_ignores_owner
FOREIGN KEY (id) REFERENCES carbon_users (id) ON DELETE CASCADE;
ALTER TABLE carbon_ignores
ADD CONSTRAINT carbon_ignores_ignored
FOREIGN KEY (ignoredplayer) REFERENCES carbon_users (id) ON DELETE CASCADE;

ALTER TABLE carbon_leftchannels
ADD CONSTRAINT carbon_leftchannels_owner
FOREIGN KEY (id) REFERENCES carbon_users (id) ON DELETE CASCADE;

ALTER TABLE carbon_party_members
ADD CONSTRAINT carbon_party_members_member
FOREIGN KEY (playerid) REFERENCES carbon_users (id) ON DELETE CASCADE;
ALTER TABLE carbon_party_members
ADD CONSTRAINT carbon_party_members_party
FOREIGN KEY (partyid) REFERENCES carbon_parties (partyid) ON DELETE CASCADE;

ALTER TABLE carbon_users
ADD CONSTRAINT carbon_users_party
FOREIGN KEY (party) REFERENCES carbon_parties (partyid) ON DELETE SET NULL;
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
ALTER TABLE carbon_ignores
ADD CONSTRAINT carbon_ignores_owner
FOREIGN KEY (id) REFERENCES carbon_users (id) ON DELETE CASCADE;
ALTER TABLE carbon_ignores
ADD CONSTRAINT carbon_ignores_ignored
FOREIGN KEY (ignoredplayer) REFERENCES carbon_users (id) ON DELETE CASCADE;

ALTER TABLE carbon_leftchannels
ADD CONSTRAINT carbon_leftchannels_owner
FOREIGN KEY (id) REFERENCES carbon_users (id) ON DELETE CASCADE;

ALTER TABLE carbon_party_members
ADD CONSTRAINT carbon_party_members_member
FOREIGN KEY (playerid) REFERENCES carbon_users (id) ON DELETE CASCADE;
ALTER TABLE carbon_party_members
ADD CONSTRAINT carbon_party_members_party
FOREIGN KEY (partyid) REFERENCES carbon_parties (partyid) ON DELETE CASCADE;

ALTER TABLE carbon_users
ADD CONSTRAINT carbon_users_party
FOREIGN KEY (party) REFERENCES carbon_parties (partyid) ON DELETE SET NULL;