Skip to content

fix(connector-jdbc): remove unnecessary join on nested filter #1

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(connector-jdbc): remove unnecessary join on nested filter #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12bff33
fix(connector-jdbc): remove unnecessary join on nested filter
juliendangers Jan 17, 2020
a25047e
fix(connector-jdbc): invert condition on every parent condition
juliendangers Jan 23, 2020
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
65 changes: 57 additions & 8 deletions ...r-jdbc/src/main/scala/com/prisma/api/connector/jdbc/database/FilterConditionBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,53 @@ trait FilterConditionBuilder extends BuilderBase {
val newAlias = relationField.relatedModel_!.dbName + "_" + alias
val invertConditionOfSubSelect = relationFilter.condition == EveryRelatedNode

def getNestedNonRelationalQuery(nested: Filter) = {
val condition = buildConditionForFilter(nested, newAlias)
sql
.select(relationColumn(relationField))
.from(relationTable(relation))
.innerJoin(modelTable(relationField.relatedModel_!).as(newAlias))
.on(modelIdColumn(newAlias, relationField.relatedModel_!).eq(relationColumn(relationField.relatedField)))
.where(condition.invert(invertConditionOfSubSelect))
}

def getIDNullCondition = {
relationFilter.condition match {
case EveryRelatedNode => field(relationColumn(relationField.relatedField)).isNotNull
case AtLeastOneRelatedNode | NoRelatedNode | ToOneRelatedNode => field(relationColumn(relationField.relatedField)).isNull
}
}

def getIDNotNullCondition = {
relationFilter.condition match {
case EveryRelatedNode => field(relationColumn(relationField.relatedField)).isNull
case AtLeastOneRelatedNode | NoRelatedNode | ToOneRelatedNode => field(relationColumn(relationField.relatedField)).isNotNull
}
}

def getNestedIDCondition(nestedCondition: ScalarCondition): Condition = {
nestedCondition match {
case Contains(_) => field(relationColumn(relationField.relatedField)).contains(placeHolder)
case NotContains(_) => field(relationColumn(relationField.relatedField)).notContains(placeHolder)
case StartsWith(_) => field(relationColumn(relationField.relatedField)).startsWith(placeHolder)
case NotStartsWith(_) => field(relationColumn(relationField.relatedField)).startsWith(placeHolder).not()
case EndsWith(_) => field(relationColumn(relationField.relatedField)).endsWith(placeHolder)
case NotEndsWith(_) => field(relationColumn(relationField.relatedField)).endsWith(placeHolder).not()
case LessThan(_) => field(relationColumn(relationField.relatedField)).lessThan(placeHolder)
case GreaterThan(_) => field(relationColumn(relationField.relatedField)).greaterThan(placeHolder)
case LessThanOrEquals(_) => field(relationColumn(relationField.relatedField)).lessOrEqual(placeHolder)
case GreaterThanOrEquals(_) => field(relationColumn(relationField.relatedField)).greaterOrEqual(placeHolder)
case NotEquals(NullGCValue) => getIDNotNullCondition
case NotEquals(_) => field(relationColumn(relationField.relatedField)).notEqual(placeHolder)
case Equals(NullGCValue) => getIDNullCondition
case Equals(_) => field(relationColumn(relationField.relatedField)).equal(placeHolder)
case In(Vector(NullGCValue)) => getIDNullCondition
case NotIn(Vector(NullGCValue)) => getIDNotNullCondition
case In(values) => field(relationColumn(relationField.relatedField)).in(Vector.fill(values.length) { placeHolder }: _*)
case NotIn(values) => field(relationColumn(relationField.relatedField)).notIn(Vector.fill(values.length) { placeHolder }: _*)
}
}

relationFilter.nestedFilter match {
case nested: RelationFilter =>
val condition = inStatementForRelationCondition(
Expand All @@ -101,15 +148,17 @@ trait FilterConditionBuilder extends BuilderBase {
.select(relationColumn(relationField))
.from(relationTable(relation))
.where(condition.invert(invertConditionOfSubSelect))

case nested: ScalarFilter =>
if (nested.field.isId) {
sql
.select(relationColumn(relationField))
.from(relationTable(relation))
.where(getNestedIDCondition(nested.condition))
}
else
getNestedNonRelationalQuery(nested)
case nested =>
val condition = buildConditionForFilter(nested, newAlias)
sql
.select(relationColumn(relationField))
.from(relationTable(relation))
.innerJoin(modelTable(relationField.relatedModel_!).as(newAlias))
.on(modelIdColumn(newAlias, relationField.relatedModel_!).eq(relationColumn(relationField.relatedField)))
.where(condition.invert(invertConditionOfSubSelect))
getNestedNonRelationalQuery(nested)
}
}

Expand Down