Merge pull request #61 from smeup/fix/LS23095434/multi_setll

fix: multi setll
smeup · Dec 18, 2023 · 413e10a · 413e10a
2 parents ea709c5 + 42c1074
commit 413e10a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/sql/src/main/kotlin/com/smeup/dbnative/sql/SQLDBFile.kt b/sql/src/main/kotlin/com/smeup/dbnative/sql/SQLDBFile.kt
@@ -346,7 +346,7 @@ class SQLDBFile(
 
 
     private fun readNextFromResultSet(loadNext: Boolean): Result {
-        if (nextResult == null) nextResult = Result(resultSet.toValues())
+        if (nextResult == null || nextResult!!.record.isEmpty()) nextResult = Result(resultSet.toValues())
         val result = nextResult
 
         var found: Boolean = false

diff --git a/sql/src/test/kotlin/com/smeup/dbnative/sql/SQLReadEqualTest.kt b/sql/src/test/kotlin/com/smeup/dbnative/sql/SQLReadEqualTest.kt
@@ -23,15 +23,14 @@ import org.junit.AfterClass
 import org.junit.BeforeClass
 import org.junit.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
 
 class SQLReadEqualTest {
 
     companion object {
 
         private lateinit var dbManager: SQLDBMManager
-        
+
         @BeforeClass
         @JvmStatic
         fun setUp() {
@@ -67,7 +66,7 @@ class SQLReadEqualTest {
     @Test
     fun findRecordsIfChainAndReadEExistingKey() {
         val dbFile = dbManager.openFile(EMPLOYEE_VIEW_NAME)
-        val setllResult = dbFile.setll( "C01")
+        val setllResult = dbFile.setll("C01")
         assertEquals("SALLY KWAN", getEmployeeName(dbFile.readEqual("C01").record))
         assertEquals("DELORES QUINTANA", getEmployeeName(dbFile.readEqual("C01").record))
         assertEquals("HEATHER NICHOLLS", getEmployeeName(dbFile.readEqual("C01").record))
@@ -79,23 +78,23 @@ class SQLReadEqualTest {
     @Test
     fun readUntilEof() {
         val dbFile = dbManager.openFile(EMPLOYEE_VIEW_NAME)
-        val setllResult = dbFile.setll( "C01")
+        val setllResult = dbFile.setll("C01")
         var readed = 0;
         var readResult = Result()
         while (dbFile.eof() == false) {
             readResult = dbFile.readEqual("C01")
             readed++
         }
         assertEquals(4, readed)
-        assertTrue (readResult.indicatorEQ)
+        assertTrue(readResult.indicatorEQ)
         dbManager.closeFile(EMPLOYEE_VIEW_NAME)
     }
 
     @Test
     fun equals() {
         val dbFile = dbManager.openFile(EMPLOYEE_VIEW_NAME)
-        val chainResult = dbFile.setll( "C01")
-        assertTrue (dbFile.equal())
+        val chainResult = dbFile.setll("C01")
+        assertTrue(dbFile.equal())
         dbManager.closeFile(EMPLOYEE_VIEW_NAME)
     }
 
@@ -112,6 +111,20 @@ class SQLReadEqualTest {
         dbManager.closeFile(EMPLOYEE_VIEW_NAME)
     }
 
+    @Test
+    fun setllReadsetllReade() {
+        val dbFile = SQLReadEqualTest.dbManager.openFile(MUNICIPALITY_TABLE_NAME)
+        assertTrue(dbFile.setll(buildMunicipalityKey("IT", "LOM", "BS")))
+        while (!dbFile.eof()) {
+            dbFile.read()
+        }
+        assertTrue(dbFile.setll(buildMunicipalityKey("IT", "LOM", "BS")))
+        val result = dbFile.readEqual(buildMunicipalityKey("IT", "LOM", "BS"))
+        assertEquals("ACQUAFREDDA", getMunicipalityName(result.record))
+
+        SQLReadEqualTest.dbManager.closeFile(MUNICIPALITY_TABLE_NAME)
+    }
+
     @Test
     fun doesNotFindRecordsIfReadEWithKeyNotExistingKey() {
         val dbFile = dbManager.openFile(EMPLOYEE_VIEW_NAME)
@@ -130,6 +143,7 @@ class SQLReadEqualTest {
         assertEquals(0, dbFile.readEqual("C01").record.size)
         dbManager.closeFile(EMPLOYEE_VIEW_NAME)
     }
+
     @Test
     fun setgtReade() {
         val dbFile = SQLReadEqualTest.dbManager.openFile(MUNICIPALITY_TABLE_NAME)
@@ -146,6 +160,7 @@ class SQLReadEqualTest {
         assertEquals("ZONE", getMunicipalityName(dbFile.readEqual(buildMunicipalityKey("IT", "LOM", "BS")).record))
         var r = dbFile.readEqual(buildMunicipalityKey("IT", "LOM", "BS"))
         assertTrue(dbFile.eof())
+        assertTrue(r.indicatorEQ)
         r = dbFile.readEqual(buildMunicipalityKey("IT", "LOM", "BS"))
         assertTrue(dbFile.eof())
         SQLReadEqualTest.dbManager.closeFile(MUNICIPALITY_TABLE_NAME)