transactd 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46fc9de1020d6d9f990eac69007e77edca2df1c4
-  data.tar.gz: 1fc5411c8a09fedc5e6112f93194ec306239b69a
+  metadata.gz: c8afedc283ad3c5f90748c790cd742ab52fcf8cd
+  data.tar.gz: bf3cf1c4865812cb1aa88603bdef95f31ae1fbb6
 SHA512:
-  metadata.gz: 672aef0e761f78f4798070a06333b1c006b85dc3fdbf52aa53f2b90e8304af2c344af33cf315f7b9c28b3d29604ee81238843ef409d8d4ed627afe3dd913c54f
-  data.tar.gz: d653ef73ceb34fac5eebfc31acf5df50854e40890f027beb49a8145c5b176a00e5d8526ec48c07e6b091a586c769d412c98d5019dc76f3be99f82056673ef873
+  metadata.gz: faf1c446f6febad403c6602989c6a07f43232acf76e17855d4591fdddbe32e7604adfdc57df1a47876ea8228f3e3e6c9c188b8a8e677e55799a59f40e5ddbd6b
+  data.tar.gz: abc729f2184f26d922ce70a5ba7f72d882c0f507b50c1d7a47aa32564c18e630975098eae6df08aa701eb6820069cb382df4018307a865b0ebdc41a0c104b816

data/build/tdclc/tdclc.rc

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

data/build/tdclcpp/tdclcpp.rc

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

data/build/tdclrb/tdclrb.rc

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

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

@@ -323,10 +323,8 @@ const connMgr::records& connMgr::inUseTables(__int64 connid, int dbid)
 
 void connMgr::postDisconnectOne(__int64 connid)
 {
-    allocBuffer();
     m_keynum = TD_STSTCS_DISCONNECT_ONE;
-    record& rec = m_records[0];
-    rec.conId = connid;
+    m_params[0] = connid;
     tdap(TD_STASTISTICS);
 }
 

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

@@ -987,21 +987,14 @@ _TCHAR* nstable::getDirURI(const _TCHAR* path, _TCHAR* buf)
     else
 #endif
     stripAuth(path, buf, MAX_PATH);
-    _TUCHAR* p = _tcsmrchr((_TUCHAR*)buf, PSEPARATOR_C);
-    _TUCHAR* p1 = _tcsmrchr((_TUCHAR*)buf, '?');
-    if (p1 && (p1 > p)) p = p1;
-    _TUCHAR* p2 = _tcsmrchr((_TUCHAR*)buf, '=');
-    if (p && p2)
-    {
-        if (p2 > p)
-            p = NULL;
-        else
-            p2 = NULL;
-    }
-    if (p && (uri == false))
+    _TUCHAR* p = _tcsmrchr((_TUCHAR*)buf, '=');
+    if (p)
+        *(p+1) = 0x00;
+    else if (p = _tcsmrchr((_TUCHAR*)buf, '?'))
+        *p = 0x00;
+    else if ((p = _tcsmrchr((_TUCHAR*)buf, PSEPARATOR_C)) && (uri == false))
         *p = 0x00;
-    if (p2)
-        *(p2 + 1) = 0x00;
+
     if (uri && !_tcsstr(buf, _T("dbfile=")))
     {
         p = _tcsmrchr((_TUCHAR*)buf, '?');

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

@@ -678,7 +678,7 @@ struct handshale_t
 
 #define CPP_INTERFACE_VER_MAJOR "3"//##4 Build marker! Don't remove
 #define CPP_INTERFACE_VER_MINOR "2"//##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_trdclengn.cpp

@@ -5223,6 +5223,27 @@ void testBinaryField()
     }
 }
 
+void testGetDirUri()
+{
+    _TCHAR retbuf[MAX_PATH];
+    nstable::getDirURI(_T("tdap://localhost/db?dbfile=test.bdf"), retbuf);
+    BOOST_CHECK(_tcscmp(_T("tdap://localhost/db?dbfile="), retbuf) == 0);
+    nstable::getDirURI(_T("tdap://root@localhost/db?dbfile=test.bdf&pwd=1234"), retbuf);
+    BOOST_CHECK(_tcscmp(_T("tdap://localhost/db?dbfile="), retbuf) == 0);
+    nstable::getDirURI(_T("tdap://localhost/db"), retbuf);
+    BOOST_CHECK(_tcscmp(_T("tdap://localhost/db?dbfile="), retbuf) == 0);
+    nstable::getDirURI(_T("tdap://root@localhost/db"), retbuf);
+    BOOST_CHECK(_tcscmp(_T("tdap://localhost/db?dbfile="), retbuf) == 0);
+    nstable::getDirURI(_T("tdap://root@localhost/"), retbuf);
+    BOOST_CHECK(_tcscmp(_T("tdap://localhost/?dbfile="), retbuf) == 0);
+    nstable::getDirURI(_T("btrv://root@localhost/db"), retbuf);
+    BOOST_CHECK(_tcscmp(_T("btrv://localhost/db?dbfile="), retbuf) == 0);
+#ifdef _WIN32
+    nstable::getDirURI(_T("c:\\temp\\abc\\abc.def"), retbuf);
+    BOOST_CHECK(_tcscmp(_T("c:\\temp\\abc"), retbuf) == 0);
+#endif
+}
+
 
 // ------------------------------------------------------------------------
 BOOST_AUTO_TEST_SUITE(btrv_nativ)
@@ -5629,6 +5650,14 @@ BOOST_AUTO_TEST_CASE(binary)
 {
     testBinaryField();    
 }
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(static_function)
+
+BOOST_AUTO_TEST_CASE(getDirUri)
+{
+    testGetDirUri();
+}
 
 BOOST_AUTO_TEST_CASE(fuga)
 {

metadata

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