Fix Issue #8.

Author: ytr-sakamoto

README.md

@@ -5,12 +5,12 @@ Open COBOL ESQL 4j (OCESQL 4j) consits of open-source Embedded SQL pre-compiler
 
 # Requirements
 
-* Open-source database
+* Open-source database.
   OCESQL 4j currently supports PostgreSQL database only.
 
-* [opensource COBOL 4j](https://github.com/opensourcecobol/opensourcecobol4j)
+* [opensource COBOL 4j](https://github.com/opensourcecobol/opensourcecobol4j) v1.0.2 or later.
 
-* [sbt](https://www.scala-sbt.org/)(Optional)
+* [sbt](https://www.scala-sbt.org/)(Optional).
 
 
 # Installation
@@ -50,10 +50,10 @@ See test cases or sample programs.
 
 # TODO
 
-- [ ] Implement Prepared Statement
-- [ ] Support other COBOL data types (COMP5, Japanese, ... etc)
-- [ ] Add test cases
-  - [ ] tests for SQL CA(communication area)
-  - [ ] tests for SQL data types
-- [ ] Set up test environments using Github Actions
-- [ ] Create docker images
+- [ ] Implement Prepared Statement.
+- [ ] Support other COBOL data types (COMP5, Japanese, ... etc).
+- [ ] Add test cases.
+  - [ ] tests for SQL CA(communication area).
+  - [ ] tests for SQL data types.
+- [ ] Set up test environments using Github Actions.
+- [ ] Create docker images.

dblibj/project/target/active.json

@@ -313,7 +313,7 @@ object Common {
       while(storage.getByte(i) != 0) {
         i += 1
       }
-      Some(new String(storage.getByteArray(0, i)))
+      Some(new String(storage.getByteArray(0, i), "SHIFT-JIS"))
     } catch {
       case e: Throwable => None
     }
@@ -367,33 +367,23 @@ object Common {
   }
 
   private def createCobolDataUnsignedNumber(sv: SQLVar, addr: CobolDataStorage, index: Int, data: scala.Array[Byte]): Unit = {
-    val finalBufLen = sv.length
-    val finalBuf = new scala.Array[Byte](finalBufLen)
-    val indexOfPoint = data.indexOf('.'.toByte)
-    val beforeDp = if (indexOfPoint < 0) sv.length else indexOfPoint
-    val fillZero = sv.length - beforeDp + sv.power
-    for(i <- 0 to fillZero - 1) {
+    val finalBuf: scala.Array[Byte] = new scala.Array(sv.length)
+    val isNegative = data(0) == '-'.toByte
+    val valueFirstIndex = if(isNegative) {1} else {0}
+
+    val indexOfDecimalPoint = {
+      val index = data.indexOf('.')
+      if(index < 0) { data.length } else { index }
+    }
+    for(i <- 0 until finalBuf.length) {
       finalBuf(i) = '0'.toByte
     }
-    for(i <- 0 to beforeDp - 1) {
-      finalBuf(i + fillZero) = data(i)
+    for(i <- valueFirstIndex until indexOfDecimalPoint) {
+      finalBuf(i + finalBuf.length - (indexOfDecimalPoint + sv.power)) = data(i)
     }
-
-    if(sv.power < 0) {
-      var afterDp = 0
-      if(indexOfPoint < 0) {
-        afterDp = data.length - beforeDp - DECIMAL_LENGTH
-        for(i <- 0 to (afterDp - 1)) {
-          finalBuf(fillZero + beforeDp + i) = data(beforeDp + DECIMAL_LENGTH + i)
-        }
-      }
-      val fillZero_ = - sv.power - afterDp
-      for(i <- 0 to (fillZero_ - 1)) {
-        finalBuf(i) = '0'.toByte
-      }
+    for(i <- 0 until finalBuf.length) {
+      addr.setByte(i, finalBuf(i))
     }
-
-    addr.memcpy(finalBuf, sv.length)
   }
 
   private def createCobolDataSignedNumberTc(sv: SQLVar, addr: CobolDataStorage, index: Int, str: scala.Array[Byte]): Unit = {

dblibj/src/main/scala/Common.scala

@@ -7,6 +7,21 @@ import java.text.SimpleDateFormat
 import scala.collection.immutable.Queue
 
 object Select {
+
+  def getPreviousOperationResultSet(id: Int): Operation[Option[ResultSet]] =
+    lookUpConnList(id).flatMap(_ match {
+      case None => operationPure(None)
+      case Some((_, pConn)) => operationPure(pConn.result match {
+        case Right(EResultSet(rs)) => Some(rs)
+        case _ => None
+      })
+    })
+
+  private def errorProc: Operation[Unit] = for {
+    _ <- setLibErrorStatus(OCDB_NOT_FOUND())
+    _ <- logLn("TUPLES NODATA")
+  } yield ()
+
   def ocesqlExecSelectIntoOne(id: Int, query: Option[String], nParams: Int, nResParams: Int): Operation[Unit] = (for {
     state <- operationCPure(getState)
     _ <- whenExecuteAndExit(query.getOrElse("").length == 0, for {
@@ -21,6 +36,8 @@ object Select {
         ocesqlExec(id, query)
       })
 
+    rs <- operationCPure(getPreviousOperationResultSet(id))
+
     status <- operationCPure(setResultStatus(id))
     _ <- whenExecuteAndExit(!status, operationPure(()))
 
@@ -30,32 +47,27 @@ object Select {
       _ <- setLibErrorStatus(OCDB_EMPTY())
     } yield ())
 
-    // TODO remark これ不要?
-    tuples <- operationCPure(OCDBNtuples(id))
-
-    _ <- operationCPure(
-      if(tuples < 1) {
-        for {
-          _ <- setLibErrorStatus(OCDB_NOT_FOUND())
-          _ <- logLn("TUPLES NODATA")
-        } yield ()
-      } else {
-        forM(state.globalState.sqlResVarQueue.zipWithIndex){e => {
-            val (sv, i) = e
-            if(i >= fields){
-              operationPure(())
-            } else {
-              for {
-                retStr <- OCDBGetValue(id, i + 1)
-                _ <- operationPure(retStr match {
-                  case Some(str) => createCobolData(sv, 0, str, state.globalState.occursInfo)
-                  case _ => ()
-                })
-              } yield ()
-            }
+    _ <- operationCPure(rs match {
+      case None => errorProc
+      case Some(rs) => if (rs.next()) {
+        forM(state.globalState.sqlResVarQueue.zipWithIndex) { e => {
+          val (sv, i) = e
+          if (i >= fields) {
+            operationPure(())
+          } else {
+            for {
+              retStr <- OCDBGetValue(id, i + 1)
+              _ <- operationPure(retStr match {
+                case Some(str) => createCobolData(sv, 0, str, state.globalState.occursInfo)
+                case _ => ()
+              })
+            } yield ()
           }
-        }
-      })
+        }}
+      } else {
+        errorProc
+      }
+    })
   } yield ()).eval
 
   def ocesqlExecSelectIntoOccurs(id: Int, query: Option[String], nParams: Int, nResParams: Int): Operation[Unit] = (for {