transactd 3.8.0 → 3.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0a57f053d27928a7d9c43c519b041409148e84a
-  data.tar.gz: 3c5ab3051ac77819d4c49b29f99f1f7111bebc90
+  metadata.gz: b392f1c4ee8d715502df819a612f65693af6a778
+  data.tar.gz: 73977ee53f8147cdb846460e0b365ce23cb488ce
 SHA512:
-  metadata.gz: 09912b2aa99f706ee680e34793e4a3760a30544e40f09af573bd3dc832669149d2210d229b453b97a82ec4763602c39cf24e151981c9a9e4d694b3b3e8bed7c7
-  data.tar.gz: 31fb981b7c2dcbcf3433d0e318fe36680848a9c37c84e24404fb1298ad73ed65720c9727db444ee4daee4ddc14233ff82dc580fa713edbbd67e7fb73fd43a508
+  metadata.gz: 2227c267f17c2285fcd3d6652ec46127d1cf8231d18ecd51722cb6207ce0349f706e7a2d9cab5976cd7aa55b90c9a41f935ab91e47cc62a2694eac859590fbb7
+  data.tar.gz: 3bd07a60952ad9bd7d46f2fae96b697eafd4a9b33c5537e9061a1f2e4d1f2d474e172d8da0af43a9b17936371593f0d746e5fdb84194adeeb68b0fe41b48ae56

data/build/tdclc/tdclc.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,8,0,256
- PRODUCTVERSION 3,8,0,256
+ FILEVERSION 3,8,2,259
+ PRODUCTVERSION 3,8,2,259
  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.0.256"
+            VALUE "FileVersion", "3.8.2.259"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.8.0.256"
+            VALUE "ProductVersion", "3.8.2.259"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,8,0,256
- PRODUCTVERSION 3,8,0,256
+ FILEVERSION 3,8,2,259
+ PRODUCTVERSION 3,8,2,259
  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.0.256"
+            VALUE "FileVersion", "3.8.2.259"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.8.0.256"
+            VALUE "ProductVersion", "3.8.2.259"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclrb/tdclrb.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,8,0,256
- PRODUCTVERSION 3,8,0,256
+ FILEVERSION 3,8,2,259
+ PRODUCTVERSION 3,8,2,259
  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.0.256"
+            VALUE "FileVersion", "3.8.2.259"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.8.0.256"
+            VALUE "ProductVersion", "3.8.2.259"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

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

