dmRuby 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64aabe0fbddebacf24fc7a4822257d952dd44e6c28d231218077a4d8261e0b50
-  data.tar.gz: 0b5b3bc45b31795d01a59006703e3f6a9c6277730f7bb5eea859e7807ba9baf9
+  metadata.gz: 5ada106c9144f36bdc5521d71b7a652da56eca82a611bbc94faa8a0599839428
+  data.tar.gz: c45a94facc46e758429db8802c3e2e5dc3d19ba98c993b618b0a4643695b5084
 SHA512:
-  metadata.gz: 70e9160a4f618833a593439af92c0f1b8261389f91109472af994ac94e522093ed61e925961d39472e6f0d899edbd6127569bcf3198692351d8b1e11930b814a
-  data.tar.gz: 5426e757e3aa0380a67a493fd389ab624ffd082d9a58b5d9ce1f90db7d36419b660389835b2fbc2b7d00d2b007afd7f77abe672196bc566abf3bd787e1a6145b
+  metadata.gz: 3dee87a46e1e2e4965b0c16b5cd49989e0638a7b7bc972bf82b4032cef72195df7f8254b24df5b117a5fff5c2df23e8e953036299f926c29bb54b2e5db81e16b
+  data.tar.gz: c5bc2ffbcb47e0e51d3f3f30df2b9431ccf4aafd3d5b151217a0784eb24f8e5e45cb8ab168c04ea7eecb9395e74cc9f50052cdca41591f22de27e991043ae5ad

data/ChangeLogs.md

@@ -8,6 +8,20 @@
 
 ## Change Logs
 
+- dmRuby v1.0.7
+
+  1、修改merge语句影响行数错误的问题。
+
+- dmRuby v1.0.6
+
+  1、修改读取中文数据缺失的问题；
+
+  2、修改插入带时区的时间数据没有转换时区的问题；
+
+  3、修改插入空数据的问题；
+
+  4、修改读取空串的问题；
+
 - dmRuby v1.0.5
 
   1、修改读取bit类型结果错误的问题；

data/ext/client.c

@@ -342,7 +342,7 @@ static void *nogvl_send_query(void *ptr) {
   if(nStmtType == DSQL_DIAG_FUNC_CODE_INSERT ||
      nStmtType == DSQL_DIAG_FUNC_CODE_UPDATE ||
      nStmtType == DSQL_DIAG_FUNC_CODE_DELETE ||
-     nStmtType == DSQL_DIAG_FUNC_CODE_CALL)
+     nStmtType == DSQL_DIAG_FUNC_CODE_MERGE)
   {
     rt = dpi_row_count(hstmt,&args->wrapper->affected_rows);
   }

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]);
       }                  
     }
   }
@@ -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;
 

data/ext/statement.c

@@ -34,6 +34,7 @@ static size_t rb_dm_stmt_memsize(const void * ptr) {
   if (w->client_wrapper) {
     memsize += sizeof(*w->client_wrapper);
   }
+  return memsize;
 }
 
 #ifdef HAVE_RB_GC_MARK_MOVABLE
@@ -323,7 +324,7 @@ static void *nogvl_stmt_execute(void *ptr) {
     if(nStmtType == DSQL_DIAG_FUNC_CODE_INSERT ||
      nStmtType == DSQL_DIAG_FUNC_CODE_UPDATE ||
      nStmtType == DSQL_DIAG_FUNC_CODE_DELETE ||
-     nStmtType == DSQL_DIAG_FUNC_CODE_CALL)
+     nStmtType == DSQL_DIAG_FUNC_CODE_MERGE)
   {
     rt = dpi_row_count(stmt_wrapper->stmt,&stmt_wrapper->affected_rows);
      if (!DSQL_SUCCEEDED(rt)) {
@@ -427,6 +428,7 @@ static VALUE rb_dm_stmt_execute(int argc, VALUE *argv, VALUE self) {
   rb_encoding *conn_enc;
   DPIRETURN rt;
   rb_encoding *enc;
+  slength indicator;
 
   GET_STATEMENT(self);
   GET_CLIENT(stmt_wrapper->client);
@@ -461,10 +463,8 @@ 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);
-          bind_buffers[i].buffer_length = 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, bind_buffers[i].buffer_length, 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 , code = %d", i, rt, stmt_wrapper, stmt_wrapper->stmt, *(udint8*)stmt_wrapper->stmt);
           break;
@@ -548,44 +548,13 @@ static VALUE rb_dm_stmt_execute(int argc, VALUE *argv, VALUE self) {
           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;
-            }
+          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);
 
-            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;
-            bind_buffers[i].buffer_length = sizeof(dpi_timestamp_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, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
-          } 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));
-
-            *(dpi_date_t*)(bind_buffers[i].buffer) = t;
-            bind_buffers[i].buffer_length = sizeof(dpi_date_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, bind_buffers[i].buffer_length, &(bind_buffers[i].buffer_length));
+            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);
 

data/lib/dm/version.rb

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

metadata

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