Skip to content

fix: EXPOSED-815 Check types for QueryAlias.get() at runtime #2532

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
Jul 22, 2025
Merged

fix: EXPOSED-815 Check types for QueryAlias.get() at runtime #2532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
545893d
fix: EXPOSED-815 Resolving an aliased field on a query alias doesn't …
obabichevjb Jun 27, 2025
35e3b6b
fix: EXPOSED-815 Check types for QueryAlias.get() at runtime
ntkoopman Jul 3, 2025
789e489
Fix usage for literals
ntkoopman Jul 17, 2025
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
27 changes: 12 additions & 15 deletions exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Alias.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,27 +188,24 @@ class QueryAlias(val query: AbstractQuery<*>, val alias: String) : ColumnSet() {

override val columns: List<Column<*>> = fields.filterIsInstance<Column<*>>()

@Suppress("UNCHECKED_CAST")
operator fun <T : Any?> get(original: Column<T>): Column<T> =
query.set.source.columns.find { it == original }?.clone() as? Column<T>
?: error("Column not found in original table")
get(original as Expression<T>) as Column<T>

operator fun <T : Any?> get(original: Expression<T>): Expression<T> {
val aliases = query.set.fields.filterIsInstance<ExpressionAlias<T>>()
return aliases.find { it == original }?.let {
it.delegate.alias("$alias.${it.alias}").aliasOnlyExpression()
} ?: aliases.find { it.delegate == original }?.aliasOnlyExpression()
?: error("Field not found in original table fields")
@Suppress("UNCHECKED_CAST")
return if (original is Column<*>) {
query.set.source.columns.find { it == original }?.clone() ?: error("Column not found in original table")
} else {
val aliases = query.set.fields.filterIsInstance<ExpressionWithColumnTypeAlias<T>>()
return aliases.find { it == original }
?.let { it.delegate.alias("$alias.${it.alias}").aliasOnlyExpression() }
?: aliases.find { it.delegate == original }?.aliasOnlyExpression()
?: error("Field not found in original table fields")
} as Expression<T>
}

operator fun <T : Any?> get(original: ExpressionWithColumnType<T>): ExpressionWithColumnType<T> {
val aliases = query.set.fields.filterIsInstance<ExpressionWithColumnTypeAlias<T>>()
return (
aliases.find { it == original }?.let {
it.delegate.alias("$alias.${it.alias}").aliasOnlyExpression()
} ?: aliases.find { it.delegate == original }?.aliasOnlyExpression()
) as? ExpressionWithColumnType<T>
?: error("Field not found in original table fields")
return get(original as Expression<T>) as ExpressionWithColumnType<T>
}

override fun join(
Expand Down
39 changes: 39 additions & 0 deletions exposed-tests/src/test/kotlin/org/jetbrains/exposed/v1/tests/shared/AliasesTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,4 +342,43 @@ class AliasesTests : DatabaseTestsBase() {
)
}
}

@Test
fun testAliasCastedToExpression() {
val tester = object : IntIdTable("Test") {
val weight = integer("weight")
}

val expression = tester.weight.sum()
val alias: Expression<Int?> = expression.alias("task_weight")
val query: QueryAlias = tester.select(alias).alias("all_weight")

// EXPOSED-815 Resolving an aliased field on a query alias doesn't work
// Reading `query[alias]` crashed before the fix
val aliasExpressionString = QueryBuilder(true).also {
query[alias].toQueryBuilder(it)
}.toString()

assertEquals("all_weight.task_weight", aliasExpressionString)
}

@Test
fun testColumnCastedToExpression() {
val tester = object : IntIdTable("Test") {
val weight = integer("weight")
}

val column = tester.weight
val query: QueryAlias = tester.select(column).alias("all_weight")

fun Expression<*>.toExpressionString() = QueryBuilder(true)
.also { this.toQueryBuilder(it) }
.toString().lowercase()

withTables(tester) {
assertEquals("all_weight.weight", query[column].toExpressionString())
Copy link
Collaborator

@obabichevjb obabichevjb Jul 17, 2025

Choose a reason for hiding this comment

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

It would be nice to replace it with (added lowercase()):

assertEquals("all_weight.weight", query[column].toExpressionString().lowercase())
            assertEquals("all_weight.weight", query[column as Expression<Int>].toExpressionString().lowercase())
            assertEquals("all_weight.weight", query[column as ExpressionWithColumnType<Int>].toExpressionString().lowercase())

otherwise it fails on some dialects like H2

Copy link
Contributor Author

@ntkoopman ntkoopman Jul 18, 2025

Choose a reason for hiding this comment

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

Oops, fixed, my apologies

assertEquals("all_weight.weight", query[column as Expression<Int>].toExpressionString())
assertEquals("all_weight.weight", query[column as ExpressionWithColumnType<Int>].toExpressionString())
}
}
}
Loading