fix(modelql)!: disable implicit queries to avoid accidental performan…

…ce issues You should fix the unintended implicit queries or use .query explicitly. You can also set the environment variable MODELQL_IMPLICIT_QUERIES_ENABLED=true to re-enable this feature.
modelix · Dec 8, 2024 · b6cd91a · b6cd91a
1 parent b7734da
commit b6cd91a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/...adle-test/kotlin-generation/src/test/kotlin/org/modelix/modelql/typed/TypedModelQLTest.kt b/...adle-test/kotlin-generation/src/test/kotlin/org/modelix/modelql/typed/TypedModelQLTest.kt
@@ -227,7 +227,7 @@ class TypedModelQLTest {
                 .untyped()
                 .toList()
         }.map { it.typed<StaticMethodDeclaration>() }
-        assertEquals("plus", result[0].name)
+        assertEquals("plus", result[0].query { it.name })
     }
 
     @Test
@@ -239,7 +239,7 @@ class TypedModelQLTest {
                 .filter { it.visibility.instanceOf(C_PublicVisibility) }
                 .toList()
         }
-        assertEquals("plus", result[0].name)
+        assertEquals("plus", result[0].query { it.name })
     }
 
     @Test
@@ -257,8 +257,9 @@ class TypedModelQLTest {
                 .member
                 .ofConcept(C_StaticMethodDeclaration)
                 .first()
+                .name
         }
-        assertEquals(expected, actual.name)
+        assertEquals(expected, actual)
     }
 
     @Test
@@ -297,7 +298,7 @@ class TypedModelQLTest {
                 .first()
         }
         assertNotEquals(expected, oldValue)
-        assertEquals(expected, actual.variableDeclaration.name)
+        assertEquals(expected, actual.query { it.variableDeclaration.name })
     }
 
     @Test

diff --git a/modelql-client/src/jsMain/kotlin/org/modelix/modelql/client/ModelQLNode.js.kt b/modelql-client/src/jsMain/kotlin/org/modelix/modelql/client/ModelQLNode.js.kt
@@ -17,4 +17,4 @@
 package org.modelix.modelql.client
 
 actual val implicitQueriesEnabled: Boolean
-    get() = false
+    get() = false
diff --git a/modelql-client/src/jvmTest/kotlin/org/modelix/modelql/client/ModelQLClientTest.kt b/modelql-client/src/jvmTest/kotlin/org/modelix/modelql/client/ModelQLClientTest.kt
@@ -24,6 +24,7 @@ import org.modelix.model.api.IChildLinkReference
 import org.modelix.model.api.IConceptReference
 import org.modelix.model.api.INode
 import org.modelix.model.api.IPropertyReference
+import org.modelix.model.api.IReferenceLinkReference
 import org.modelix.model.api.NodeReference
 import org.modelix.model.api.PBranch
 import org.modelix.model.api.getRootNode
@@ -43,6 +44,7 @@ import org.modelix.modelql.core.fold
 import org.modelix.modelql.core.map
 import org.modelix.modelql.core.memoize
 import org.modelix.modelql.core.notEqualTo
+import org.modelix.modelql.core.orNull
 import org.modelix.modelql.core.plus
 import org.modelix.modelql.core.sum
 import org.modelix.modelql.core.toList
@@ -58,6 +60,7 @@ import org.modelix.modelql.untyped.descendants
 import org.modelix.modelql.untyped.nodeReference
 import org.modelix.modelql.untyped.property
 import org.modelix.modelql.untyped.query
+import org.modelix.modelql.untyped.reference
 import org.modelix.modelql.untyped.remove
 import org.modelix.modelql.untyped.resolve
 import org.modelix.modelql.untyped.setProperty
@@ -258,7 +261,7 @@ class ModelQLClientTest {
     fun `test IMonoStep nodeRefAndConcept`() = runTest { httpClient ->
         val client = ModelQLClient("http://localhost/query", httpClient)
 
-        val nullNode = client.getRootNode().getReferenceTarget("nonExistentReference")
+        val nullNode = client.getRootNode().query { it.reference(IReferenceLinkReference.fromName("nonExistentReference")).orNull() }
 
         assertEquals(null, nullNode)
     }