Skip to content

Simplify SQL Server limit function #6676

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
findepi merged 2 commits into from
Jan 22, 2021
Merged

Simplify SQL Server limit function #6676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2182a70
Give column a name
findepi Jan 21, 2021
64d98e1
Simplify SQL Server limit function
findepi Jan 21, 2021
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
2 changes: 1 addition & 1 deletion plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/QueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ protected String getRelation(RemoteTableName remoteTableName)
protected String getProjection(List<JdbcColumnHandle> columns)
{
if (columns.isEmpty()) {
return "1";
return "1 x";
}
return columns.stream()
.map(jdbcColumnHandle -> format("%s AS %s", jdbcColumnHandle.toSqlExpression(client::quoted), client.quoted(jdbcColumnHandle.getColumnName())))
Expand Down
7 changes: 1 addition & 6 deletions plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
import java.util.Optional;
import java.util.function.BiFunction;

import static com.google.common.base.Preconditions.checkArgument;
import static com.microsoft.sqlserver.jdbc.SQLServerConnection.TRANSACTION_SNAPSHOT;
import static io.airlift.slice.Slices.wrappedBuffer;
import static io.trino.plugin.jdbc.JdbcErrorCode.JDBC_ERROR;
Expand Down Expand Up @@ -348,11 +347,7 @@ private static Optional<JdbcTypeHandle> toTypeHandle(DecimalType decimalType)
@Override
protected Optional<BiFunction<String, Long, String>> limitFunction()
{
return Optional.of((sql, limit) -> {
String start = "SELECT ";
checkArgument(sql.startsWith(start));
return "SELECT TOP " + limit + " " + sql.substring(start.length());
});
return Optional.of((sql, limit) -> format("SELECT TOP %s * FROM (%s) o", limit, sql));
Copy link
Copy Markdown
Member

@Praveen2112 Praveen2112 Jan 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit : Since limit is a long , so can we provide proper format specifier for the same ?

Copy link
Copy Markdown
Member Author

@findepi findepi Jan 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i use (we use?) %s for simplicity, unless i want to have type-specific formatting.

}

@Override
Expand Down