transactd 3.5.0 → 3.6.0

data/source/global/tdclatl/RecordsetQuery.cpp

@@ -138,9 +138,10 @@ STDMETHODIMP CSortField::put_Asc(VARIANT_BOOL Value)
 }
 
 //------------------------------------------------------------------------
-STDMETHODIMP CSortFields::Add(BSTR Name, VARIANT_BOOL Asc)
+STDMETHODIMP CSortFields::Add(BSTR Name, VARIANT_BOOL Asc, ISortFields** retVal)
 {
     m_sortFields.add(Name, (Asc == -1));
+    this->QueryInterface(IID_ISortFields, (void**)retVal);
     return S_OK;
 }
 

data/source/global/tdclatl/RecordsetQuery.h

@@ -128,7 +128,7 @@ public:
     void FinalRelease() {}
 
 public:
-    STDMETHOD(Add)(BSTR Name, VARIANT_BOOL Asc);
+    STDMETHOD(Add)(BSTR Name, VARIANT_BOOL Asc, ISortFields** retVal);
     STDMETHOD(get_Size)(int* Value);
     STDMETHOD(get_Item)(int Index, ISortField** retVal);
     STDMETHOD(Clear)();

data/source/global/tdclatl/Table.cpp

@@ -865,6 +865,23 @@ STDMETHODIMP CTableTd::GetCreateSql(BSTR* retVal)
     return S_OK;
 }
 
+STDMETHODIMP CTableTd::get_UpdateConflictCheck(VARIANT_BOOL* Value)
+{
+    *Value = m_tb->updateConflictCheck();
+    return S_OK;
+}
+
+STDMETHODIMP CTableTd::SetUpdateConflictCheck(VARIANT_BOOL Value, VARIANT_BOOL* retVal)
+{
+    *retVal = m_tb->setUpdateConflictCheck(Value);
+    return S_OK;
+}
+STDMETHODIMP CTableTd::SetAlias(BSTR orign,  BSTR alias)
+{
+    m_tb->setAlias(orign, alias);
+    return S_OK;
+}
+
 void __stdcall onRecordCount(bzs::db::protocol::tdap::client::table* tb,
                           int count, bool& cancel)
 {

data/source/global/tdclatl/Table.h

@@ -175,5 +175,7 @@ public:
     STDMETHOD(SetTimestampMode)(eTimeStampMode mode);
     STDMETHOD(GetFVbits)(VARIANT Index, IBitset** Value);
     STDMETHOD(GetCreateSql)( BSTR* retVal);
-
+    STDMETHOD(get_UpdateConflictCheck)(VARIANT_BOOL* retVal);
+    STDMETHOD(SetUpdateConflictCheck)(VARIANT_BOOL Value, VARIANT_BOOL* retVal);
+    STDMETHOD(SetAlias)(BSTR orign,  BSTR alias);
 };

data/source/global/tdclatl/tdclatl.idl

@@ -846,7 +846,12 @@ interface ITable : IDispatch
   HRESULT _stdcall GetFVbits([in] VARIANT Index, [out, retval] IBitset** Value);
   [id(0x000000EF)]
   HRESULT _stdcall GetCreateSql([out, retval] BSTR* retVal);
-
+  [propget, id(0x00000100)]
+  HRESULT _stdcall UpdateConflictCheck([out, retval] VARIANT_BOOL* retVal);
+  [id(0x00000101)]
+  HRESULT _stdcall SetUpdateConflictCheck([in] VARIANT_BOOL value,[out, retval] VARIANT_BOOL* retVal);
+  [id(0x00000102)]
+  HRESULT _stdcall SetAlias([in] BSTR orign,[in]  BSTR alias);
 };
 [
 	object,
@@ -1597,7 +1602,7 @@ interface ISortField : IDispatch
 interface ISortFields : IDispatch
 {
   [id(1)]
-  HRESULT _stdcall Add([in] BSTR Name, [in] VARIANT_BOOL asc);
+  HRESULT _stdcall Add([in] BSTR Name, [in] VARIANT_BOOL asc, [out, retval]ISortFields** retVal);
   [propget, id(2)]
   HRESULT _stdcall Size([out, retval] int* Value);
   [propget, id(0)]

data/transactd.gemspec

@@ -25,7 +25,7 @@ spec_build = Gem::Specification.new do |s|
   s.author      = 'BizStation Corp.'
   s.email       = 'transactd@bizstation.jp'
   s.homepage    = 'http://www.bizstation.jp/ja/transactd'
-  s.license     = 'GPL v2'
+  s.license     = 'GPL-2.0'
   
   # read version from tdclrb.rc
   verfile = 'build/tdclrb/tdclrb.rc'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies: []
 description: Transactd client for ruby gem
 email: transactd@bizstation.jp
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - CMakeLists.txt
 - build/tdclrb/bldgem/extconf.rb
-- bin/common/tdclc_32_3_5.dll
-- bin/common/tdclc_64_3_5.dll
+- bin/common/tdclc_32_3_6.dll
+- bin/common/tdclc_64_3_6.dll
 - source/bzs/db/blobBuffer.h
 - source/bzs/db/blobStructs.h
 - source/bzs/db/engine/mysql/bookmark.h
@@ -203,8 +203,10 @@ files:
 - source/bzs/test/tdclrb/prepare.rb
 - source/bzs/test/tdclrb/transactd_blob_spec.rb
 - source/bzs/test/tdclrb/transactd_datetime_spec.rb
+- source/bzs/test/tdclrb/transactd_fetch_spec.rb
 - source/bzs/test/tdclrb/transactd_kanjischema_spec.rb
 - source/bzs/test/tdclrb/transactd_pool_spec.rb
+- source/bzs/test/tdclrb/transactd_setget_spec.rb
 - source/bzs/test/tdclrb/transactd_spec.rb
 - source/bzs/test/tdclrb/transactd_v3_spec.rb
 - source/bzs/test/transactdBench/query_bench.cpp
@@ -355,7 +357,7 @@ files:
 - ./transactd.gemspec
 homepage: http://www.bizstation.jp/ja/transactd
 licenses:
-- GPL v2
+- GPL-2.0
 metadata: {}
 post_install_message: |-
   --------------------------------------------------