Skip to content

Commit 32d0560

Browse files
authored
1.4.6-SNAPSHOT
1 parent 98ca0bc commit 32d0560

4 files changed

Lines changed: 33 additions & 10 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>net.herospvp</groupId>
88
<artifactId>database-lib</artifactId>
9-
<version>1.4.5-SNAPSHOT</version>
9+
<version>1.4.6-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>database-lib</name>

src/main/java/net/herospvp/database/lib/Musician.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package net.herospvp.database.lib;
22

33
import lombok.Getter;
4+
import lombok.Setter;
45
import lombok.SneakyThrows;
56
import net.herospvp.database.DatabaseLib;
67
import net.herospvp.database.lib.items.Instrument;
@@ -88,6 +89,10 @@ public void offer(
8889
blockingQueue.offer(papers);
8990
}
9091

92+
public void stopRunning() {
93+
running = false;
94+
}
95+
9196
@SneakyThrows
9297
@Override
9398
public void run() {

src/main/java/net/herospvp/database/lib/items/Instrument.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public Instrument(
2828
@NotNull String port,
2929
@NotNull String database,
3030
@NotNull String user,
31-
@NotNull String password,
31+
@Nullable String password,
3232
@NotNull String url,
3333
@NotNull String driver,
3434
@Nullable Map<String, String> properties,
@@ -78,7 +78,6 @@ private void init() {
7878

7979
@SneakyThrows
8080
public <G> void close(G generic) {
81-
8281
if (generic instanceof PreparedStatement) {
8382
((PreparedStatement) generic).close();
8483
}
@@ -90,15 +89,15 @@ else if (generic instanceof ResultSet) {
9089
}
9190
}
9291

93-
public void close(PreparedStatement preparedStatement, ResultSet resultSet) {
94-
close(preparedStatement);
95-
close(resultSet);
92+
public <G> void close(G generic, G generic1) {
93+
close(generic);
94+
close(generic1);
9695
}
9796

98-
public void close(Connection connection, PreparedStatement preparedStatement, ResultSet resultSet) {
99-
close(preparedStatement);
100-
close(resultSet);
101-
close(connection);
97+
public <G> void close(G generic, G generic1, G generic2) {
98+
close(generic);
99+
close(generic1);
100+
close(generic2);
102101
}
103102

104103
}

src/main/java/net/herospvp/database/lib/items/Notes.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ public String selectAll() {
1919
return "SELECT * FROM " + table + ";";
2020
}
2121

22+
public String truncate() {
23+
return "TRUNCATE TABLE " + table + ";";
24+
}
25+
2226
public String select(
2327
@NotNull String field
2428
) {
@@ -33,13 +37,28 @@ public String selectWhere(
3337
return "SELECT " + target + " FROM " + table + " WHERE " + field + " = " + convertObj(value) + ";";
3438
}
3539

40+
public String deleteWhere(
41+
@NotNull String target,
42+
@NotNull String field,
43+
@NotNull Object value
44+
) {
45+
return "DELETE FROM " + table + " WHERE " + field + " = " + convertObj(value) + ";";
46+
}
47+
3648
public String pendingSelectWhere(
3749
@NotNull String target,
3850
@NotNull String field
3951
) {
4052
return "SELECT " + target + " FROM " + table + " WHERE " + field + " = ?;";
4153
}
4254

55+
public String pendingDeleteWhere(
56+
@NotNull String target,
57+
@NotNull String field
58+
) {
59+
return "DELETE FROM " + table + " WHERE " + field + " = ?;";
60+
}
61+
4362
public String selectAllWhere(
4463
@NotNull String field,
4564
@NotNull Object value)

0 commit comments

Comments
 (0)