transactd 3.8.2 → 3.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b392f1c4ee8d715502df819a612f65693af6a778
-  data.tar.gz: 73977ee53f8147cdb846460e0b365ce23cb488ce
+  metadata.gz: e4b6c5dc22a8971e20a36a67b3c853a11edcef5e
+  data.tar.gz: d31c166cf8a98fde371627bfd542fcbaf552b51e
 SHA512:
-  metadata.gz: 2227c267f17c2285fcd3d6652ec46127d1cf8231d18ecd51722cb6207ce0349f706e7a2d9cab5976cd7aa55b90c9a41f935ab91e47cc62a2694eac859590fbb7
-  data.tar.gz: 3bd07a60952ad9bd7d46f2fae96b697eafd4a9b33c5537e9061a1f2e4d1f2d474e172d8da0af43a9b17936371593f0d746e5fdb84194adeeb68b0fe41b48ae56
+  metadata.gz: 0712333e8b2abaea5a962c6ca9167bc2f823bb041b59b8c3be3dfabeb449da0eb6fc222f15f5b24da76672ff1651d842989dc02a5c7c34dc856ec8b095c57056
+  data.tar.gz: 4fd1aff262a10d652223e109b69600a2f69ded727081e24e2102c636e3726b74467277b0b800bfdf38973053f6df84cf462a5d5f2ebe7ccc568771776132aebc

data/build/tdclc/tdclc.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,8,2,259
- PRODUCTVERSION 3,8,2,259
+ FILEVERSION 3,8,3,271
+ PRODUCTVERSION 3,8,3,271
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C client"
-            VALUE "FileVersion", "3.8.2.259"
+            VALUE "FileVersion", "3.8.3.271"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.8.2.259"
+            VALUE "ProductVersion", "3.8.3.271"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,8,2,259
- PRODUCTVERSION 3,8,2,259
+ FILEVERSION 3,8,3,271
+ PRODUCTVERSION 3,8,3,271
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C++ client"
-            VALUE "FileVersion", "3.8.2.259"
+            VALUE "FileVersion", "3.8.3.271"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.8.2.259"
+            VALUE "ProductVersion", "3.8.3.271"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclrb/tdclrb.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,8,2,259
- PRODUCTVERSION 3,8,2,259
+ FILEVERSION 3,8,3,271
+ PRODUCTVERSION 3,8,3,271
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd Ruby client"
-            VALUE "FileVersion", "3.8.2.259"
+            VALUE "FileVersion", "3.8.3.271"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.8.2.259"
+            VALUE "ProductVersion", "3.8.3.271"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/source/bzs/db/engine/mysql/database.cpp

@@ -2429,6 +2429,7 @@ __int64 table::insert(bool ncc)
 
     {
         autoincSetup setup(m_table);
+        m_table->use_all_columns();
         setKeyNullFlags();
         if (!m_mysqlNull) setFieldNullFlags();
 		setTimeStamp(true /* insert */);
@@ -2436,11 +2437,8 @@ __int64 table::insert(bool ncc)
         m_stat = m_table->file->ha_write_row(m_table->record[0]);
         autoincValue = m_table->file->insert_id_for_cur_row;
 
-        if (m_stat == 0 && m_table->file->insert_id_for_cur_row)
-        {
-            if (!m_bulkInserting)
-                m_table->file->ha_release_auto_increment();
-        }
+        if (!m_bulkInserting)
+            m_table->file->ha_release_auto_increment();
     }
 
     if (m_stat == 0)

data/source/bzs/db/protocol/tdap/client/trdormapi.h

@@ -744,7 +744,7 @@ public:
         typename Container::iterator it = begin(mdls), itb = begin(mdls),
                                      ite = end(mdls);
         it = itb = begin(mdls);
-        T& mdlb = *(*it);
+        T* mdlb = (*it);
         if (!m_tb->isUseTransactd())
             nstable::throwError(_T("activeObject P.SQL can not use this"),
                                 (short_td)0);
@@ -753,15 +753,15 @@ public:
             // if mdl has same key value, to be once read access to server
             T& mdl = *(*it);
             if ((it == itb) || !sorted ||
-                (m_map.compKeyValue(mdl, mdlb, m_tb->keyNum()) == true) ||
-                (m_map.compKeyValue(mdlb, mdl, m_tb->keyNum()) == true))
+                (m_map.compKeyValue(mdl, *mdlb, m_tb->keyNum()) == true) ||
+                (m_map.compKeyValue(*mdlb, mdl, m_tb->keyNum()) == true))
             {
                 m_map.setKeyValues(mdl, fds, m_tb->keyNum());
                 keydef* kd = &m_tb->tableDef()->keyDefs[(int)m_tb->keyNum()];
                 for (int i = 0; i < kd->segmentCount; ++i)
                     q.addSeekKeyValue(fds[kd->segments[i].fieldNum].c_str());
             }
