check point

mbari-org · Nov 2, 2024 · d885eed · d885eed
1 parent 8681985
commit d885eed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/...rus/src/main/scala/org/mbari/annosaurus/repository/query/PreparedStatementGenerator.scala b/...rus/src/main/scala/org/mbari/annosaurus/repository/query/PreparedStatementGenerator.scala
@@ -120,11 +120,9 @@ object PreparedStatementGenerator:
             val offset = query.offset.map(o => s"OFFSET $o").getOrElse("")
             s"$limit $offset"
         else 
-            if (query.limit.isEmpty && query.offset.isEmpty) return ""
-            else
-                val offset = query.offset.getOrElse(0)
-                val fetch = query.limit match
-                    case Some(l) => s"FETCH NEXT $l ROWS ONLY"
-                    case None    => ""
-                s"OFFSET $offset ROWS $fetch"
+            val offset = query.offset.getOrElse(0)
+            val fetch = query.limit match
+                case Some(l) => s"FETCH NEXT $l ROWS ONLY"
+                case None    => ""
+            s"OFFSET $offset ROWS $fetch"
 
diff --git a/annosaurus/src/main/scala/org/mbari/annosaurus/repository/query/QueryService.scala b/annosaurus/src/main/scala/org/mbari/annosaurus/repository/query/QueryService.scala
@@ -96,7 +96,7 @@ class QueryService(databaseConfig: DatabaseConfig, viewName: String):
                         ResultSet.CONCUR_READ_ONLY
                     )
                 )
-                query.limit.foreach(stmt.setMaxRows)
+                // query.limit.foreach(stmt.setMaxRows)
                 // TODO may have to add some database specific code here
                 // query.offset.foreach(stmt.setF)
                 PreparedStatementGenerator.bind(stmt, query.where)

diff --git a/it/src/main/scala/org/mbari/annosaurus/repository/query/QueryServiceSuite.scala b/it/src/main/scala/org/mbari/annosaurus/repository/query/QueryServiceSuite.scala
@@ -43,7 +43,7 @@ trait QueryServiceSuite extends BaseDAOSuite:
 
     }
 
-    test("query distinct concept with limit") {
+    test("query distinct concept with limit and offset") {
         val im    = TestUtils.create(5, 2, 1)
         val query = Query(select = Seq("concept"), distinct = true, 
             limit = Some(2), offset = Some(1))