OEntityIterableBaseTest were fixed.

JetBrains · Apr 22, 2024 · a40649b · a40649b
1 parent 4d18b78
commit a40649b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -134,7 +134,6 @@ subprojects {
     }
     tasks.withType<JavaCompile> {
         options.encoding = "UTF-8"
-        options.compilerArgs = listOf("--add-modules", "jdk.incubator.vector", "--enable-preview")
     }
 
     tasks.jar {
@@ -152,18 +151,14 @@ subprojects {
         maxHeapSize = "1g"
         jvmArgs = listOf(
             "-ea",
-            "-XX:+HeapDumpOnOutOfMemoryError",
-            "--add-modules",
-            "jdk.incubator.vector",
-            "--enable-preview"
+            "-XX:+HeapDumpOnOutOfMemoryError"
         )
     }
 
     tasks.javadoc {
         isFailOnError = false
         options.quiet()
         (options as CoreJavadocOptions).addStringOption("Xdoclint:none", "-quiet")
-        (options as CoreJavadocOptions).addBooleanOption("-enable-preview", true)
         (options as CoreJavadocOptions).addStringOption("source", 17.toString())
     }
 

diff --git a/entity-store/src/main/kotlin/jetbrains/exodus/entitystore/orientdb/query/OQueryFunctions.kt b/entity-store/src/main/kotlin/jetbrains/exodus/entitystore/orientdb/query/OQueryFunctions.kt
@@ -86,7 +86,7 @@ class OFirstSelect(
     val source: OSelect,
 ) : OQuery {
 
-    override fun sql() = "SELECT expand(first(*)) FROM (${source.sql()})"
+    override fun sql() = "SELECT expand(first(\$a)) LET \$a = (${source.sql()})"
     override fun params() = source.params()
 }
 
@@ -95,6 +95,6 @@ class OLastSelect(
     val source: OSelect,
 ) : OQuery {
 
-    override fun sql() = "SELECT expand(last(*)) FROM (${source.sql()})"
+    override fun sql() = "SELECT expand(last(\$a)) LET \$a = (${source.sql()})"
     override fun params() = source.params()
 }
diff --git a/.../src/test/kotlin/jetbrains/exodus/entitystore/orientdb/iterate/OEntityIterableBaseTest.kt b/.../src/test/kotlin/jetbrains/exodus/entitystore/orientdb/iterate/OEntityIterableBaseTest.kt
@@ -147,7 +147,7 @@ class OEntityIterableBaseTest : OTestMixin {
             val issuesDistinct = issues.distinct()
 
             // Then
-            assertThat(issues).hasSize(3)
+            assertThat(issuesDistinct).hasSize(3)
             assertNamesExactlyInOrder(issuesDistinct, "issue1", "issue2", "issue3")
         }
     }