-            mdlb = mdl;
+            mdlb = &mdl;
             ++it;
         }
         m_tb->setQuery(&q);
@@ -778,8 +778,8 @@ public:
             T& mdl = *(*it);
             if ((it != itb) &&
                 (!sorted ||
-                 (m_map.compKeyValue(mdl, mdlb, m_tb->keyNum()) == true) ||
-                 (m_map.compKeyValue(mdlb, mdl, m_tb->keyNum()) == true)))
+                 (m_map.compKeyValue(mdl, *mdlb, m_tb->keyNum()) == true) ||
+                 (m_map.compKeyValue(*mdlb, mdl, m_tb->keyNum()) == true)))
             {
                 m_tb->findNext();
                 if ((m_tb->stat() != STATUS_SUCCESS) &&
@@ -796,7 +796,7 @@ public:
             }
             if (m_tb->stat() == 0)
                 m_map.readMap(mdl, fds, m_option);
-            mdlb = mdl;
+            mdlb = &mdl;
             ++it;
         }
     }
@@ -832,13 +832,13 @@ public:
         typename Container::iterator it = begin(mdls), itb = begin(mdls),
                                      ite = end(mdls);
         it = itb = begin(mdls);
-        T& mdlb = *(*it);
+        T* mdlb = (*it);
         while (it != ite)
         {
             T& mdl = *(*it);
             if ((it == itb) || !sorted ||
-                (m_map.compKeyValue(mdl, mdlb, m_tb->keyNum()) == true) ||
-                (m_map.compKeyValue(mdlb, mdl, m_tb->keyNum()) == true))
+                (m_map.compKeyValue(mdl, *mdlb, m_tb->keyNum()) == true) ||
+                (m_map.compKeyValue(*mdlb, mdl, m_tb->keyNum()) == true))
             {
                 m_map.setKeyValues(mdl, fds, m_tb->keyNum());
                 readIndex(m_tb, eSeekEqual);
@@ -856,7 +856,7 @@ public:
             }
             if (m_tb->stat() == 0)
                 m_map.readMap(mdl, fds, m_option);
-            mdlb = mdl;
+            mdlb = &mdl;
             ++it;
         }
     }

data/source/bzs/db/protocol/tdap/tdapcapi.h

@@ -670,7 +670,7 @@ struct handshale_t
  */
 #define C_INTERFACE_VER_MAJOR "3"//##1 Build marker! Don't remove
 #define C_INTERFACE_VER_MINOR "8"//##2 Build marker! Don't remove
-#define C_INTERFACE_VER_RELEASE "2"//##3 Build marker! Don't remove
+#define C_INTERFACE_VER_RELEASE "3"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
  The default extention of Mac is ".boudle", Therefore ".so" is popular. */
@@ -734,7 +734,7 @@ struct handshale_t
 
 #define CPP_INTERFACE_VER_MAJOR "3"//##4 Build marker! Don't remove
 #define CPP_INTERFACE_VER_MINOR "8"//##5 Build marker! Don't remove
-#define CPP_INTERFACE_VER_RELEASE "2"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "3"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
 #if (__BCPLUSPLUS__ || _MSC_VER)
@@ -771,6 +771,6 @@ struct handshale_t
 
 #define TRANSACTD_VER_MAJOR 3//##7 Build marker! Don't remove
 #define TRANSACTD_VER_MINOR 8//##8 Build marker! Don't remove
-#define TRANSACTD_VER_RELEASE 2//##9 Build marker! Don't remove
+#define TRANSACTD_VER_RELEASE 3//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

data/source/bzs/netsvc/client/tcpClient.h

@@ -38,6 +38,9 @@
 #endif
 #endif
 
+#ifdef _WIN32
+#define NO_CONNECT_TIMER
+#endif
 
 #include <stdio.h>
 #include <vector>
@@ -278,6 +281,7 @@ public:
 #define SYSTEM_CATEGORY system_category()
 #else
 #define SYSTEM_CATEGORY system_category
+#define native_handle() native()
 #endif
 
 inline int getErrorCode()
