Skip to content

fix: use updated schema #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 13, 2023
Merged

fix: use updated schema #19

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70f10dd
fix: use updated schema
rakibansary Oct 23, 2023
1e7d75a
Merge branch 'main' into PLAT-3491
rakibansary Oct 24, 2023
b3d3389
feat(sql): dynamically generate table aliases in SELECT queries
rakibansary Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 52 additions & 21 deletions src/main/java/com/topcoder/dal/util/QueryHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,60 @@

import org.springframework.stereotype.Component;

import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.stream.Stream;

@Component
public class QueryHelper {
private final AtomicInteger aliasCounter = new AtomicInteger(0);

private String generateAlias(String fullTableName) {
String[] parts = fullTableName.split(":");
String tableName = parts.length > 1 ? parts[1] : parts[0];
String prefix = tableName.substring(0, 1).toLowerCase();
return prefix + aliasCounter.incrementAndGet();
}


public ParameterizedExpression getSelectQuery(SelectQuery query) {
final String tableName = query.hasSchema() ? query.getSchema() + ":" + query.getTable() : query.getTable();
aliasCounter.set(0);

final HashMap<String, String> tableAliases = new HashMap<>();
final String primaryTableName = query.hasSchema() ? query.getSchema() + ":" + query.getTable() : query.getTable();
final String tableAlias = generateAlias(primaryTableName);
tableAliases.put(primaryTableName, tableAlias);

final String table = (query.hasSchema() ? query.getSchema() + ":" + query.getTable() : query.getTable()) + " " + tableAlias;
List<Column> columnsList = query.getColumnList();

final Join[] joins = query.getJoinList().toArray(new Join[0]);
for (Join join : joins) {
tableAliases.computeIfAbsent(join.hasFromTableSchema() ? join.getFromTableSchema() + ":" + join.getFromTable() : join.getFromTable(), this::generateAlias);
tableAliases.computeIfAbsent(join.hasJoinTableSchema() ? join.getJoinTableSchema() + ":" + join.getJoinTable() : join.getJoinTable(), this::generateAlias);
}

final String[] columns = columnsList.stream()
.map((column -> column.hasTableName() ? column.getTableName() + "." + column.getName()
: column.getName()))
.map(column -> column.hasTableName()
? tableAliases.getOrDefault(column.getTableName(), tableAlias) + "." + column.getName() // TODO: This keeps current systems working correctly. Plan to update proto definition of ColumnValue to include schema
: tableAlias + "." + column.getName())
.toArray(String[]::new);

final List<ParameterizedExpression> whereClause = query.getWhereList().stream()
.map(toWhereCriteria).toList();

final Join[] joins = query.getJoinList().toArray(new Join[0]);
.map((criteria) -> {
ParameterizedExpression parameterizedExpression = toWhereCriteria.apply(criteria);
final String key = criteria.getKey();
final String[] parts = key.split("\\.");
if (parts.length > 1) {
parameterizedExpression.setExpression(parameterizedExpression.getExpression().replace(key, tableAliases.get(parts[0]) + "." + parts[1]));
} else {
parameterizedExpression.setExpression(parameterizedExpression.getExpression().replace(key, tableAlias + "." + key));
}
return parameterizedExpression;
})
.toList();

final String[] groupByClause = query.getGroupByList().toArray(new String[0]);
final String[] orderByClause = query.getOrderByList().toArray(new String[0]);
Expand All @@ -41,8 +70,8 @@ public ParameterizedExpression getSelectQuery(SelectQuery query) {
expression.setExpression("SELECT"
+ (offset > 0 ? " SKIP " + offset : "")
+ (limit > 0 ? " FIRST " + limit : "")
+ (" " + String.join(",", columns) + " FROM " + tableName)
+ (joins.length > 0 ? " " + String.join(" ", Stream.of(joins).map(toJoin).toArray(String[]::new)) : "")
+ (" " + String.join(",", columns) + " FROM " + table)
+ (joins.length > 0 ? " " + String.join(" ", Stream.of(joins).map(join -> toJoin(join, tableAliases)).toArray(String[]::new)) : "")
+ (!whereClause.isEmpty()
? " WHERE " + String.join(" AND ",
whereClause.stream().map(ParameterizedExpression::getExpression).toArray(String[]::new))
Expand Down Expand Up @@ -184,18 +213,20 @@ public static String sanitizeSQLStatement(String sql) {
return sql;
}

private static final Function<Join, String> toJoin = (join) -> {
final String joinType = join.getType().toString();
final String fromTable = join.hasFromTableSchema() ? join.getFromTableSchema() + ":" + join.getFromTable()
: join.getFromTable();
final String joinTable = join.hasJoinTableSchema() ? join.getJoinTableSchema() + ":" + join.getJoinTable()
: join.getJoinTable();
public String toJoin(Join join, HashMap<String, String> tableAliases) {
final String joinType = join.getType().toString().replace("JOIN_TYPE_", "");

final String joinTableName = join.hasJoinTableSchema() ? join.getJoinTableSchema() + ":" + join.getJoinTable() : join.getJoinTable();
final String fromTableName = join.hasFromTableSchema() ? join.getFromTableSchema() + ":" + join.getFromTable() : join.getFromTable();

final String joinTableAlias = tableAliases.getOrDefault(joinTableName, generateAlias(joinTableName));
final String fromTableAlias = tableAliases.getOrDefault(fromTableName, generateAlias(fromTableName));

final String fromColumn = join.getFromColumn();
final String joinColumn = join.getJoinColumn();

return joinType + " JOIN " + joinTable + " ON " + joinTable + "." + joinColumn + " = " + fromTable + "."
+ fromColumn;
};
return joinType + " JOIN " + joinTableName + " AS " + joinTableAlias + " ON " + joinTableAlias + "." + joinColumn + " = " + fromTableAlias + "." + fromColumn;
}

private final Function<WhereCriteria, ParameterizedExpression> toWhereCriteria = (criteria) -> {
String key = criteria.getKey();
Expand Down