dmRuby 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8275b526bc427412425d3772f468905157dafdb29b61bde45caafc23224579
-  data.tar.gz: 0bb96975bee1b29230b2f59c6f8f77614b0935bb37fa73fdb2906fea25618a19
+  metadata.gz: 16c17975a7c35617e5a27459e3f4bff7070a7bfac2d788019c2e9d999ec15ed2
+  data.tar.gz: 13be646ef94149926f1adc7bc539a013603dcadf9aaeafe53b1da87a64b732c0
 SHA512:
-  metadata.gz: 8615170e2fedb07bd810734a3235c7a3d23f3b037130ee290699d481b1a37103a8bbb8c6025850a15c119cb1d50cb672462b445301d7591d233e77354fdc118f
-  data.tar.gz: f3aaa9c5e134493f38c959fb298081e4c155fb6437ef555b734806c430d6e1e74a6669709dc659536a522819f9902b94e138d56aaafd5e2d8c83324a28a9b12f
+  metadata.gz: 8600e17b7285807a567cfacc749b9645428626eec4f3301442a1d2c2a94728e93b01ed4572039e68351252b26bda50c3d512c67f40b30ee849e1a821a125cc21
+  data.tar.gz: 70fb7211153bc57809bc82b86aa80bd0e578b208b3f7b0a1ba11590e53b69c9c835d14cde417d18b68bfb2433d670b1f07c8d9437015fe11b65962c19811d0b3

data/ChangeLogs.md

@@ -8,13 +8,37 @@
 
 ## Change Logs
 
+- dmRuby v1.0.6
+
+  1、修改读取中文数据缺失的问题；
+
+  2、修改插入带时区的时间数据没有转换时区的问题；
+
+  3、修改插入空数据的问题；
+
+  4、修改读取空串的问题；
+
+- dmRuby v1.0.5
+
+  1、修改读取bit类型结果错误的问题；
+
+  2、修改Dm::Client.affected_rows()返回结果错误的问题；
+
+  3、修改对number类型，查询sum()求和返回结果丢失精度的问题；
+
+  4、修改不手动调用stmt.close，内存持续增长的问题；
+
+  5、修改blob插入二进制数据，数据库查询为空的问题；
+
+  6、修改插入较长的整数会溢出的问题。
+
 - dmRuby v1.0.4
 
-  1、新增连接参数schema
+  1、新增连接参数schema。
 
 - dmRuby v1.0.3
 
-  1、修改stmt执行的语句不能输出array类型的result
+  1、修改stmt执行的语句不能输出array类型的result。
 
 - dmRuby v1.0.2
 

data/ext/client.c

@@ -422,7 +422,12 @@ static VALUE rb_dm_query(VALUE self, VALUE sql, VALUE options) {
 static VALUE rb_dm_client_last_id(VALUE self) {
   GET_CLIENT(self);
   REQUIRE_CONNECTED(wrapper);
-  return rb_str_new2(wrapper->lastrowid);
+  rb_encoding *conn_enc;
+  VALUE obj = rb_str_new2(wrapper->lastrowid);
+
+  conn_enc = rb_to_encoding(wrapper->encoding);
+  rb_enc_associate(obj, conn_enc);
+  return obj;
 }
 
 

data/ext/result.c

@@ -111,18 +111,18 @@ static void *nogvl_get_col_desc(void *ptr) {
                 (dpointer)&(wrapper->col_desc[iParam].length), 0, NULL);
       if(!DSQL_SUCCEEDED(rt))
         return (void*)Qfalse;
-      wrapper->result[iParam] = (char*)xmalloc(wrapper->col_desc[iParam].length+2);
+      wrapper->result[iParam] = (char*)xmalloc(wrapper->col_desc[iParam].length * 2 + 1);
       if(wrapper->col_desc[iParam].sql_type == DSQL_BINARY || wrapper->col_desc[iParam].sql_type == DSQL_VARBINARY)
       {
         rt = dpi_bind_col(wrapper->statement, (udint2)iParam + 1, DSQL_C_BINARY,
                               (dpointer)wrapper->result[iParam],
-                              wrapper->col_desc[iParam].length + 1, &wrapper->length[iParam]);
+                              wrapper->col_desc[iParam].length * 2 + 1, &wrapper->length[iParam]);
       }
       else
       {
         rt = dpi_bind_col(wrapper->statement, (udint2)iParam + 1, DSQL_C_NCHAR,
                                 (dpointer)wrapper->result[iParam],
-                                wrapper->col_desc[iParam].length + 1, &wrapper->length[iParam]);
+                                wrapper->col_desc[iParam].length * 2 + 1, &wrapper->length[iParam]);
       }                  
     }
   }
