v1.0.0 (#21)

Author: ytr-sakamoto

.gitignore

@@ -100,4 +100,10 @@ dblibj/.idea/httpRequests
 # Android studio 3.1+ serialized cache file
 dblibj/.idea/caches/build_file_checksums.ser
 
-
+#####################
+.tags
+*.jar
+dblibj/lib/~BROMIUM/
+dblibj/project/target/active.json
+*.class
+*.cache

AUTHORS

@@ -0,0 +1 @@
+Under construction

ChangeLog

@@ -0,0 +1 @@
+Under Construction

NEWS

@@ -0,0 +1 @@
+Under Construction

README

@@ -0,0 +1 @@
+See README.md

README.md

@@ -20,7 +20,8 @@ Open COBOL ESQL 4j (OCESQL 4j) consits of open-source Embedded SQL pre-compiler
 Run the following commands.
 
 ```sh
-./configure
+autoreconf --force --install
+./configure --prefix=/usr/
 make
 make install
 ```
@@ -50,10 +51,6 @@ 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.
+- [ ] Support other COBOL data types (COMP3, SIGN LEADING, ... etc).
 - [ ] Set up test environments using Github Actions.
 - [ ] Create docker images.

dblibj/.idea/modules/OCESQL4j.iml

@@ -8,6 +8,8 @@ val catsCore = "org.typelevel" %% "cats-core" % "2.6.1"
 val catsFree = "org.typelevel" %% "cats-free" % "2.6.1"
 val scalaTest = "org.scalatest" %% "scalatest" % "3.0.8" % Test
 
+unmanagedJars in Compile += file("lib/postgresql-42.2.24.jre6.jar")
+
 libraryDependencies ++= Seq(
   catsCore,
   catsFree,

dblibj/build.sbt

@@ -6,6 +6,7 @@ import java.sql._
 import ConnectionInfo.ConnectionMap
 import jp.osscons.opensourcecobol.libcobj.data.CobolDataStorage
 
+import java.nio.ByteBuffer
 import scala.collection.immutable.Queue
 
 object Common {
@@ -204,43 +205,27 @@ object Common {
   def setLibErrorStatus(errorCode: SqlCode): Operation[Int] =
     OCDB_PGSetLibErrorStatus(errorCode)
 
-  def setResultStatus(id: Int): Operation[Boolean] = (for {
-    keyAndValue <- operationCPure(lookUpConnList(id))
-
-    _ <- whenExecuteAndExit(keyAndValue.isEmpty, operationPure(false))
-
-    kv <- operationCPure(operationPure(keyAndValue.getOrElse(("", ConnectionInfo.defaultValue))))
-    key <- operationCPure(operationPure(kv._1))
-    pConn <- operationCPure(operationPure(kv._2))
-
-    //[remark] temporary implementation
-    //_ <- whenExecuteAndExit(pConn.result == OCDB_RES_DEFAULT_ADDRESS && pConn.result <= RESULT_FLAGBASE,
-    _ <- whenExecuteAndExit(pConn.result.isLeft,
-      operationPure(false))
-
-    //[remark] temporary implementation
-    /*returnValue <- if(pConn.result == RESULT_FLAG1_PGSQL_DUMMYOPEN) {
-        operationCPure[Int, Int](operationPure(RESULT_SUCCESS))
-      } else {
-        operationCPure[Int, Int](OCDB_PGSetResultStatus(pConn.result))
-      }*/
-    returnValue <- operationCPure(OCDB_PGSetResultStatus(pConn.result))
-  } yield returnValue).eval
+  def setResultStatus(id: Int): Operation[Boolean] =
+    lookUpConnList(id).flatMap(_ match {
+      case None => operationPure(false)
+      case Some((_, pConn)) => OCDB_PGSetResultStatus(pConn.result)
+    })
 
   /**
-   * [remark] temporary implementation
-   * Equivalent to OCDB_PGSetResultStatus in dblib/ocpgsql.c
+   * Implementation of OCDB_PGSetResultStatus in dblib/ocpgsql.c (Open-COBOL-ESQL)
+   * Regardless of the pretious SQL execution, sqlErrorCode is zero.
+   * If the pretious SQL execution fails, sqlState equals to PSQLState.
+   * (https://github.com/pgjdbc/pgjdbc/blob/8be516d47ece60b7aeba5a9474b5cac1d538a04a/pgjdbc/src/main/java/org/postgresql/util/PSQLState.java)
    * @param connAddr
-   * @return
+   * @return true if and only if the previous SQL execution is successful.
    */
   def OCDB_PGSetResultStatus(result: ExecResult): Operation[Boolean] = {
     val (sqlCode, sqlState) = result match {
       case Right(_) => (OCPG_NO_ERROR, "00000")
-      case Left(e) => (e.getErrorCode, e.getSQLState)
+      case Left(e) => (e.getErrorCode, Option(e.getSQLState).getOrElse("00000"))
     }
     for {
-      state <- getState
-      _ <- setState({
+      _ <- updateState(state => {
         val sqlCA = state.sqlCA
         val newSqlCA = sqlCA.setCode(sqlCode).setState(sqlState.getBytes)
         state.setSqlCA(newSqlCA)
@@ -365,22 +350,42 @@ object Common {
       case OCDB_TYPE_JAPANESE_VARYING => createCobolDataJapaneseVarying(sv, addr, index, resultData)
     }
   }
-
-  private def createCobolDataUnsignedNumber(sv: SQLVar, addr: CobolDataStorage, index: Int, data: scala.Array[Byte]): Unit = {
+  
+  //[TODO] improve the algorithm
+  private def createCobolDataUnsignedNumber(sv: SQLVar, addr: CobolDataStorage, index: Int, str: scala.Array[Byte]): Unit = {
     val finalBuf: scala.Array[Byte] = new scala.Array(sv.length)
-    val isNegative = data(0) == '-'.toByte
+    val isNegative = str(0) == '-'.toByte
     val valueFirstIndex = if(isNegative) {1} else {0}
-
     val indexOfDecimalPoint = {
-      val index = data.indexOf('.')
-      if(index < 0) { data.length } else { index }
+      val index = str.indexOf('.')
+      if(index < 0) { str.length } else { index }
     }
+
     for(i <- 0 until finalBuf.length) {
       finalBuf(i) = '0'.toByte
     }
-    for(i <- valueFirstIndex until indexOfDecimalPoint) {
-      finalBuf(i + finalBuf.length - (indexOfDecimalPoint + sv.power)) = data(i)
+
+    if(sv.power >= 0) {
+      for(i <- valueFirstIndex until indexOfDecimalPoint) {
+        finalBuf(i + finalBuf.length - (indexOfDecimalPoint + sv.power)) = str(i)
+      }
+    } else {
+      var i = sv.length + sv.power - 1
+      var j = indexOfDecimalPoint - 1
+      while(i >= 0 && j >= valueFirstIndex) {
+        finalBuf(i) = str(j)
+        i -= 1
+        j -= 1
+      }
+      i = sv.length + sv.power
+      j = indexOfDecimalPoint + 1
+      while(i < sv.length && j < str.length) {
+        finalBuf(i) = str(j)
+        i += 1
+        j += 1
+      }
     }
+
     for(i <- 0 until finalBuf.length) {
       addr.setByte(i, finalBuf(i))
     }
@@ -390,17 +395,36 @@ object Common {
     val finalBuf: scala.Array[Byte] = new scala.Array(sv.length)
     val isNegative = str(0) == '-'.toByte
     val valueFirstIndex = if(isNegative) {1} else {0}
-
     val indexOfDecimalPoint = {
       val index = str.indexOf('.')
       if(index < 0) { str.length } else { index }
     }
+
     for(i <- 0 until finalBuf.length) {
       finalBuf(i) = '0'.toByte
     }
-    for(i <- valueFirstIndex until indexOfDecimalPoint) {
-      finalBuf(i + finalBuf.length - (indexOfDecimalPoint + sv.power)) = str(i)
+
+    if(sv.power >= 0) {
+      for(i <- valueFirstIndex until indexOfDecimalPoint) {
+        finalBuf(i + finalBuf.length - (indexOfDecimalPoint + sv.power)) = str(i)
+      }
+    } else {
+      var i = sv.length + sv.power - 1
+      var j = indexOfDecimalPoint - 1
+      while(i >= 0 && j >= valueFirstIndex) {
+        finalBuf(i) = str(j)
+        i -= 1
+        j -= 1
+      }
+      i = sv.length + sv.power
+      j = indexOfDecimalPoint + 1
+      while(i < sv.length && j < str.length) {
+        finalBuf(i) = str(j)
+        i += 1
+        j += 1
+      }
     }
+
     if(isNegative) {
       val finalByte = finalBuf(finalBuf.length - 1)
       finalBuf(finalBuf.length - 1) = (finalByte + 0x40).toByte
@@ -411,15 +435,58 @@ object Common {
   }
 
   private def createCobolDataSignedNumberLs(sv: SQLVar, addr: CobolDataStorage, i: Int, str: scala.Array[Byte]): Unit = {
-    //TODO Implement
+    val finalBuf: scala.Array[Byte] = new scala.Array(sv.length)
+    val isNegative = str(0) == '-'.toByte
+    val valueFirstIndex = if(isNegative) {1} else {0}
+    val indexOfDecimalPoint = {
+      val index = str.indexOf('.')
+      if(index < 0) { str.length } else { index }
+    }
+
+    for(i <- 0 until finalBuf.length) {
+      finalBuf(i) = '0'.toByte
+    }
+
+    if(sv.power >= 0) {
+      for(i <- valueFirstIndex until indexOfDecimalPoint) {
+        finalBuf(i + finalBuf.length - (indexOfDecimalPoint + sv.power)) = str(i)
+      }
+    } else {
+      var i = sv.length + sv.power
+      var j = indexOfDecimalPoint - 1
+      while(i >= 1 && j >= valueFirstIndex) {
+        finalBuf(i) = str(j)
+        i -= 1
+        j -= 1
+      }
+      i = sv.length + sv.power + 1
+      j = indexOfDecimalPoint + 1
+      while(i < sv.length && j < str.length) {
+        finalBuf(i) = str(j)
+        i += 1
+        j += 1
+      }
+    }
+
+    finalBuf(0) = (if(isNegative) {'-'} else {'+'}).toByte
+    for(i <- 0 until finalBuf.length) {
+      addr.setByte(i, finalBuf(i))
+    }
   }
 
   private def createCobolDataUnsignedNumberPd(sv: SQLVar, addr: CobolDataStorage, i: Int, str: scala.Array[Byte]): Unit = {
     //TODO Implement
   }
 
   private def createCobolDataSignedNumberPd(sv: SQLVar, addr: CobolDataStorage, i: Int, str: scala.Array[Byte]): Unit = {
-    //TODO Implement
+    println("createCobolDataSignedNumberPd 1")
+    val n = Integer.parseInt(new String(str))
+    println(s"n: ${n}")
+    val bytes = new scala.Array[Byte](4)
+    ByteBuffer.wrap(bytes).putInt(n)
+    for(i <- 0 until 4) {
+      addr.setByte(i, bytes(i))
+    }
   }
 
   private def createCobolDataAlphanumeric(sv: SQLVar, addr: CobolDataStorage, i: Int, str: scala.Array[Byte]): Unit = {
@@ -432,7 +499,12 @@ object Common {
   }
 
   private def createCobolDataJapanese(sv: SQLVar, addr: CobolDataStorage, i: Int, str: scala.Array[Byte]): Unit = {
-    //TODO Implement
+    if(str.length >= sv.length * 2) {
+      addr.memcpy(str, sv.length * 2)
+    } else {
+      addr.memset(' '.toByte, sv.length * 2)
+      addr.memcpy(str, str.length)
+    }
   }
 
   private def createCobolDataAlphanumericVarying(sv: SQLVar, addr: CobolDataStorage, i: Int, str: scala.Array[Byte]): Unit = {

dblibj/src/main/scala/Common.scala

@@ -1,7 +1,6 @@
 import ConstValues._
 import Operation._
 import Common._
-import cats.syntax.flatMap
 
 import java.sql._
 
@@ -67,12 +66,12 @@ object OCESQLConnectCore {
       _ <- logLnC(s"publish connect Id: ${connectId}")
 
       _ <- whenExecuteAndExit(connectId == OCDB_CONN_FAIL_CONNECT, for {
-        _ <- setLibErrorStatus(OCDB_NO_ERROR())
+        _ <- setLibErrorStatus(OCDB_CONNECT())
         _ <- errorLogLn(s"connection failed. connect param is :${connStr}")
       } yield 1)
 
       _ <- whenExecuteAndExit(connectId == INVALID_CONN_ID, for {
-        _ <- setLibErrorStatus(OCDB_NO_ERROR())
+        _ <- setLibErrorStatus(OCDB_CONNECT())
         _ <- errorLogLn(s"connection failed. connect param is :${connStr}")
       } yield 1)
 

dblibj/src/main/scala/Connect.scala

@@ -142,4 +142,6 @@ object ConstValues {
   case class OCDB_READ_NEXT() extends ReadDirection
   case class OCDB_READ_PREVIOUS() extends ReadDirection
   case class OCDB_READ_CURRENT() extends ReadDirection
+
+  val DATA_SIZE_OF_SQL_COMMAND_LEN = 9
 }