transactd 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d116ab5360eb7789d41862e6fabc2be44a3ec7d3
-  data.tar.gz: 6a9e18f0c31602788a5ef8e7abd7ef8a13b5416a
+  metadata.gz: e02c507a10f36f6c37d43e624c1bafc4416e6b67
+  data.tar.gz: 337df3d8b1c58be04d5ee5f01ba317e08963fdd8
 SHA512:
-  metadata.gz: ae1c90babbdc2f3508044321fcdb3f789767da7dba9a8c7c2e041d2d2eeba385e79abcc4e9e1b1eef49ae7b515b47d022cb0d40558ff127e6ef9d613e46c3643
-  data.tar.gz: 874d4e215d760534e4bda9804fc6bbd9f767b7eafb8a4aa3c6407e28cf763a8791bfad1fc1cc64ee02c47f9a16f19799eee560b0c713d7322eb9f55bb488f519
+  metadata.gz: 4537e3aae536a5f3b5b15109614f488280ec1d1cf589f717f7de285d802320166c18f366e21d32e4cb6ac70f388cf11d27593dc6ee3058187a54c7b0e3b70237
+  data.tar.gz: 266b14eacd03941c7d270bf6659abde9fef56aea0a1c3fa31931e2c9443c22079c0d1e6924a2b078c1464d73801a5a791eea0f051ebd487a73e81b59d81a929e

data/build/tdclc/tdclc.rc

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

data/build/tdclcpp/tdclcpp.rc

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

data/build/tdclrb/tdclrb.rc

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

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

@@ -237,6 +237,7 @@ struct recordsetQueryImple
         judgeFunc isMatchFunc;
         comp1Func compFunc;
         short index;
+        short cmpIndex;        // For CMPLOGICAL_FIELD only
         uchar_td compType;
         char combine;
         struct
@@ -313,8 +314,9 @@ void recordsetQuery::init(const fielddefs* fdinfo)
     {
         recordsetQueryImple::compItem itm;
         itm.index = fdinfo->indexByName(tokns[i].c_str());
-        if (itm.index >= 0)
-            itm.nullable = (*fdinfo)[itm.index].isNullable();
+        if (itm.index == -1)
+            THROW_BZS_ERROR_WITH_MSG(_T("recordsetQuery:Invalid field name ") + tokns[i]);
+        itm.nullable = (*fdinfo)[itm.index].isNullable();
         m_imple->compItems.push_back(itm);
         m_imple->compFields.push_back(&((*fdinfo)[itm.index]));
     }
@@ -328,13 +330,27 @@ void recordsetQuery::init(const fielddefs* fdinfo)
     {
         recordsetQueryImple::compItem& itm = m_imple->compItems[index];
         field fd = (*m_imple->row)[index];
-        fd = tokns[i + 2].c_str();
+
+        std::_tstring value = tokns[i + 2];
+        bool compField = (value.size() && (value[0] == _T('[')));
+        if (compField)
+        {
+            value.erase(value.begin());
+            value.erase(value.end() - 1);
+            itm.cmpIndex = fdinfo->indexByName(value);
+            if (itm.cmpIndex == -1)
+                THROW_BZS_ERROR_WITH_MSG(_T("recordsetQuery:Invalid field name ") + value);
+        }
+        else
+            fd = value.c_str();
         bool part = fd.isCompPartAndMakeValue();
         itm.compType = getFilterLogicTypeCode(tokns[i + 1].c_str());
-        eCompType log = (eCompType)(itm.compType & 0xf);
-        itm.nulllog = ((log == eIsNull) || (log == eIsNotNull));
+        if (compField)
+            itm.compType |= CMPLOGICAL_FIELD;
         if (!part)
             itm.compType |= CMPLOGICAL_VAR_COMP_ALL;
+        eCompType log = (eCompType)(itm.compType & 0xf);
+        itm.nulllog = ((log == eIsNull) || (log == eIsNotNull));
         fielddef& fdd = const_cast<fielddef&>(m_imple->compFields[index]);
         fdd.len = m_imple->compFields[index].compDataLen((const uchar_td*)fd.ptr(), part);
         uchar_td type = fdd.type; 
@@ -376,8 +392,12 @@ bool recordsetQuery::match(const row_ptr row) const
         if (nullJudge < 2)
             ret = (nullJudge == 0) ? true : false;
         else
-            ret = itm.isMatchFunc(itm.compFunc((const char*)f.ptr(), (const char*)((*m_imple->row)[i].ptr()), (*m_imple->row)[i].len()));
-
+        {
+            if (itm.compType & CMPLOGICAL_FIELD)
+                ret = itm.isMatchFunc(itm.compFunc((const char*)f.ptr(), (const char*)(*row)[itm.cmpIndex].ptr(), f.len()));
+            else
+                ret = itm.isMatchFunc(itm.compFunc((const char*)f.ptr(), (const char*)((*m_imple->row)[i].ptr()), (*m_imple->row)[i].len()));
+        }
         if (isEndComp(itm.combine, ret)) return ret;
     }
     assert(0);

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

@@ -150,7 +150,7 @@ public:
     virtual void dropTable(const _TCHAR* uri);
     void rename(const _TCHAR* oldUri, const _TCHAR* newUri);
     void swapTablename(const _TCHAR* uri1, const _TCHAR* uri2);
-    void beginTrn(short bias = SINGLELOCK_READ_COMMITED +
+    void beginTrn(short bias = SINGLELOCK_NOGAP +
                                NOWAIT_WRITE); // NoWit SingleLock
     void endTrn();
     void abortTrn();

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

@@ -527,8 +527,8 @@ public:
 
     inline iterator erase(const iterator& it) 
     { 
-        m_recordset[it - m_recordset.begin()]->release();
-        return m_recordset.erase(it); 
+        (*it)->release();
+        return m_recordset.erase(it);
     }
 
     inline void push_back(row_ptr r)

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 "6"//##2 Build marker! Don't remove
-#define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
+#define C_INTERFACE_VER_RELEASE "1"//##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 "6"//##5 Build marker! Don't remove
-#define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "1"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
 #if (__BCPLUSPLUS__ || _MSC_VER)

data/source/bzs/test/trdclengn/test_tdclcpp_v3.cpp

@@ -728,7 +728,7 @@ void testTimestamp(database* db)
             
             BOOST_CHECK_MESSAGE(fds[_T("fd10")].isNull() == true, "Timestamp2 not null" );
 
-            Sleep(1);
+            Sleep(10);
             tb->update();
             BOOST_CHECK_MESSAGE(tb->stat() == 0, "testTimestamp update stat = " << tb->stat());
             tb->seek();

data/source/bzs/test/trdclengn/test_trdclengn.cpp

@@ -5251,7 +5251,7 @@ void testBinaryFieldSchame()
     tbid = db->dbDef()->tableNumByName(_T("groups"));
     BOOST_CHECK(tbid > 0);
     fd =  &db->dbDef()->tableDefs(tbid)->fieldDefs[1];
-    BOOST_CHECK(fd->charsetIndex() == CHARSET_BIN);
+    BOOST_CHECK_MESSAGE(fd->charsetIndex() == CHARSET_BIN, "bad = " << fd->charsetIndex());
     db->close(true /* withDropDefaultSchema */);
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies: []
 description: Transactd client for ruby gem
 email: transactd@bizstation.jp