Skip to content

Commit af09052

Browse files
committed
small code improvements
1 parent 3cdd02c commit af09052

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/main/java/org/dynapi/squirtle/core/queries/JoinUsing.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.dynapi.squirtle.core.interfaces.SqlAbleConfig;
55
import org.dynapi.squirtle.core.terms.criterion.Field;
66

7+
import java.util.ArrayList;
78
import java.util.Collection;
89

910
public class JoinUsing extends Join {
@@ -17,7 +18,7 @@ public JoinUsing(Selectable item, JoinType how, Collection<Field> fields) {
1718
@Override
1819
public JoinUsing replaceTable(Table currentTable, Table newTable) {
1920
item = (currentTable.equals(item)) ? newTable : item;
20-
fields = fields.stream().map(field -> field.replaceTable(currentTable, newTable)).toList();
21+
fields = new ArrayList<>(fields.stream().map(field -> field.replaceTable(currentTable, newTable)).toList());
2122
return this;
2223
}
2324

src/main/java/org/dynapi/squirtle/core/terms/criterion/Field.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ public Field(String alias, String name, Selectable table) {
3131
public List<Node> nodes() {
3232
List<Node> nodes = new ArrayList<>();
3333
nodes.add(this);
34-
nodes.addAll(table.nodes());
34+
if (table != null)
35+
nodes.addAll(table.nodes());
3536
return nodes;
3637
}
3738

src/main/java/org/dynapi/squirtle/core/terms/criterion/Star.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ public Star(Selectable table) {
2626
public List<Node> nodes() {
2727
List<Node> nodes = new ArrayList<>();
2828
nodes.add(this);
29-
nodes.addAll(table.nodes());
29+
if (table != null)
30+
nodes.addAll(table.nodes());
3031
return nodes;
3132
}
3233

0 commit comments

Comments
 (0)