transactd 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4c8711529ab9ee495a077fe32f3d67bb3d98c43
-  data.tar.gz: c84ee8144ec9ddc98bd057f74ff8625947397abe
+  metadata.gz: 66e98201915050eedaa0ae874f15180ea86cecbc
+  data.tar.gz: e916f4dfa349ca4b38cac35b4f753130a28dcb52
 SHA512:
-  metadata.gz: 9559e3a7e9a4e7edee6baf0b1cd45af6b5fac5d36e9882529f75894ab1bb9bf4ae4038cf072879f140a3ca288a5e15776c00ab1b5edb353af47d0e8ac886e0a1
-  data.tar.gz: 9d32c7763a743a036cefb26731d1f207b809d19692c17b0bcedd78aee238eca4c9895b36116ee74ef61041d954b6b1a223cd37d5652a185d6738237091209bd3
+  metadata.gz: 295ccc792e04520ee372a6cc0f363eb5cd15179d30272d32de727856468f66f713b178847aab0c341d463861f552a29cfc51a64bba7f9430de1449679c43b4a1
+  data.tar.gz: e933424f24905e6bba017269cd3680656b2b5e0167b7d3f1a994f9089f3948e46441b42d1f75cac8fef90ff38d2784d36f2e0a7483de1485756ebc95652e3fb4

data/build/common/options.cmake

@@ -67,7 +67,9 @@ endif()
 if(NOT COMMAND bz_force_gcc)
 macro(bz_force_gcc)
   if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-    set(CMAKE_CXX_COMPILER "$ENV{CC}")
+    if(NOT "${CMAKE_CXX_COMPILER}" MATCHES "[Cc][Ll][Aa][Nn][Gg]")
+      set(CMAKE_CXX_COMPILER "$ENV{CC}")
+    endif()
   endif()
 endmacro()
 endif()

data/build/common/transactd_cl_output.cmake

@@ -85,6 +85,22 @@ endmacro()
 endif()
 
 
+# ==========================================================
+#   transactd_set_rpath
+# ==========================================================
+if(NOT COMMAND transactd_set_rpath)
+macro(transactd_set_rpath prefix)
+  SET(CMAKE_SKIP_BUILD_RPATH TRUE)
+  SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+  if("${prefix}" STREQUAL "")
+    SET(CMAKE_INSTALL_RPATH "/usr/lib")
+  else()
+    SET(CMAKE_INSTALL_RPATH "${prefix}")
+  endif()
+endmacro()
+endif()
+
+
 # ==========================================================
 #   transactd_set_exe_output
 # ==========================================================

data/build/common/transactd_required.cmake

