Skip to content
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

chore: rename HasFieldReference.(Known to FromSchema) and introduce HasChildren interface INTELLIJ-125 #89

Merged
merged 7 commits into from
Nov 18, 2024
Merged

chore: rename HasFieldReference.(Known to FromSchema) and introduce HasChildren interface INTELLIJ-125 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1986f95
fix: fixes parsing of FindIterable.find command
himanshusinghs Nov 12, 2024
5fa3518
chore: fixes the failing test
himanshusinghs Nov 12, 2024
5e87e5f
chore: rename HasFieldReference.(Known to FromSchema)
himanshusinghs Nov 11, 2024
9bdd351
chore: implement HasChildren interface
himanshusinghs Nov 11, 2024
16ef664
chore: fix incorrect return of resolveFieldReference
himanshusinghs Nov 11, 2024
fc6ec99
Merge branch 'main' into chore/minor-refactor
himanshusinghs Nov 14, 2024
7b3eb30
chore: remove duplicated test
himanshusinghs Nov 14, 2024
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
4 changes: 2 additions & 2 deletions ...t/kotlin/com/mongodb/jbplugin/accessadapter/datagrip/adapter/DataGripMongoDbDriverTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ class DataGripMongoDbDriverTest {
Node(
Unit,
listOf(
HasFieldReference(HasFieldReference.Known(Unit, "myField")),
HasFieldReference(HasFieldReference.FromSchema(Unit, "myField")),
HasValueReference(
HasValueReference.Constant(Unit, "myVal", BsonString)
),
Expand Down Expand Up @@ -255,7 +255,7 @@ class DataGripMongoDbDriverTest {
Node(
Unit,
listOf(
HasFieldReference(HasFieldReference.Known(Unit, "myField")),
HasFieldReference(HasFieldReference.FromSchema(Unit, "myField")),
HasValueReference(
HasValueReference.Constant(Unit, "myVal", BsonString)
),
Expand Down
13 changes: 5 additions & 8 deletions .../main/kotlin/com/mongodb/jbplugin/dialects/javadriver/glossary/JavaDriverDialectParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,8 @@ object JavaDriverDialectParser : DialectParser<PsiElement> {
if (currentCall.argumentList.expressionCount > 1) {
// TODO: we might want to have a component that tells this query is in a transaction
val startIndex = if (hasMongoDbSessionReference(currentCall)) 2 else 1
var updateExpression = currentCall.argumentList.expressions.getOrNull(startIndex)

if (updateExpression == null) {
return emptyList()
}
val updateExpression = currentCall.argumentList.expressions.getOrNull(startIndex)
?: return emptyList()

val argumentAsUpdates = resolveToUpdatesCall(updateExpression)
// parse only if it's a call to `updates` methods
Expand Down Expand Up @@ -200,7 +197,7 @@ object JavaDriverDialectParser : DialectParser<PsiElement> {
// - in(field, array) -> valid because of varargs
// - in(field, iterable) -> valid because of overload
val valueReference = if (filter.argumentList.expressionCount == 2) {
var secondArg = filter.argumentList.expressions[1].meaningfulExpression() as PsiExpression
val secondArg = filter.argumentList.expressions[1].meaningfulExpression() as PsiExpression
if (secondArg.type?.isJavaIterable() == true) { // case 3
filter.argumentList.inferFromSingleVarArgElement(start = 1)
} else if (secondArg.type?.isArray() == false) { // case 1
Expand Down Expand Up @@ -244,7 +241,7 @@ object JavaDriverDialectParser : DialectParser<PsiElement> {
}
val valueExpression = filter.argumentList.expressions[0]
val valueReference = resolveValueFromExpression(valueExpression)
val fieldReference = HasFieldReference.Known(valueExpression, "_id")
val fieldReference = HasFieldReference.FromSchema(valueExpression, "_id")

return Node(
filter,
Expand Down Expand Up @@ -400,7 +397,7 @@ object JavaDriverDialectParser : DialectParser<PsiElement> {
val fieldNameAsString = expression.tryToResolveAsConstantString()
val fieldReference =
fieldNameAsString?.let {
HasFieldReference.Known(expression, it)
HasFieldReference.FromSchema(expression, it)
} ?: HasFieldReference.Unknown

return fieldReference
Expand Down
64 changes: 32 additions & 32 deletions ...t/kotlin/com/mongodb/jbplugin/dialects/javadriver/glossary/JavaDriverDialectParserTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ public final class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"_id",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName
)
assertEquals(
BsonAnyOf(BsonObjectId, BsonNull),
Expand Down Expand Up @@ -336,7 +336,7 @@ public final class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"_id",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName
)
assertEquals(
BsonAnyOf(BsonObjectId, BsonNull),
Expand Down Expand Up @@ -376,7 +376,7 @@ public final class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"_id",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName
)
assertEquals(
BsonAnyOf(BsonObjectId, BsonNull),
Expand Down Expand Up @@ -416,7 +416,7 @@ public final class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"_id",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName
)
assertEquals(
BsonAnyOf(BsonObjectId, BsonNull),
Expand Down Expand Up @@ -459,7 +459,7 @@ public class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"myField",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonAnyOf(BsonNull, BsonBoolean),
Expand Down Expand Up @@ -504,7 +504,7 @@ public class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"myField",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonNull,
Expand Down Expand Up @@ -551,7 +551,7 @@ public class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"myField",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonNull,
Expand Down Expand Up @@ -599,7 +599,7 @@ public class Repository {
val firstEq = andChildren.children[0]
assertEquals(
"released",
(firstEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(firstEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonAnyOf(BsonNull, BsonBoolean),
Expand All @@ -613,7 +613,7 @@ public class Repository {
val secondEq = andChildren.children[1]
assertEquals(
"hidden",
(secondEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(secondEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonAnyOf(BsonNull, BsonBoolean),
Expand Down Expand Up @@ -666,7 +666,7 @@ public class Repository {
val firstEq = andChildren.children[0]
assertEquals(
"released",
(firstEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(firstEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonAnyOf(BsonNull, BsonBoolean),
Expand All @@ -680,7 +680,7 @@ public class Repository {
val secondEq = andChildren.children[1]
assertEquals(
"hidden",
(secondEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(secondEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonAnyOf(BsonNull, BsonBoolean),
Expand Down Expand Up @@ -728,7 +728,7 @@ public class Repository {
val firstEq = andChildren.children[0]
assertEquals(
"released",
(firstEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(firstEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonAnyOf(BsonNull, BsonBoolean),
Expand Down Expand Up @@ -774,7 +774,7 @@ public class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"released",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonAnyOf(BsonNull, BsonBoolean),
Expand Down Expand Up @@ -823,7 +823,7 @@ public class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"released",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonAnyOf(BsonNull, BsonBoolean),
Expand Down Expand Up @@ -872,7 +872,7 @@ public class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"released",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonBoolean,
Expand Down Expand Up @@ -924,7 +924,7 @@ public class Repository {
val firstEq = andChildren.children[0]
assertEquals(
"released",
(firstEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(firstEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonAnyOf(BsonNull, BsonBoolean),
Expand All @@ -938,7 +938,7 @@ public class Repository {
val secondEq = andChildren.children[1]
assertEquals(
"hidden",
(secondEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(secondEq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonAnyOf(BsonNull, BsonBoolean),
Expand Down Expand Up @@ -994,7 +994,7 @@ public class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"released",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonBoolean,
Expand All @@ -1005,7 +1005,7 @@ public class Repository {
assertEquals(Name.UNSET, unset.component<Named>()!!.name)
assertEquals(
"field",
(unset.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(unset.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
}

Expand Down Expand Up @@ -1050,7 +1050,7 @@ public class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"released",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonBoolean,
Expand All @@ -1061,7 +1061,7 @@ public class Repository {
assertEquals(Name.UNSET, unset.component<Named>()!!.name)
assertEquals(
"field",
(unset.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(unset.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
}

Expand Down Expand Up @@ -1106,7 +1106,7 @@ public class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"released",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonBoolean,
Expand All @@ -1117,7 +1117,7 @@ public class Repository {
assertEquals(Name.UNSET, unset.component<Named>()!!.name)
assertEquals(
"field",
(unset.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(unset.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
}

Expand Down Expand Up @@ -1162,7 +1162,7 @@ public class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"released",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonBoolean,
Expand All @@ -1173,7 +1173,7 @@ public class Repository {
assertEquals(Name.SET, unset.component<Named>()!!.name)
assertEquals(
"field",
(unset.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(unset.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
1,
Expand Down Expand Up @@ -1220,7 +1220,7 @@ public class Repository {
assertEquals(Name.EQ, eq.component<Named>()!!.name)
assertEquals(
"released",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonBoolean,
Expand Down Expand Up @@ -1270,7 +1270,7 @@ public class Repository {
assertEquals(Name.IN, eq.component<Named>()!!.name)
assertEquals(
"genre",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonArray(BsonAnyOf(BsonNull, BsonString)),
Expand Down Expand Up @@ -1312,7 +1312,7 @@ public class Repository {
assertEquals(Name.IN, eq.component<Named>()!!.name)
assertEquals(
"genre",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonArray(BsonAnyOf(BsonNull, BsonString)),
Expand Down Expand Up @@ -1355,7 +1355,7 @@ public class Repository {
assertEquals(Name.IN, eq.component<Named>()!!.name)
assertEquals(
"genre",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonArray(BsonAnyOf(BsonNull, BsonString)),
Expand Down Expand Up @@ -1398,7 +1398,7 @@ public class Repository {
assertEquals(Name.IN, eq.component<Named>()!!.name)
assertEquals(
"genre",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonArray(BsonAnyOf(BsonNull, BsonString)),
Expand Down Expand Up @@ -1447,7 +1447,7 @@ public class Repository {
assertEquals(Name.IN, eq.component<Named>()!!.name)
assertEquals(
"genre",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonArray(BsonAnyOf(BsonNull, BsonString)),
Expand Down Expand Up @@ -1496,7 +1496,7 @@ public class Repository {
assertEquals(Name.IN, eq.component<Named>()!!.name)
assertEquals(
"genre",
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.Known).fieldName,
(eq.component<HasFieldReference<Unit?>>()!!.reference as HasFieldReference.FromSchema).fieldName,
)
assertEquals(
BsonArray(BsonAnyOf(BsonNull, BsonString, BsonInt32)),
Expand Down
8 changes: 5 additions & 3 deletions .../mongosh/src/main/kotlin/com/mongodb/jbplugin/dialects/mongosh/MongoshDialectFormatter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import com.mongodb.jbplugin.dialects.OutputQuery
import com.mongodb.jbplugin.dialects.mongosh.backend.MongoshBackend
import com.mongodb.jbplugin.mql.*
import com.mongodb.jbplugin.mql.components.*
import com.mongodb.jbplugin.mql.components.HasFieldReference.FromSchema
import com.mongodb.jbplugin.mql.components.HasFieldReference.Unknown
import io.github.z4kn4fein.semver.Version
import org.owasp.encoder.Encode

Expand Down Expand Up @@ -256,7 +258,7 @@ private fun <S> MongoshBackend.resolveValueReference(
) = when (val ref = valueRef.reference) {
is HasValueReference.Constant -> registerConstant(ref.value)
is HasValueReference.Runtime -> registerVariable(
(fieldRef?.reference as? HasFieldReference.Known)?.fieldName ?: "value",
(fieldRef?.reference as? FromSchema)?.fieldName ?: "value",
ref.type
)

Expand All @@ -268,8 +270,8 @@ private fun <S> MongoshBackend.resolveValueReference(

private fun <S> MongoshBackend.resolveFieldReference(fieldRef: HasFieldReference<S>) =
when (val ref = fieldRef.reference) {
is HasFieldReference.Known -> registerConstant(ref.fieldName)
is HasFieldReference.Unknown -> registerVariable("field", BsonAny)
is FromSchema -> registerConstant(ref.fieldName)
is Unknown -> registerVariable("field", BsonAny)
}

private fun <S> MongoshBackend.emitCollectionReference(collRef: HasCollectionReference<S>?): MongoshBackend {
Expand Down
Loading
Loading