@@ -150,7 +150,7 @@ static void rb_dm_result_free_result(dm_result_wrapper * wrapper) {
    
     for(i = 0; i < wrapper->numberOfFields; i++)
     {
-      if(wrapper->col_desc[i].sql_type == DSQL_BLOB || wrapper->col_desc[i].sql_type == DSQL_CLOB)
+      if((wrapper->col_desc[i].sql_type == DSQL_BLOB || wrapper->col_desc[i].sql_type == DSQL_CLOB) && wrapper->client != Qnil && wrapper->client_wrapper->closed != 1)
         dpi_free_lob_locator(wrapper->lobs[i]);
       if(wrapper->result[i])
       {
@@ -172,7 +172,7 @@ static void rb_dm_result_free_result(dm_result_wrapper * wrapper) {
 /* this is called during GC */
 static void rb_dm_result_free(void *ptr) {
   dm_result_wrapper *wrapper = ptr;
-  if (wrapper->statement != NULL && wrapper->is_prepare == 0) {
+  if (wrapper->statement != NULL && wrapper->is_prepare == 0 && wrapper->client != Qnil && wrapper->client_wrapper->closed != 1) {
       dpi_free_stmt(wrapper->statement);
       wrapper->statement = NULL;
   }
@@ -550,7 +550,7 @@ static VALUE rb_dm_result_fetch_row(VALUE self,const result_each_args *args)
 
   for (i = 0; i < wrapper->numberOfFields; i++) {
     VALUE field = rb_dm_result_fetch_field(self, i, args->symbolizeKeys);
-    if (row[i] && fieldLengths[i]>0) {
+    if (row[i] && fieldLengths[i]>=0) {
       VALUE val = Qnil;
       sdint2 type = wrapper->col_desc[i].sql_type;
 
@@ -563,7 +563,7 @@ static VALUE rb_dm_result_fetch_row(VALUE self,const result_each_args *args)
           if (args->castBool && fieldLengths[i] == 1) {
             val = *row[i] == '1' ? Qtrue : Qfalse;
           }else{
-            val = rb_str_new(row[i], fieldLengths[i]);
+            val = rb_cstr2inum(row[i], 10);
           }
           break;
         case DSQL_TINYINT:       /* TINYINT field */
@@ -577,9 +577,7 @@ static VALUE rb_dm_result_fetch_row(VALUE self,const result_each_args *args)
           val = rb_cstr2inum(row[i], 10);
           break;
         case DSQL_DEC:    /* DECIMAL or NUMERIC field */
-          if (wrapper->col_desc[i].scale == 0) {
-            val = rb_cstr2inum(row[i], 10);
-          } else if (strtod(row[i], NULL) == 0.000000){
+          if (strtod(row[i], NULL) == 0.000000){
             val = rb_funcall(rb_mKernel, intern_BigDecimal, 1, opt_decimal_zero);
           }else{
             val = rb_funcall(rb_mKernel, intern_BigDecimal, 1, rb_str_new(row[i], fieldLengths[i]));
@@ -882,7 +880,6 @@ static VALUE rb_dm_result_each(int argc, VALUE * argv, VALUE self) {
   }
   else
   {
- 
     symbolizeKeys = 0;
     asArray       = 0;
     castBool      = 0;

data/ext/statement.c

@@ -29,8 +29,12 @@ static void rb_dm_stmt_free(void *ptr) {
 }
     
 static size_t rb_dm_stmt_memsize(const void * ptr) {
-  const dm_stmt_wrapper *stmt_wrapper = ptr;
-  return sizeof(*stmt_wrapper);
+  const dm_stmt_wrapper * w = ptr;
+  size_t memsize = sizeof(*w);
+  if (w->client_wrapper) {
+    memsize += sizeof(*w->client_wrapper);
+  }
+  return memsize;
 }
 
 #ifdef HAVE_RB_GC_MARK_MOVABLE
@@ -74,12 +78,25 @@ static void *nogvl_stmt_close(void *ptr) {
 void decr_dm_stmt(dm_stmt_wrapper *stmt_wrapper) {
   stmt_wrapper->refcount--;
 
-  if (stmt_wrapper->refcount == 0) {
-    if(stmt_wrapper->paramdesc != NULL)
+  if (stmt_wrapper->refcount == 0) 
+  {
+    if (stmt_wrapper->paramdesc != NULL)
     {
       xfree(stmt_wrapper->paramdesc);
       stmt_wrapper->paramdesc = NULL;
     }
+
+    if (stmt_wrapper->stmt && stmt_wrapper->client != Qnil) 
+    {
+      if (stmt_wrapper->client_wrapper->closed != 1) {
+        dpi_free_stmt(stmt_wrapper->stmt);
+      }
+      stmt_wrapper->stmt = NULL;
+    }
+
+    if (stmt_wrapper->client != Qnil) 
+      decr_dm_client(stmt_wrapper->client_wrapper);
+  
     xfree(stmt_wrapper);
   }
 }
@@ -201,6 +218,8 @@ VALUE rb_dm_stmt_new(VALUE rb_client, VALUE sql) {
 #endif
   {
     stmt_wrapper->client = rb_client;
+    stmt_wrapper->client_wrapper = DATA_PTR(rb_client);
+    stmt_wrapper->client_wrapper->refcount++;
     stmt_wrapper->refcount = 1;
     stmt_wrapper->closed = 0;
     stmt_wrapper->stmt = NULL;
@@ -292,11 +311,13 @@ static void *nogvl_stmt_execute(void *ptr) {
     rt = dpi_rowid_to_char(wrapper->client,lastrowid,sizeof(lastrowid),stmt_wrapper->lastrowid,sizeof(stmt_wrapper->lastrowid),&len);
      if (!DSQL_SUCCEEDED(rt)) {
       return (void*)Qfalse;
-    } 
+    }
+     strncpy(wrapper->lastrowid, stmt_wrapper->lastrowid, 20);
   }
   else
   {
     strncpy(stmt_wrapper->lastrowid, "", 20);
+    strncpy(wrapper->lastrowid, "", 20);
   }
   
   // affected_rows
@@ -308,7 +329,13 @@ static void *nogvl_stmt_execute(void *ptr) {
     rt = dpi_row_count(stmt_wrapper->stmt,&stmt_wrapper->affected_rows);
      if (!DSQL_SUCCEEDED(rt)) {
       return (void*)Qfalse;
-    } 
+    }
+     wrapper->affected_rows = stmt_wrapper->affected_rows;
+  }
+  else
+  {
+    stmt_wrapper->affected_rows = 0;
+    wrapper->affected_rows = 0;
   }      
 
   rt = dpi_number_columns(stmt_wrapper->stmt, &stmt_wrapper->col_num);   
@@ -357,10 +384,7 @@ static int my_big2ll(VALUE bignum, sdint8  *ptr)
 
   if (len > sizeof(sdint8)) goto overflow;
   if (RBIGNUM_POSITIVE_P(bignum)) {
-    num = rb_big2ull(bignum);
-    if (num > LLONG_MAX)
-      goto overflow;
-    *ptr = num;
+    goto overflow;
   }
   else {
     if (len == 8 &&
@@ -403,6 +427,8 @@ static VALUE rb_dm_stmt_execute(int argc, VALUE *argv, VALUE self) {
   VALUE *params_enc = NULL;
   rb_encoding *conn_enc;
   DPIRETURN rt;
+  rb_encoding *enc;
+  slength indicator;
 
   GET_STATEMENT(self);
   GET_CLIENT(stmt_wrapper->client);
@@ -437,121 +463,108 @@ static VALUE rb_dm_stmt_execute(int argc, VALUE *argv, VALUE self) {
 
       switch (TYPE(argv[i])) {
         case T_NIL:
-          bind_buffers[i].buffer = xmalloc(8192);
-          strncpy(bind_buffers[i].buffer, "", 8192);
-          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_NCHAR, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, 8192, NULL);
+          indicator = DSQL_NULL_DATA;
+          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_NCHAR, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, NULL, 0, &indicator);
           if(!DSQL_SUCCEEDED(rt))
-            rb_raise(cdmError, "failed to bind param %d", i);
+            rb_raise(cdmError, "failed to bind param %d , code = %d", i, rt, stmt_wrapper, stmt_wrapper->stmt, *(udint8*)stmt_wrapper->stmt);
           break;
         case T_FIXNUM:
-#if SIZEOF_INT < SIZEOF_LONG
+        #if SIZEOF_INT < SIZEOF_LONG
           bind_buffers[i].buffer = xmalloc(sizeof(long long int));
-          *(long*)(bind_buffers[i].buffer) = FIX2LONG(argv[i]);
-          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_SBIGINT, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, sizeof(long long int), NULL);
+          *(long long int*)(bind_buffers[i].buffer) = FIX2LONG(argv[i]);
+          bind_buffers[i].buffer_length = sizeof(long long int);
+          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_SBIGINT, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
           if(!DSQL_SUCCEEDED(rt))
-            rb_raise(cdmError, "failed to bind param %d", i);
-#else
+            rb_raise(cdmError, "failed to bind param %d , code = %d", i, rt, stmt_wrapper, stmt_wrapper->stmt, *(udint8*)stmt_wrapper->stmt);
+        #else
           bind_buffers[i].buffer = xmalloc(sizeof(int));
-          *(long*)(bind_buffers[i].buffer) = FIX2INT(argv[i]);
-          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_SLONG, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, sizeof(int), NULL);
+          *(int*)(bind_buffers[i].buffer) = FIX2INT(argv[i]);
+          bind_buffers[i].buffer_length = sizeof(int);
+          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_SLONG, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
           if(!DSQL_SUCCEEDED(rt))
-            rb_raise(cdmError, "failed to bind param %d", i);
-#endif
-          break;
+           rb_raise(cdmError, "failed to bind param %d , code = %d", i, rt, stmt_wrapper, stmt_wrapper->stmt, *(udint8*)stmt_wrapper->stmt);
+        #endif
+           break;
         case T_BIGNUM:
           {
             sdint8 num;
             if (my_big2ll(argv[i], &num) == 0) {
               bind_buffers[i].buffer = xmalloc(sizeof(sdint8));
               *(sdint8*)(bind_buffers[i].buffer) = num;
-              rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_SBIGINT, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, sizeof(sdint8), NULL);
+              bind_buffers[i].buffer_length = sizeof(sdint8);
+              rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_SBIGINT, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
             } else {
               /* The bignum was larger than we can fit in LONG_LONG, send it as a string */
               params_enc[i] = rb_str_export_to_enc(rb_big2str(argv[i], 10), conn_enc);
               set_buffer_for_string(&bind_buffers[i], &length_buffers[i], params_enc[i]);
-              rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_NCHAR, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, NULL);
+              rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_NCHAR, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
             }
           }
           if(!DSQL_SUCCEEDED(rt))
-            rb_raise(cdmError, "failed to bind param %d", i);
+            rb_raise(cdmError, "failed to bind param %d , code = %d", i, rt, stmt_wrapper, stmt_wrapper->stmt, *(udint8*)stmt_wrapper->stmt);
           break;
         case T_FLOAT:
           bind_buffers[i].buffer = xmalloc(sizeof(double));
           *(double*)(bind_buffers[i].buffer) = NUM2DBL(argv[i]);
-          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_DOUBLE, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, sizeof(double), NULL);
+          bind_buffers[i].buffer_length = sizeof(double);
+          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_DOUBLE, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
           if(!DSQL_SUCCEEDED(rt))
-            rb_raise(cdmError, "failed to bind param %d", i);
+            rb_raise(cdmError, "failed to bind param %d , code = %d", i, rt, stmt_wrapper, stmt_wrapper->stmt, *(udint8*)stmt_wrapper->stmt);
           break;
         case T_STRING:
           params_enc[i] = argv[i];
-          params_enc[i] = rb_str_export_to_enc(params_enc[i], conn_enc);
-          set_buffer_for_string(&bind_buffers[i], &length_buffers[i], params_enc[i]);
-          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_NCHAR, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, NULL);
-          if(!DSQL_SUCCEEDED(rt))
-            rb_raise(cdmError, "failed to bind param %d", i);
+          enc = rb_enc_get(params_enc[i]);
+          if (enc == rb_ascii8bit_encoding())
+          {
+            set_buffer_for_string(&bind_buffers[i], &length_buffers[i], params_enc[i]);
+            rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_BINARY, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
+            if(!DSQL_SUCCEEDED(rt))
+              rb_raise(cdmError, "failed to bind param %d , code = %d", i, rt, stmt_wrapper, stmt_wrapper->stmt, *(udint8*)stmt_wrapper->stmt);
+          }
+          else
+          {
+            params_enc[i] = rb_str_export_to_enc(params_enc[i], conn_enc);
+            set_buffer_for_string(&bind_buffers[i], &length_buffers[i], params_enc[i]);
+            rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_NCHAR, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
+            if(!DSQL_SUCCEEDED(rt))
+              rb_raise(cdmError, "failed to bind param %d , code = %d", i, rt, stmt_wrapper, stmt_wrapper->stmt, *(udint8*)stmt_wrapper->stmt);
+          }
           break;
         case T_TRUE:
           bind_buffers[i].buffer = xmalloc(sizeof(int));
           *(int*)(bind_buffers[i].buffer) = 1;
-          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_SLONG, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, sizeof(int), NULL);
+          bind_buffers[i].buffer_length = sizeof(int);
+          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_SLONG, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
           if(!DSQL_SUCCEEDED(rt))
-            rb_raise(cdmError, "failed to bind param %d", i);
+            rb_raise(cdmError, "failed to bind param %d , code = %d", i, rt, stmt_wrapper, stmt_wrapper->stmt, *(udint8*)stmt_wrapper->stmt);
           break;
         case T_FALSE:
           bind_buffers[i].buffer = xmalloc(sizeof(int));
           *(int*)(bind_buffers[i].buffer) = 0;
-          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_SLONG, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, sizeof(int), NULL);
+          bind_buffers[i].buffer_length = sizeof(int);
+          rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_SLONG, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
           if(!DSQL_SUCCEEDED(rt))
-            rb_raise(cdmError, "failed to bind param %d", i);
+            rb_raise(cdmError, "failed to bind param %d , code = %d", i, rt, stmt_wrapper, stmt_wrapper->stmt, *(udint8*)stmt_wrapper->stmt);
           break;
         default:
           // TODO: what Ruby type should support dm_TYPE_TIME
-          if (CLASS_OF(argv[i]) == rb_cTime || CLASS_OF(argv[i]) == cDateTime) {
-            dpi_timestamp_t t;
-            VALUE rb_time = argv[i];
-
-            bind_buffers[i].buffer = xmalloc(sizeof(dpi_timestamp_t));
-
-            memset(&t, 0, sizeof(dpi_timestamp_t));
-
-            if (CLASS_OF(argv[i]) == rb_cTime) {
-              t.fraction = FIX2INT(rb_funcall(rb_time, intern_usec, 0));
-            } else if (CLASS_OF(argv[i]) == cDateTime) {
-              t.fraction = NUM2DBL(rb_funcall(rb_time, intern_sec_fraction, 0)) * 1000000;
-            }
-
-            t.second = FIX2INT(rb_funcall(rb_time, intern_sec, 0));
-            t.minute = FIX2INT(rb_funcall(rb_time, intern_min, 0));
-            t.hour = FIX2INT(rb_funcall(rb_time, intern_hour, 0));
-            t.day = FIX2INT(rb_funcall(rb_time, intern_day, 0));
-            t.month = FIX2INT(rb_funcall(rb_time, intern_month, 0));
-            t.year = FIX2INT(rb_funcall(rb_time, intern_year, 0));
-
-            *(dpi_timestamp_t*)(bind_buffers[i].buffer) = t;
-            rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_TIMESTAMP, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, sizeof(dpi_timestamp_t), NULL);
-          } else if (CLASS_OF(argv[i]) == cDate) {
-            dpi_date_t t;
-            VALUE rb_time = argv[i];
-
-            bind_buffers[i].buffer = xmalloc(sizeof(dpi_date_t));
-
-            memset(&t, 0, sizeof(dpi_date_t));
-            t.day = FIX2INT(rb_funcall(rb_time, intern_day, 0));
-            t.month = FIX2INT(rb_funcall(rb_time, intern_month, 0));
-            t.year = FIX2INT(rb_funcall(rb_time, intern_year, 0));
+          if (CLASS_OF(argv[i]) == rb_cTime || CLASS_OF(argv[i]) == cDateTime || CLASS_OF(argv[i]) == cDate) {
+            VALUE rb_val_as_string = rb_funcall(argv[i], intern_to_s, 0);
 
-            *(dpi_date_t*)(bind_buffers[i].buffer) = t;
-            rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_DATE, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, sizeof(dpi_date_t), NULL);
+            params_enc[i] = rb_val_as_string;
+            params_enc[i] = rb_str_export_to_enc(params_enc[i], conn_enc);
+            set_buffer_for_string(&bind_buffers[i], &length_buffers[i], params_enc[i]);
+            rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_NCHAR, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
           } else if (CLASS_OF(argv[i]) == cBigDecimal) {
             VALUE rb_val_as_string = rb_funcall(argv[i], intern_to_s, 0);
 
             params_enc[i] = rb_val_as_string;
             params_enc[i] = rb_str_export_to_enc(params_enc[i], conn_enc);
             set_buffer_for_string(&bind_buffers[i], &length_buffers[i], params_enc[i]);
-            rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_NCHAR, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, NULL);
+            rt = dpi_bind_param(stmt_wrapper->stmt, i + 1, DSQL_PARAM_INPUT, DSQL_C_NCHAR, stmt_wrapper->paramdesc[i].sql_type, stmt_wrapper->paramdesc[i].prec, stmt_wrapper->paramdesc[i].scale, bind_buffers[i].buffer, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
           }
           if(!DSQL_SUCCEEDED(rt))
-            rb_raise(cdmError, "failed to bind param %d", i);
+           rb_raise(cdmError, "failed to bind param %d , code = %d", i, rt, stmt_wrapper, stmt_wrapper->stmt, *(udint8*)stmt_wrapper->stmt);
           break;
       }
     }
@@ -595,7 +608,13 @@ static VALUE rb_dm_stmt_execute(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE rb_dm_stmt_last_id(VALUE self) {
   GET_STATEMENT(self);
-  return rb_str_new2(stmt_wrapper->lastrowid);
+  GET_CLIENT(stmt_wrapper->client);
+  rb_encoding *conn_enc;
+  VALUE obj = rb_str_new2(stmt_wrapper->lastrowid);
+
+  conn_enc = rb_to_encoding(wrapper->encoding);
+  rb_enc_associate(obj, conn_enc);
+  return obj;
 }
 
 /* call-seq:

data/ext/statement.h

@@ -26,6 +26,7 @@ typedef struct {
   udint2 col_num;
   ParamDesc *paramdesc;
   int is_prepare;
+  dm_client_wrapper *client_wrapper;
 } dm_stmt_wrapper;
 
 void init_dm_statement(void);

data/lib/dm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dm
-  VERSION = "1.0.4"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dmRuby
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - sunbiao
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-10 00:00:00.000000000 Z
+date: 2025-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -39,6 +39,7 @@ files:
 - "./README.md"
 - "./Rakefile"
 - "./dm.gemspec"
+- "./dmRuby-1.0.6.gem"
 - ext/client.c
 - ext/client.h
 - ext/dm_enc_name_to_ruby.h