@@ -22,7 +22,18 @@
 if(WIN32)
   set(tmp_verstr "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
   if ("2.8.3" GREATER "${tmp_verstr}")
-    message(SEND_ERROR "CMake 2.8.3 or higher is required.  You are running version ${tmp_verstr}")
+    message(FATAL_ERROR "CMake 2.8.3 or newer is required.  You are running version ${tmp_verstr}")
+  endif()
+  include(CMakeParseArguments)
+endif()
+
+# ==========================================================
+# require 3.0.0 on Mac OS X
+# ==========================================================
+if(APPLE)
+  set(tmp_verstr "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
+  if ("3.0.0" GREATER "${tmp_verstr}")
+    message(FATAL_ERROR "CMake 3.0.0 or newer is required.  You are running version ${tmp_verstr}")
   endif()
   include(CMakeParseArguments)
 endif()

data/build/swig/ruby/tdclrb_wrap.cpp

@@ -14722,22 +14722,14 @@ SWIGINTERN VALUE
 _wrap_nsdatabase_getCreateViewSql(int argc, VALUE *argv, VALUE self) {
   tdap::client::nsdatabase *arg1 = (tdap::client::nsdatabase *) 0 ;
   _TCHAR *arg2 = (_TCHAR *) 0 ;
-  char *arg3 = (char *) 0 ;
-  uint_td *arg4 = (uint_td *) 0 ;
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
   char *result = 0 ;
   VALUE vresult = Qnil;
   if (!check_param_count(argc, 1, 1)) return Qnil;
-  
-  {
-    uint_td n = 65000;
-    uint_td* n_p = &n;
-    char* p = new char[n];
-    arg3 = p;
-    arg4 = n_p;
-  }
+  uint_td n = 65000;
+  char* p = new char[n];
   arg1 = selfPtr(self, arg1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
@@ -14746,7 +14738,7 @@ _wrap_nsdatabase_getCreateViewSql(int argc, VALUE *argv, VALUE self) {
   arg2 = reinterpret_cast< _TCHAR * >(buf2);
   {
     try {
-      result = (char *)(arg1)->getCreateViewSql((_TCHAR const *)arg2,arg3,arg4);
+      result = (char *)(arg1)->getCreateViewSql((_TCHAR const *)arg2,p,&n);
     } 
     CATCH_BZS_AND_STD()
   }
@@ -14754,15 +14746,11 @@ _wrap_nsdatabase_getCreateViewSql(int argc, VALUE *argv, VALUE self) {
     vresult = rb_enc_str_new(result, strlen(result), utf8_enc);
   }
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  {
-    delete [] arg3;
-  }
+  delete [] p;
   return vresult;
 fail:
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  {
-    delete [] arg3;
-  }
+  delete [] p;
   return Qnil;
 }
 
@@ -15556,21 +15544,14 @@ SWIGINTERN VALUE
 _wrap_database_getSqlStringForCreateTable(int argc, VALUE *argv, VALUE self) {
   tdap::client::database *arg1 = (tdap::client::database *) 0 ;
   _TCHAR *arg2 = (_TCHAR *) 0 ;
-  char *arg3 = (char *) 0 ;
-  uint_td *arg4 = (uint_td *) 0 ;
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
   char *result = 0 ;
   VALUE vresult = Qnil;
   if (!check_param_count(argc, 1, 1)) return Qnil;
-  {
-    uint_td n = 65000;
-    uint_td* n_p = &n;
-    char* p = new char[n];
-    arg3 = p;
-    arg4 = n_p;
-  }
+  uint_td n = 65000;
+  char* p = new char[n];
   arg1 = selfPtr(self, arg1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
@@ -15579,7 +15560,7 @@ _wrap_database_getSqlStringForCreateTable(int argc, VALUE *argv, VALUE self) {
   arg2 = reinterpret_cast< _TCHAR * >(buf2);
   {
     try {
-      result = (char *)(arg1)->getSqlStringForCreateTable((_TCHAR const *)arg2,arg3,arg4);
+      result = (char *)(arg1)->getSqlStringForCreateTable((_TCHAR const *)arg2, p, &n);
     } 
     CATCH_BZS_AND_STD()
   }
@@ -15587,15 +15568,11 @@ _wrap_database_getSqlStringForCreateTable(int argc, VALUE *argv, VALUE self) {
     vresult = rb_enc_str_new(result, strlen(result), utf8_enc);
   }
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  {
-    delete [] arg3;
-  }
+  delete [] p;
   return vresult;
 fail:
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  {
-    delete [] arg3;
-  }
+  delete [] p;
   return Qnil;
 }
 

data/build/tdclc/tdclc.rc

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

data/build/tdclcpp/CMakeLists.txt

@@ -35,6 +35,10 @@ check_for_link_iconv()
 set(this_target tdclcpp)
 project(${this_target})
 bz_force_gcc() # set compiler to gcc instead of g++
+if(APPLE)
+  cmake_policy(SET CMP0042 NEW)
+  SET(MACOSX_RPATH TRUE)
+endif()
 
 
 # ==========================================================
@@ -192,6 +196,10 @@ else()
     SOVERSION ${TD_RC_VER_MAJOR}.${TD_RC_VER_MINOR}
     VERSION ${TD_RC_VER_MAJOR}.${TD_RC_VER_MINOR}.${TD_RC_VER_RELEASE})
 endif()
+if(APPLE)
+  SET(BUILD_WITH_INSTALL_RPATH)
+  SET(INSTALL_NAME_DIR @rpath/)
+endif()
 
 
 # ==========================================================

data/build/tdclcpp/tdclcpp.rc

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

data/build/tdclrb/CMakeLists.txt

@@ -33,6 +33,10 @@ include(../common/smart_install.cmake)
 set(this_target tdclrb)
 project(${this_target})
 
+if(APPLE)
+  transactd_set_rpath("${TRANSACTD_CLIENTS_PREFIX}")
+endif()
+
 
 # ==========================================================
 # options

data/build/tdclrb/tdclrb.rc

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

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

@@ -2266,7 +2266,7 @@ int field::nullCompMatch(const field& r, char log) const
     if (lnull) return -1;
 
     bool rnull = r.isNull();
-    if (lnull) return 1;
+    if (rnull) return 1;
     return 2;
 }
 

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

@@ -79,6 +79,7 @@ void setTrnsctdEntryPoint(BTRCALLID_PTR p)
     MYTICALLID = p;
 }
 
+
 BTRCALLID_PTR getTrnsctdEntryPoint()
 {
     if (MYTICALLID)
@@ -87,6 +88,24 @@ BTRCALLID_PTR getTrnsctdEntryPoint()
     if (hTrsdDLL == NULL)
         hTrsdDLL = LoadLibraryA(LIB_PREFIX TDCLC_LIBNAME);
 
+#ifdef __APPLE__
+    if (hTrsdDLL == NULL)
+    {
+        char buf[MAX_PATH];
+        GetModuleFileName(buf);
+        if (buf[0])
+        {
+            char* p = (char*)strrchr(buf, PSEPARATOR_C);
+            if (p)
+            {
+                *p = 0x00;
+                strcat(buf, PSEPARATOR_A LIB_PREFIX TDCLC_LIBNAME);
+                hTrsdDLL = LoadLibraryA(buf);
+            }
+        }
+    }
+#endif
+
     if (hTrsdDLL)
     {
         MYTICALLID =

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

@@ -1027,22 +1027,39 @@ void nstable::throwError(const _TCHAR* caption, nstable* tb)
 _TCHAR* nstable::getDirURI(const _TCHAR* path, _TCHAR* buf)
 {
     bool uri = false;
-    if (_tcsstr(path, _T("btrv://")) || _tcsstr(path, _T("tdap://")))
+    bool btrv = false;
+    if ((btrv = (bool)_tcsstr(path, _T("btrv://"))) || _tcsstr(path, _T("tdap://")))
         uri = true;
 #ifdef _WIN32
     if (uri == false)
         _tfullpath(buf, path, MAX_PATH);
     else
 #endif
-    stripAuth(path, buf, MAX_PATH);
-    _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;
+        stripAuth(path, buf, MAX_PATH);
 
+    _TUCHAR* p = _tcsmrchr((_TUCHAR*)buf, '=');
+    if (btrv && p)
+    {
+        _TUCHAR* p2 = _tcsmrchr((_TUCHAR*)buf, PSEPARATOR_C);
+        if (p2)
+        {
+            if (p > p2)
+                p2 = NULL;
+            else
+                p = NULL;
+        }
+        if (p2) *p2 = 0x00;
+        if (p) *(p + 1) = 0x00;
+    }
+    else
+    {
+        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 (uri && !_tcsstr(buf, _T("dbfile=")))
     {
         p = _tcsmrchr((_TUCHAR*)buf, '?');

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 "7"//##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 "7"//##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 7//##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/db/transactd/connManager.cpp

@@ -108,7 +108,7 @@ void connManager::getDatabaseList(igetDatabases* dbm, const module* mod) const
             rec.inSnapshot = db->inSnapshot();
             if (rec.inTransaction)
             {
-                if (db->transactionIsolation() == ISO_REPEATABLE_READ)
+                if (db->transactionIsolation() >= ISO_REPEATABLE_READ)
                     rec.type = MULTILOCK_GAP;
                 else if (db->transactionIsolation() == ISO_READ_COMMITTED)
                 {
@@ -122,7 +122,7 @@ void connManager::getDatabaseList(igetDatabases* dbm, const module* mod) const
             {
                 if (db->transactionIsolation() == 0)
                     rec.type = CONSISTENT_READ;
-                else if (db->transactionIsolation() == ISO_REPEATABLE_READ)
+                else if (db->transactionIsolation() >= ISO_REPEATABLE_READ)
                     rec.type = MULTILOCK_GAP_SHARE;
                 else if (db->transactionIsolation() == ISO_READ_COMMITTED)
                     rec.type = MULTILOCK_NOGAP_SHARE;

data/source/bzs/env/compiler.h

@@ -227,7 +227,7 @@
 #ifdef LINUX
 #   define LIB_PREFIX "lib"
 #else
-#   define LIB_PREFIX
+#   define LIB_PREFIX ""
 #endif
 
 #endif // BZS_ENV_COMPILER_H

data/source/bzs/env/crosscompile.cpp

@@ -135,6 +135,21 @@ char16_t* wmemcpy(char16_t* dest, const char16_t* src, size_t count)
 
 #endif // LINUX
 
+#ifdef __APPLE__
+#include <dlfcn.h>
+/* buffer size need 266 bytes */
+char* GetModuleFileName(char* retBuf)
+{
+    retBuf[0] = 0x00;
+    Dl_info info;
+    if (dladdr(reinterpret_cast<void*>(GetModuleFileName), &info) == 0)
+        return retBuf;
+    strcpy(retBuf, info.dli_fname);
+    return retBuf;
+}
+#endif //__APPLE__
+
+
 #if (defined(_WIN32) && !defined(__MINGW32__))
 #include <windows.h>
 #include "crosscompile.h"

data/source/bzs/env/crosscompile.h

@@ -261,4 +261,8 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp);
 #define wcstoull _wcstoui64 
 #endif
 
+#ifdef __APPLE__
+char* GetModuleFileName(char* retBuf);
+#endif
+
 #endif // BZS_ENV_CROSSCOMPILE_H

data/source/bzs/test/tdclphp/transactd_v3_Test.php

@@ -886,8 +886,8 @@ class TransactdTest extends PHPUnit_Framework_TestCase
         }
         $this->assertNotEquals($bpos->pos, 0);
         $this->assertNotEquals($bpos->filename, "");
-        echo PHP_EOL.'binlog pos = '.$bpos->filename.':'.$bpos->pos.PHP_EOL;
-        echo 'gtid (set)= '.$bpos->gtid.PHP_EOL;
+        //echo PHP_EOL.'binlog pos = '.$bpos->filename.':'.$bpos->pos.PHP_EOL;
+        //echo 'gtid (set)= '.$bpos->gtid.PHP_EOL;
    
         //setGtid
         $bpos->gtid = "ABCD";
@@ -989,7 +989,7 @@ class TransactdTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($mgr->stat(), 0);
         $this->assertEquals($mgr->slaveStatusName(0), "Slave_IO_State");
         for ($i = 0; $i < $recs->size(); $i++) {
-            echo(PHP_EOL . $mgr->slaveStatusName($i) . "\t:" . $recs[$i]->value);
+            //echo(PHP_EOL . $mgr->slaveStatusName($i) . "\t:" . $recs[$i]->value);
         }
         
         //extendedvars

data/source/bzs/test/tdclrb/transactd_v3_spec.rb

@@ -1027,7 +1027,7 @@ describe Transactd, 'V3Features' do
     expect(mgr.stat()).to eq 0
     expect(mgr.slaveStatusName(0)).to eq "Slave_IO_State"
     for i in 0...recs.size() do
-      puts (mgr.slaveStatusName(i) + "\t:" + recs[i].value.to_s)
+      # puts (mgr.slaveStatusName(i) + "\t:" + recs[i].value.to_s)
     end
     # extendedvars
     recs = mgr.extendedvars()

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

@@ -5297,6 +5297,8 @@ void testGetDirUri()
     nstable::getDirURI(_T("btrv://root@localhost/db"), retbuf);
     BOOST_CHECK(_tcscmp(_T("btrv://localhost/db?dbfile="), retbuf) == 0);
 #ifdef _WIN32
+    nstable::getDirURI(_T("btrv://root@localhost/db?dbfile=..\\system\\test.bdf"), retbuf);
+    BOOST_CHECK(_tcscmp(_T("btrv://localhost/db?dbfile=..\\system"), retbuf) == 0);
     nstable::getDirURI(_T("c:\\temp\\abc\\abc.def"), retbuf);
     BOOST_CHECK(_tcscmp(_T("c:\\temp\\abc"), retbuf) == 0);
 #endif

metadata

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