Skip to content

Commit a9545fd

Browse files
committed
More fixes to remove references to Aggregatio
1 parent 7d6c28d commit a9545fd

3 files changed

Lines changed: 12 additions & 10 deletions

File tree

Database/src/main/java/org/broken/arrow/library/database/builders/wrappers/SaveRecord.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ private QueryBuilder createSelectCommand(final boolean queryPlaceholder, @Nonnul
204204
final QueryBuilder builder = new QueryBuilder();
205205
builder.setGlobalEnableQueryPlaceholders(queryPlaceholder);
206206
List<Column> columnList = value.serialize().keySet().stream()
207-
.map(columnName -> ColumnManager.of().column(columnName).getColumn())
207+
.map(Column::of)
208208
.collect(Collectors.toList());
209209
final Function<WhereBuilder, ConditionChainer<WhereBuilder>> whereStrategy = clauseFunction::apply;
210210
this.whereClause = whereStrategy;

Database/src/main/java/org/broken/arrow/library/database/construct/query/columnbuilder/ColumnManager.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,33 +40,35 @@ public static TableColumn.Separator tableOf(@Nonnull final String communeName, @
4040
}
4141

4242
/**
43-
* Creates a new {@link Aggregation} column with the specified name and no alias.
43+
* Creates a new {@link Column} column with the specified name and no alias.
4444
*
4545
* @param name the column name
4646
* @return an Aggregation object for further configuration
4747
*/
48-
public Aggregation column(String name) {
48+
public Column column(String name) {
4949
return column(name, "");
5050
}
5151

5252
/**
53-
* Creates a new {@link Aggregation} column with the specified name and alias.
53+
* Creates a new {@link Column} column with the specified name and alias.
5454
*
5555
* @param name the column name
5656
* @param alias the alias for the column (can be empty)
5757
* @return an Aggregation object for further configuration
5858
*/
59-
public Aggregation column(String name, String alias) {
60-
return new Aggregation(this, name, alias);
59+
public Column column(String name, String alias) {
60+
return Column.of(name, alias);
6161
}
6262

6363
/**
6464
* Adds a {@link Column} to the internal list of built columns.
6565
*
6666
* @param column the Column to add
67+
* @return return this class for chaining
6768
*/
68-
public void add(Column column) {
69+
public ColumnManager add(Column column) {
6970
columnsBuilt.add(column);
71+
return this;
7072
}
7173

7274
/**

Database/src/main/java/org/broken/arrow/library/database/core/Database.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ public <K, V extends ConfigurationSerializable> QuerySaver<K, V> save(@Nonnull f
360360
* </p>
361361
* <p>
362362
* Use the {@link QueryLoader} instance to define how rows should be handled during loading
363-
* via {@link QueryLoader#forEachQuery(Consumer)}, or to retrieve the full list of loaded results afterward.
363+
* via {@link LoadSetup#forEachMapEntity(Consumer)} , or to retrieve the full list of loaded results afterward.
364364
* </p>
365365
*
366366
* @param tableName the name of the table to query.
@@ -631,7 +631,7 @@ protected List<String> updateTableColumnsInDb(final Connection connection, final
631631
try {
632632
final List<String> column = new ArrayList<>();
633633
final QueryBuilder queryBuilder = new QueryBuilder();
634-
queryBuilder.select(ColumnManager.of().column("*").finish()).from(tableName);
634+
queryBuilder.select(ColumnManager.of().add(Column.of("*"))).from(tableName);
635635
final String queryAllColumns = queryBuilder.build();
636636
statement = connection.prepareStatement(queryAllColumns);
637637
rs = statement.executeQuery();
@@ -814,7 +814,7 @@ public Connection attemptToConnect() {
814814
*/
815815
private void checkIfTableExist(@Nonnull final Connection connection, String tableName, String columName) {
816816
final QueryBuilder queryBuilder = new QueryBuilder();
817-
queryBuilder.select(ColumnManager.of().column("*").finish()).from(tableName).where(where -> where.where(columName).equal(SqlArg.val("")));
817+
queryBuilder.select(ColumnManager.of().add(Column.of("*"))).from(tableName).where(where -> where.where(columName).equal(SqlArg.val("")));
818818
final String checkTableQuery = queryBuilder.build();
819819

820820
try (final PreparedStatement preparedStatement = connection.prepareStatement(checkTableQuery)) {

0 commit comments

Comments
 (0)