@@ -303,7 +307,7 @@ public:
         int n = 0;
         do
         {
-            int nn = recv(m_socket.native(), buf + n, (int)size - n, 0);
+            int nn = recv(m_socket.native_handle(), buf + n, (int)size - n, 0);
             if (n == SOCKET_ERROR)
             {
                 e = error_code(getErrorCode(), SYSTEM_CATEGORY);
@@ -318,7 +322,7 @@ public:
     size_t readAll(char* buf, size_t size, system::error_code& e)
     {
         errno = 0;
-        int n = recv(m_socket.native(), buf, (int)size, MSG_WAITALL);
+        int n = recv(m_socket.native_handle(), buf, (int)size, MSG_WAITALL);
         if (n == SOCKET_ERROR)
         {
 #ifdef _WIN32
@@ -335,7 +339,7 @@ public:
                                                 boost::system::error_code& e)
     {
         errno = 0;
-        int n = recv(m_socket.native(), buf, (int)size, 0);
+        int n = recv(m_socket.native_handle(), buf, (int)size, 0);
         if (n == SOCKET_ERROR)
             e = error_code(getErrorCode(), SYSTEM_CATEGORY);
         return (size_t)n;
@@ -344,7 +348,7 @@ public:
     void write(const char* buf, size_t size, int flag, boost::system::error_code& e)
     {
         errno = 0;
-        int n = send(m_socket.native(), buf, (int)size, flag);
+        int n = send(m_socket.native_handle(), buf, (int)size, flag);
         if (n == SOCKET_ERROR)
             e = error_code(getErrorCode(), SYSTEM_CATEGORY);
     }
@@ -368,10 +372,10 @@ public:
     {
     #ifndef _WIN32
         int val = 0;
-        ioctl(m_socket.native(), FIONBIO, &val);
+        ioctl(m_socket.native_handle(), FIONBIO, &val);
     #else
         u_long val = 0;
-        ioctlsocket(m_socket.native(), FIONBIO, &val);
+        ioctlsocket(m_socket.native_handle(), FIONBIO, &val);
     #endif
     }
 };
@@ -539,9 +543,9 @@ class tcpConnection : public connectionImple<asio::ip::tcp::socket>
         struct timeval timeout;
         timeout.tv_usec = 0;
         timeout.tv_sec = time;
-        int ret = setsockopt(m_socket.native(), SOL_SOCKET, SO_RCVTIMEO, (const char*)&timeout,
+        int ret = setsockopt(m_socket.native_handle(), SOL_SOCKET, SO_RCVTIMEO, (const char*)&timeout,
                    sizeof(timeout));
-        ret = setsockopt(m_socket.native(), SOL_SOCKET, SO_SNDTIMEO, (const char*)&timeout,
+        ret = setsockopt(m_socket.native_handle(), SOL_SOCKET, SO_SNDTIMEO, (const char*)&timeout,
                    sizeof(timeout));
     }
 #ifdef USE_CONNECT_TIMER
@@ -752,8 +756,6 @@ class pipeConnection : public connectionImple<platform_stream>
 
     void write(unsigned int writeSize)
     {
-        //m_datalen = 0;
-        //m_rows = 0;
         m_e.clear();
         BOOL ret = SetEvent(m_sendEvent);
         if (ret == FALSE)
@@ -768,7 +770,7 @@ class pipeConnection : public connectionImple<platform_stream>
         {
             t += 1000;
             DWORD n = 0;
-            BOOL ret = GetNamedPipeHandleState(m_socket.native(), NULL, &n,
+            BOOL ret = GetNamedPipeHandleState(m_socket.native_handle(), NULL, &n,
                                            NULL, NULL, NULL, 0);
             if(ret == FALSE || n < 2)
                 m_e = boost::system::error_code(CLIENT_ERROR_CONNECTION_FAILURE, get_system_category());
@@ -791,7 +793,7 @@ class pipeConnection : public connectionImple<platform_stream>
             if (m_writebuf_p)
                 memset(m_writebuf_p, 0, sizeof(unsigned int));
             DWORD n = 0;
-            BOOL ret = GetNamedPipeHandleState(m_socket.native(), NULL, &n,
+            BOOL ret = GetNamedPipeHandleState(m_socket.native_handle(), NULL, &n,
                                             NULL, NULL, NULL, 0);
             if(m_sendEvent && ret && n > 1)
             {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 3.8.2
+  version: 3.8.3
 platform: ruby
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies: []
 description: Transactd client for ruby gem
 email: transactd@bizstation.jp