Skip to content

Commit a275738

Browse files
committed
Last few fixes.
1 parent f4c5da0 commit a275738

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>de.ree6</groupId>
88
<artifactId>Ree6-SQL</artifactId>
99
<description>This is the SQL-Module for Ree6!</description>
10-
<version>2.2.1</version>
10+
<version>2.2.2</version>
1111

1212
<properties>
1313
<sonar.organization>ree6-applications</sonar.organization>

src/main/java/de/presti/ree6/sql/SQLWorker.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ public boolean isVoiceLevelRewardSetup(long guildId, long roleId, long level) {
15461546
* @return {@link List<String>} as List with {@link Invite}.
15471547
*/
15481548
public List<Invite> getInvites(long guildId) {
1549-
return getEntityList(new Invite(), "FROM Invite WHERE guildAndId.guildId=:gid", Map.of("gid", guildId));
1549+
return getEntityList(new Invite(), "FROM Invite WHERE guildAndCode.guildId=:gid", Map.of("gid", guildId));
15501550
}
15511551

15521552
/**
@@ -1558,7 +1558,7 @@ public List<Invite> getInvites(long guildId) {
15581558
* @return {@link Boolean} as Result if true, then it's saved in our Database | if false, we couldn't find anything.
15591559
*/
15601560
public boolean existsInvite(long guildId, String inviteCreator, String inviteCode) {
1561-
return getEntity(new Invite(), "FROM Invite WHERE guildAndId.guildId=:gid AND userId=:uid AND code=:code", Map.of("gid", guildId, "uid", inviteCreator, "code", inviteCode)) != null;
1561+
return getEntity(new Invite(), "FROM Invite WHERE guildAndCode.guildId=:gid AND userId=:uid AND guildAndCode.code=:code", Map.of("gid", guildId, "uid", inviteCreator, "code", inviteCode)) != null;
15621562
}
15631563

15641564
/**
@@ -1591,7 +1591,7 @@ public void setInvite(long guildId, long inviteCreator, String inviteCode, long
15911591
* @return {@link Invite} as result if true, then it's saved in our Database | may be null.
15921592
*/
15931593
public Invite getInvite(long guildId, String inviteCode) {
1594-
return getEntity(new Invite(), "FROM Invite WHERE guildAndId.guildId=:gid AND code=:code", Map.of("gid", guildId, "code", inviteCode));
1594+
return getEntity(new Invite(), "FROM Invite WHERE guildAndCode.guildId=:gid AND guildAndCode.code=:code", Map.of("gid", guildId, "code", inviteCode));
15951595
}
15961596

15971597
/**
@@ -1603,7 +1603,7 @@ public Invite getInvite(long guildId, String inviteCode) {
16031603
* @return {@link Invite} as result if true, then it's saved in our Database | may be null.
16041604
*/
16051605
public Invite getInvite(long guildId, long inviteCreator, String inviteCode) {
1606-
return getEntity(new Invite(), "FROM Invite WHERE guildAndId.guildId=:gid AND userId=:uid AND code=:code", Map.of("gid", guildId, "uid", inviteCreator, "code", inviteCode));
1606+
return getEntity(new Invite(), "FROM Invite WHERE guildAndCode.guildId=:gid AND userId=:uid AND guildAndCode.code=:code", Map.of("gid", guildId, "uid", inviteCreator, "code", inviteCode));
16071607
}
16081608

16091609
/**
@@ -1616,7 +1616,7 @@ public Invite getInvite(long guildId, long inviteCreator, String inviteCode) {
16161616
* @return {@link Invite} as result if true, then it's saved in our Database | may be null.
16171617
*/
16181618
public Invite getInvite(long guildId, long inviteCreator, String inviteCode, long inviteUsage) {
1619-
return getEntity(new Invite(), "FROM Invite WHERE guildAndId.guildId=:gid AND userId=:uid AND code=:code AND USES=:uses",
1619+
return getEntity(new Invite(), "FROM Invite WHERE guildAndCode.guildId=:gid AND userId=:uid AND guildAndCode.code=:code AND USES=:uses",
16201620
Map.of("gid", guildId, "uid", inviteCreator, "code", inviteCode, "uses", inviteUsage));
16211621
}
16221622

src/test/java/Main.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public static void main(String[] args) throws SQLException {
3232
}
3333

3434
SQLSession.getSqlConnector().getSqlWorker().getEntityList(new de.presti.ree6.sql.entities.Warning(), "", null);
35+
SQLSession.getSqlConnector().getSqlWorker().getEntityList(new de.presti.ree6.sql.entities.Giveaway(), "", null);
36+
SQLSession.getSqlConnector().getSqlWorker().getEntityList(new de.presti.ree6.sql.entities.roles.AutoRole(), "", null);
3537
}
3638

3739
}

0 commit comments

Comments
 (0)