@@ -1513,10 +1513,7 @@ void table::setRecordFromPacked(const uchar* packedPtr, uint size,
             if (fd->null_bit && nullable)
             {
                 isNull = (*null_ptr & null_bit) != 0;
-                if (isNull)
-                    fd->set_null();
-                else
-                    fd->set_notnull();
+                
                 if (null_bit == (uchar)128)
                 {
                     ++null_ptr;
@@ -1531,6 +1528,7 @@ void table::setRecordFromPacked(const uchar* packedPtr, uint size,
             {
                 if (!isNull)
                 {
+                    fd->set_notnull();
                     int len = fd->pack_length();
                     if (isVarType(fd->type()))
                     {
@@ -1545,8 +1543,12 @@ void table::setRecordFromPacked(const uchar* packedPtr, uint size,
                     memcpy(fd->ptr, p, len);
                     p += len;
                     size -= len;
-                }else
+                }
+                else
+                {
+                    fd->set_null();
                     memset(fd->ptr, 0, fd->pack_length());
+                }
             }
         }
         if (m_table->s->blob_fields)

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

@@ -309,7 +309,7 @@ class prepareHandler
     #define MAX_KEY_SEGMENT 8
     void makeKeyFieldBitmap(std::bitset<256>& bts, char keynum)
     {
-        if (keynum >= 0)
+        if (keynum >= 0 && keynum < (int)m_table->s->keys)
         {
             const KEY* key = &m_table->key_info[(int)keynum];
             if (key)
@@ -328,7 +328,7 @@ class prepareHandler
 
     void makeKeyFieldBitmap(int keynum)
     {
-        if (keynum >= 0)
+        if (keynum >= 0 && keynum < (int)m_table->s->keys)
         {
             const KEY* key = &m_table->key_info[(int)keynum];
             if (key)

data/source/bzs/db/protocol/tdap/client/database.cpp

@@ -1239,6 +1239,8 @@ inline int moveVaileRecord(table* src)
 #define MOVE_TYPE_KEY    0
 #define MOVE_TYPE_NONKEY -1
 #define MOVE_TYPE_MULTI  -2
+#define MOVE_TYPE_MULTI_FIRST_READED  -3
+
 
 inline void moveNextRecord(table* src, short keyNum)
 {
@@ -1253,7 +1255,7 @@ inline void moveNextRecord(table* src, short keyNum)
 inline char_td findUniqueKeynum(table* src)
 {
     const tabledef* td =  src->tableDef();
-    if (td->parentKeyNum != 0xff) return td->parentKeyNum;
+    if (td->primaryKeyNum != 0xff) return td->primaryKeyNum;
     for (int i=0;i<td->keyCount;++i)
     {
         const keydef* kd = &td->keyDefs[i];
@@ -1272,6 +1274,8 @@ inline void moveFirstRecord(table* src, short keyNum)
     }
     else if (keyNum == MOVE_TYPE_NONKEY)
         src->stepFirst();
+    else if (keyNum == MOVE_TYPE_MULTI_FIRST_READED)
+        ;
     else
     {
         query q;

data/source/bzs/db/protocol/tdap/client/sqlBuilder.cpp

@@ -729,7 +729,7 @@ std::string sqlBuilder::sqlCreateTable(const char* fileName, fileSpec* fs,
                            uchar_td charsetIndexServer, const clsrv_ver* ver)
 {
     tabledef table;
-    memset(&table, 0, sizeof(tabledef));
+    table.cleanup();
     table.setFileNameA(fileName);
     table.charsetIndex = mysql::charsetIndex(GetACP());
     table.schemaCodePage = CP_UTF8;

data/source/bzs/db/protocol/tdap/mysql/recordsetReader.h

@@ -265,6 +265,12 @@ struct extRequestSeeks
 #pragma pack(pop)
 pragma_pop;
 
+
+#define JUDGE_TYPE_NONE     0
+#define JUDGE_TYPE_GT_OR_LE 1
+#define JUDGE_TYPE_EQUAL    2
+
+
 class fields;
 class fieldAdapter
 {
@@ -295,7 +301,7 @@ public:
     void reset()
     {
         m_keySeg = 0xff;
-        m_judgeType = 0;
+        m_judgeType = JUDGE_TYPE_NONE;
         m_sizeBytes = 0;
         m_judge = false;
         m_matched = false;
@@ -349,7 +355,7 @@ public:
         m_compFunc = fd->getCompFunc(m_sizeBytes);
         if (fd->opr == 2)
         {
-            m_judgeType = 0;
+            m_judgeType = JUDGE_TYPE_NONE;
             return 0;
         }
         if (key)
@@ -373,7 +379,7 @@ public:
                     if (valid && (is_cl_casein == is_srv_casein))
                     {
                         m_keySeg = (unsigned char)segmentIndex + 1;
-                        m_judgeType = (comp == eEqual) ? 2 : 1;
+                        m_judgeType = (comp == eEqual) ? JUDGE_TYPE_EQUAL : JUDGE_TYPE_GT_OR_LE;
                     }
                     break;
                 }
@@ -504,12 +510,15 @@ public:
             std::vector<fieldAdapter>::iterator cur = m_fields.begin();
             std::vector<fieldAdapter>::iterator end = begin + lastIndex;
             char tmpOpr = (lastIndex != req.logicalCount) ? end->m_fd->opr : 0;
+
+            // Sort conditions by current Keysegments order.
             std::sort(begin, end);
+            
             bool flag = true;
             while (cur != end)
             {
                 const_cast<logicalField*>(cur->m_fd)->opr = 1; // and
-                if (flag && cur->m_judgeType == 2)
+                if (flag && cur->m_judgeType == JUDGE_TYPE_EQUAL && 1 == cur->m_keySeg)
                     cur->m_judge = true;
                 else
                     flag = false;
@@ -517,7 +526,7 @@ public:
             }
 
             // if first logic is first segmnet then first logic can judge.
-            if ((begin->m_keySeg == 1) && begin->m_judgeType)
+            if (begin != end && begin->m_keySeg == 1 && begin->m_judgeType)
                 begin->m_judge = true;
 
             if (lastIndex == req.logicalCount)

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 "0"//##3 Build marker! Don't remove
+#define C_INTERFACE_VER_RELEASE "2"//##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 "0"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "2"//##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 0//##9 Build marker! Don't remove
+#define TRANSACTD_VER_RELEASE 2//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

data/source/bzs/test/trdclengn/testField.h

@@ -3071,7 +3071,7 @@ void testCompTimeStampMa()
             comp1Func compFunc = getCompFunc(ft_mytimestamp, len, eEqual, 0);
             maTimeStamp ld(4, true), rd(4, true);
             ld = _T("1970-01-02 00:00:59.0000"); rd = _T("1970-01-02 00:00:59.0001"); l = ld.getValue(); r = rd.getValue();
-            BOOST_CHECK(compFunc((const char*)&l, (const char*)&r, len) == -1);
+            BOOST_CHECK(compFunc((const char*)&l, (const char*)&r, len) < 0);
             ld = _T("1970-01-02 00:00:59.0001"); rd = _T("1970-01-02 00:00:59.0001"); l = ld.getValue(); r = rd.getValue();
             BOOST_CHECK(compFunc((const char*)&l, (const char*)&r, len) == 0);
             ld = _T("1970-01-02 00:00:59.0001"); rd = _T("1970-01-02 00:00:59.0000"); l = ld.getValue(); r = rd.getValue();
@@ -3083,7 +3083,7 @@ void testCompTimeStampMa()
             comp1Func compFunc = getCompFunc(ft_mytimestamp, len, eEqual, 0);
             maTimeStamp ld(5, true), rd(5, true);
             ld = _T("1970-01-02 00:00:59.00001"); rd = _T("1970-01-02 00:00:59.00002"); l = ld.getValue(); r = rd.getValue();
-            BOOST_CHECK(compFunc((const char*)&l, (const char*)&r, len) == -1);
+            BOOST_CHECK(compFunc((const char*)&l, (const char*)&r, len) < 0);
             ld = _T("1970-01-02 00:00:59.00001"); rd = _T("1970-01-02 00:00:59.00001"); l = ld.getValue(); r = rd.getValue();
             BOOST_CHECK(compFunc((const char*)&l, (const char*)&r, len) == 0);
             ld = _T("1970-01-02 00:00:59.00001"); rd = _T("1970-01-02 00:00:59.00000"); l = ld.getValue(); r = rd.getValue();
@@ -3094,7 +3094,7 @@ void testCompTimeStampMa()
             comp1Func compFunc = getCompFunc(ft_mytimestamp, len, eEqual, 0);
             maTimeStamp ld(6, true), rd(6, true);
             ld = _T("1970-01-02 01:00:59.999999"); rd = _T("1970-01-02 10:00:59.100001"); l = ld.getValue(); r = rd.getValue();
-            BOOST_CHECK(compFunc((const char*)&l, (const char*)&r, len) == -1);
+            BOOST_CHECK(compFunc((const char*)&l, (const char*)&r, len) < 0);
             ld = _T("1970-01-02 00:00:59.000001"); rd = _T("1970-01-02 00:00:59.000001"); l = ld.getValue(); r = rd.getValue();
             BOOST_CHECK(compFunc((const char*)&l, (const char*)&r, len) == 0);
             ld = _T("1970-01-02 10:00:59.000000"); rd = _T("1970-01-02 10:00:58.999999"); l = ld.getValue(); r = rd.getValue();

metadata

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