Skip to content

Commit e2d70f3

Browse files
committed
feat: closing resultSets
1 parent 43dc61d commit e2d70f3

4 files changed

Lines changed: 23 additions & 6 deletions

File tree

src/main/java/com/code/advancedsql/query/ExecuteQuery.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public Map<String, Object> fetch() throws SQLException {
4646
}
4747

4848
resultSet.close();
49+
prepare.close();
4950

5051
return map;
5152
}
@@ -65,7 +66,11 @@ public ResultSet fetchAll() throws SQLException {
6566
public List<Map<String, Object>> fetchAllAsList() throws SQLException {
6667
ResultSet resultSet = this.fetchAll();
6768

68-
return ISQL.convertResultSetToList(resultSet);
69+
List<Map<String, Object>> list = ISQL.convertResultSetToList(resultSet);
70+
71+
prepare.close();
72+
73+
return list;
6974
}
7075

7176
/**

src/main/java/com/code/advancedsql/query/ExecuteStatement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public ExecuteStatement(ITable table) {
1515
public PreparedStatement executePrepare() throws SQLException {
1616
this.execute();
1717

18-
return this.prepare;
18+
return prepare;
1919
}
2020

2121
/**

src/main/java/com/code/advancedsql/query/ExecuteUpdate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public ExecuteUpdate(ITable table) {
2626
public PreparedStatement executePrepare() throws SQLException {
2727
this.execute();
2828

29-
return this.prepare;
29+
return prepare;
3030
}
3131

3232
/**

src/main/java/com/code/advancedsql/query/Query.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,35 @@ public Boolean executeStatement() throws SQLException {
3434

3535
ISQL.setStatementParameters(this.prepare, this.execute);
3636

37-
return prepare.execute();
37+
boolean execute = prepare.execute();
38+
39+
prepare.close();
40+
41+
return execute;
3842
}
3943

4044
public ResultSet executeQuery() throws SQLException {
4145
prepare = this.sql.prepare(this);
4246

4347
ISQL.setStatementParameters(this.prepare, this.execute);
4448

45-
return prepare.executeQuery();
49+
ResultSet resultSet = prepare.executeQuery();
50+
51+
prepare.close();
52+
53+
return resultSet;
4654
}
4755

4856
public int executeUpdate() throws SQLException {
4957
prepare = this.sql.prepare(this);
5058

5159
ISQL.setStatementParameters(this.prepare, this.execute);
5260

53-
return prepare.executeUpdate();
61+
int update = prepare.executeUpdate();
62+
63+
prepare.close();
64+
65+
return update;
5466
}
5567

5668
public abstract String toQuery();

0 commit comments

Comments
 (0)