transactd 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f89d3c2a7bda1a1c1acbe8113106f860cac1ede
-  data.tar.gz: 33eb8baabb33c8915a9fc68dd5bb8cf4b3198d76
+  metadata.gz: 170428ca4c13d71e29e383dcd2177a3379ab9aa6
+  data.tar.gz: 679895450a096a43e0c3eb97fdd89e9da2b1c854
 SHA512:
-  metadata.gz: 1341f50aaae62539ab3844a0658836f516ea75f47d48879e78e34f795f12fa41743a580ec1b54d4c93fb8408729d44f770514a1aee17fe2cf0b0a73058317123
-  data.tar.gz: 8ca6b44afd9d429e98c673a32982b0a759c1a2ab304029778262c5729ffdbf0bb7311f18d86b5ee5df29b6d2baac4a1841d0fdfaf679fa45b1ea2a3a4a7c53dc
+  metadata.gz: b8fb996a5df63898313c19c456251efe0a4e598e0e9cb426828f7a5f4ac60df1474c6be25faa03756977c08db346d5aa41351e0d775bcbd7bffce876a5ff8bde
+  data.tar.gz: 18b21cf181a039f3bc1811e3a2d3ad0665f13a08f9baf7c8735973736312791bff390c6b4a3e0f759eedb56fcb7a6836308de83198e22082228cdd9a79d23c67

data/CMakeLists.txt

@@ -29,16 +29,28 @@ include(build/common/transactd_common.cmake)
 option(WITH_TRANSACTD_SERVER    "Build Transactd server plugin"                   ON)
 option(WITH_TRANSACTD_CLIENTS   "Build Transactd client libraries"                ON)
 option(TRANSACTD_HANDLERSOCKET  "Add HandlerSocket protocol to Transactd plugin"  ON)
-option(TRANSACTD_RUBY_GEM       "Build Transactd ruby gem"                        OFF)
 set(TRANSACTD_PREFIX  "/usr/local/transactd"  CACHE STRING "Prefix for transactd executables(test,benchmark)")
 set(TRANSACTD_CLIENTS_PREFIX    ""            CACHE STRING "Prefix for transactd client libraries")
+  # options for Ruby client
+option(TRANSACTD_RUBY_GEM       "Build Transactd ruby gem"                        OFF)
+  # options for PHP client
+option(TRANSACTD_PHP            "Build Transactd client PHP extension"            OFF)
+set(TRANSACTD_PHP_SOURCE_ROOT   "" CACHE STRING "Path of php source directory")
+set(TRANSACTD_PHP_LIBRARY_PATH  "" CACHE STRING "Library path for php")
+option(TRANSACTD_PHP_ZTS        "Add ZTS flag for build Transactd client PHP extension" OFF)
 
 #   The following options are set automatically if not specified.
 #   Usually you do not have to set these values.
+  # options for Ruby client
 set(TRANSACTD_RUBY_GEM_ROOT_PATH    "" CACHE STRING "Transactd gem root path")
 set(TRANSACTD_RUBY_EXECUTABLE_PATH  "" CACHE STRING "Ruby executable path")
-set(TRANSACTD_RUBY_INCLUDE_PATH     "" CACHE STRING "Include path for ruby-swig")
-set(TRANSACTD_RUBY_LIBRARY_PATH     "" CACHE STRING "Include path for ruby")
+set(TRANSACTD_RUBY_INCLUDE_PATH     "" CACHE STRING "Include path for ruby")
+set(TRANSACTD_RUBY_LIBRARY_PATH     "" CACHE STRING "Library path for ruby")
+  # options for PHP client
+set(TRANSACTD_PHP_INCLUDE_PATH      "" CACHE STRING "Include path for PHP")
+option(TRANSACTD_PHP_USE_32BIT_TIME_T 
+  "Add _USE_32BIT_TIME_T option for building Transactd client PHP extension"      ON)
+set(TDCL_CPP_CHARSET  "" CACHE STRING "Transactd clients charset m:Multibyte u:Unicode")
 
 
 # ==========================================================
@@ -50,6 +62,10 @@ if(TRANSACTD_RUBY_GEM)
   set(WITH_TRANSACTD_SERVER   OFF)
   set(WITH_TRANSACTD_CLIENTS  OFF)
 endif()
+if(TRANSACTD_PHP)
+  set(WITH_TRANSACTD_SERVER   OFF)
+  set(WITH_TRANSACTD_CLIENTS  OFF)
+endif()
 
 
 # ==========================================================
@@ -71,7 +87,9 @@ if(WITH_TRANSACTD_CLIENTS)
   endif()
   subdirs("build/tdclc")
   if(WIN32 AND NOT MINGW)
-    set(TDCL_CPP_CHARSET u)
+    if((NOT ("${TDCL_CPP_CHARSET}" STREQUAL "m")) AND (NOT ("${TDCL_CPP_CHARSET}" STREQUAL "u")))
+      set(TDCL_CPP_CHARSET u)
+    endif()
   else()
     set(TDCL_CPP_CHARSET m)
   endif()
@@ -91,6 +109,21 @@ if(TRANSACTD_RUBY_GEM)
   if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
     project(tdcl)
   endif()
+  set(TDCL_CPP_CHARSET m)
   transactd_copy_subdir("${TRANSACTD_ROOT}" tdclcpp tdclcppm)
   subdirs("build/tdclrb")
 endif()
+
+
+# ==========================================================
+# build PHP extension
+# ==========================================================
+if(TRANSACTD_PHP)
+  message(STATUS "BUILD Transactd client PHP extension")
+  if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+    project(tdcl)
+  endif()
+  set(TDCL_CPP_CHARSET m)
+  transactd_copy_subdir("${TRANSACTD_ROOT}" tdclcpp tdclcppm)
+  subdirs("build/tdclphp")
+endif()

data/build/common/transactd_cl_common.cmake

@@ -32,7 +32,6 @@ macro(tdcl_add_source_files TRANSACTD_ROOT)
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/errorMessage.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/fieldDDF.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/fileDDF.cpp
-    ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/filter.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/indexDDF.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/nsDatabase.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/nsTable.cpp

data/build/common/transactd_common.cmake

@@ -209,7 +209,7 @@ macro(transactd_link_boost_libraries boost_components)
       target_link_libraries(${this_target} ${Boost_LIBRARIES})
     else()
       if(APPLE)
-        target_link_libraries(${this_target} ${Boost_LIBRARIES})
+        target_link_libraries(${this_target} ${Boost_LIBRARIES})
       else()
         # need "-lrt" after chrono or timer
         target_link_libraries(${this_target} ${Boost_LIBRARIES} rt)
@@ -219,21 +219,41 @@ macro(transactd_link_boost_libraries boost_components)
   ## find Boost for Visual Studio /MD or /MDd or /MT or /MTd
   if(MSVC)
     get_boost_libs("${boost_components}")
-    add_library(boostlibs_for_${this_target} SHARED IMPORTED)
     if("${CMAKE_CONFIGURATION_TYPES}" STREQUAL "")
       set(CMAKE_CONFIGURATION_TYPES Debug Release RelWithDebInfo MinSizeRel)
     endif()
+    # buildtype-specified libraries
     foreach(BT_NAME "" ${CMAKE_CONFIGURATION_TYPES})
       if(NOT("${BT_NAME}" STREQUAL ""))
         set(BT_NAME "_${BT_NAME}")
         string(TOUPPER "${BT_NAME}" BT_NAME)
       endif()
       get_boost_libs_from_CXXFLAGS("${CMAKE_CXX_FLAGS${BT_NAME}}")
-      set_property(TARGET boostlibs_for_${this_target} PROPERTY
-        "IMPORTED_IMPLIB${BT_NAME}" ${get_boost_libs_from_CXXFLAGS_return})
+      set(boost_libs_for${BT_NAME} "${get_boost_libs_from_CXXFLAGS_return}")
+      string(REGEX REPLACE ";$" "" boost_libs_for${BT_NAME} "${boost_libs_for${BT_NAME}}")
+      list(LENGTH boost_libs_for${BT_NAME} boost_libs_listlen${BT_NAME})
+      if(${boost_libs_listlen${BT_NAME}} GREATER ${boost_libs_listlen})
+        set(boost_libs_listlen ${boost_libs_listlen${BT_NAME}})
+      endif()
     endforeach()
-    if(NOT "${boost_components}" STREQUAL "")
-      target_link_libraries(${this_target} boostlibs_for_${this_target})
+    # add libraries
+    if(${boost_libs_listlen} GREATER 0)
+      foreach(idx RANGE 1 ${boost_libs_listlen})
+        math(EXPR i "${idx} - 1")
+        add_library(boostlibs_for_${this_target}_${idx} SHARED IMPORTED)
+        foreach(BT_NAME "" ${CMAKE_CONFIGURATION_TYPES})
+          if(NOT("${BT_NAME}" STREQUAL ""))
+            set(BT_NAME "_${BT_NAME}")
+            string(TOUPPER "${BT_NAME}" BT_NAME)
+          endif()
+          list(GET boost_libs_for${BT_NAME} ${i} boost_lib_tmp)
+          set_property(TARGET boostlibs_for_${this_target}_${idx} PROPERTY
+            IMPORTED_IMPLIB${BT_NAME} "${boost_lib_tmp}")
+        endforeach()
+        if(NOT "${boost_components}" STREQUAL "")
+          target_link_libraries(${this_target} boostlibs_for_${this_target}_${idx})
+        endif()
+      endforeach()
     endif()
   endif()
   include_directories("${Boost_INCLUDE_DIRS}")

data/build/swig/php/generate.cmake.in

@@ -0,0 +1,58 @@
+##=================================================================
+#   Copyright (C) 2012 2013 BizStation Corp All rights reserved.
+#
+#   This program is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License
+#   as published by the Free Software Foundation; either version 2
+#   of the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+#   02111-1307, USA.
+##=================================================================
+## GENERATE SWIG WRAPPER
+if(WIN32)
+  execute_process(
+    ERROR_VARIABLE TRANSACTD_GENERATE_ERROR_VAR
+    COMMAND "@SWIG_GEN_CMD_WIN@"
+  )
+else()
+  get_filename_component(TRANSACTD_PHP_PATH "@SWIG_NATIVE_OUTFILE@" PATH)
+  file(TO_CMAKE_PATH "${TRANSACTD_PHP_PATH}/transactd.php" TRANSACTD_PHP_PATH)
+  ## generate correct transactd.php
+  if(NOT EXISTS "${TRANSACTD_PHP_PATH}.correct")
+    MESSAGE("Generating ${TRANSACTD_PHP_PATH}.correct ...")
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different "@SWIG_INTERFACE_FILE@" "@SWIG_INTERFACE_FILE@.org")
+    execute_process(
+      COMMAND grep -v "^%newobj" "@SWIG_INTERFACE_FILE@.org"
+      OUTPUT_FILE "@SWIG_INTERFACE_FILE@")
+    execute_process(
+      ERROR_VARIABLE TRANSACTD_GENERATE_ERROR_VAR
+      COMMAND swig -c++ -php5 -I@SWIG_INC_PATH1@ -I@SWIG_INC_PATH2@ -o @SWIG_NATIVE_OUTFILE@ @SWIG_INTERFACE_FILE@)
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different "${TRANSACTD_PHP_PATH}" "${TRANSACTD_PHP_PATH}.correct")
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different "@SWIG_INTERFACE_FILE@.org" "@SWIG_INTERFACE_FILE@")
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E remove "@SWIG_INTERFACE_FILE@.org")
+  endif()
+  ## generate wrapper cpp
+  execute_process(
+    ERROR_VARIABLE TRANSACTD_GENERATE_ERROR_VAR
+    COMMAND swig -c++ -php5 -I@SWIG_INC_PATH1@ -I@SWIG_INC_PATH2@ -o @SWIG_NATIVE_OUTFILE@ @SWIG_INTERFACE_FILE@)
+  ## overwrite with correct transactd.php
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${TRANSACTD_PHP_PATH}.correct" "${TRANSACTD_PHP_PATH}")
+endif()
+
+if("${TRANSACTD_GENERATE_ERROR_VAR}" STREQUAL "")
+else()
+  message(STATUS ${TRANSACTD_GENERATE_ERROR_VAR})
+endif()

data/build/swig/php/generate.cmd.in

@@ -0,0 +1,41 @@
+@REM ===============================================================
+@REM    Copyright (C) 2013 BizStation Corp All rights reserved.
+@REM 
+@REM    This program is free software; you can redistribute it and/or
+@REM    modify it under the terms of the GNU General Public License
+@REM    as published by the Free Software Foundation; either version 2
+@REM    of the License, or (at your option) any later version.
+@REM 
+@REM    This program is distributed in the hope that it will be useful,
+@REM    but WITHOUT ANY WARRANTY; without even the implied warranty of
+@REM    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+@REM    GNU General Public License for more details.
+@REM 
+@REM    You should have received a copy of the GNU General Public License
+@REM    along with this program; if not, write to the Free Software 
+@REM    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+@REM    02111-1307, USA.
+@REM ===============================================================
+call :GET_TRANSACTD_PHP_PATH "@SWIG_NATIVE_OUTFILE@"
+if not exist "%TDPHPPATH%.correct" call :GENERATE_TRANSACTD_PHP_CORRECT
+
+swig -c++ -php5 -DSWIGWIN -D_WIN32 -I"@SWIG_INC_PATH1@" -I"@SWIG_INC_PATH2@" @SWIG_ADDITONAL_OPTIONS@ -o "@SWIG_NATIVE_OUTFILE@" "@SWIG_INTERFACE_FILE@"
+del "%TDPHPPATH%"
+copy "%TDPHPPATH%.correct" "%TDPHPPATH%"
+
+exit /b 0
+
+:GENERATE_TRANSACTD_PHP_CORRECT
+  copy "@SWIG_INTERFACE_FILE@" "@SWIG_INTERFACE_FILE@.org"
+  findstr /V /B /C:"%%newobject" "@SWIG_INTERFACE_FILE@.org" > "@SWIG_INTERFACE_FILE@"
+  swig -c++ -php5 -DSWIGWIN -D_WIN32 -I"@SWIG_INC_PATH1@" -I"@SWIG_INC_PATH2@" @SWIG_ADDITONAL_OPTIONS@ -o "@SWIG_NATIVE_OUTFILE@" "@SWIG_INTERFACE_FILE@"
+  del "@SWIG_INTERFACE_FILE@"
+  copy "@SWIG_INTERFACE_FILE@.org" "@SWIG_INTERFACE_FILE@"
+  del "@SWIG_INTERFACE_FILE@.org"
+  move "%TDPHPPATH%" "%TDPHPPATH%.correct"
+  exit /b 0
+
+:GET_TRANSACTD_PHP_PATH
+  setlocal enabledelayedexpansion
+  endlocal && set TDPHPPATH=%~dp1transactd.php
+  exit /b 0

data/build/swig/php/php.swg

@@ -0,0 +1,155 @@
+/*=================================================================
+   Copyright (C) 2013 BizStation Corp All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software 
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   02111-1307, USA.
+=================================================================*/
+#if defined(SWIGPHP)  // ======= For PHP =======
+
+/* ===============================================
+  ignore functions
+=============================================== */
+// original callback
+%ignore bzs::db::protocol::tdap::client::database::onCopyData;
+%ignore bzs::db::protocol::tdap::client::database::setOnCopyData;
+%ignore bzs::db::protocol::tdap::client::database::onDeleteRecord;
+%ignore bzs::db::protocol::tdap::client::database::setOnDeleteRecord;
+// overloaded functions
+%ignore bzs::db::protocol::tdap::client::table::setFV(short, float); // use double instead of this
+%ignore bzs::db::protocol::tdap::client::table::setFV(short, unsigned char);  // use __int64 instead of this
+%ignore bzs::db::protocol::tdap::client::table::setFV(short, short);          // use __int64 instead of this
+%ignore bzs::db::protocol::tdap::client::table::setFV(short, int);            // use __int64 instead of this
+%ignore bzs::db::protocol::tdap::client::table::setFV(const _TCHAR *, float); // use double instead of this
+%ignore bzs::db::protocol::tdap::client::table::setFV(const _TCHAR *, unsigned char); // use __int64 instead of this
+%ignore bzs::db::protocol::tdap::client::table::setFV(const _TCHAR *, short);         // use __int64 instead of this
+%ignore bzs::db::protocol::tdap::client::table::setFV(const _TCHAR *, int);           // use __int64 instead of this
+%ignore bzs::db::protocol::tdap::client::table::setFVW;     // use setFV instead of this
+%ignore bzs::db::protocol::tdap::client::table::getFVWstr;  // use getFVstr instead of this
+%ignore bzs::db::protocol::tdap::btrTimeStamp::btrTimeStamp(const wchar_t *);   // use char* instead of this
+%ignore bzs::db::protocol::tdap::btrTimeStamp::toString(wchar_t *);             // use char* instead of this
+%ignore bzs::db::protocol::tdap::btrTimeStamp::fromString(const wchar_t *);     // use char* instead of this
+%ignore bzs::db::protocol::tdap::atobtrd(const wchar_t *);                  // use char* instead of this
+%ignore bzs::db::protocol::tdap::atobtrt(const wchar_t *);                  // use char* instead of this
+%ignore bzs::db::protocol::tdap::btrdtoa(int, wchar_t *);                   // use char* instead of this
+%ignore bzs::db::protocol::tdap::btrdtoa(int, wchar_t *, bool);             // use char* instead of this
+%ignore bzs::db::protocol::tdap::btrdtoa(const btrDate &, wchar_t *);       // use char* instead of this
+%ignore bzs::db::protocol::tdap::btrdtoa(const btrDate &, wchar_t *, bool); // use char* instead of this
+%ignore bzs::db::protocol::tdap::btrttoa(int, wchar_t *);                   // use char* instead of this
+%ignore bzs::db::protocol::tdap::btrttoa(int, wchar_t *, bool);             // use char* instead of this
+%ignore bzs::db::protocol::tdap::btrttoa(const btrTime &, wchar_t *);       // use char* instead of this
+%ignore bzs::db::protocol::tdap::btrttoa(const btrTime &, wchar_t *, bool); // use char* instead of this
+
+
+/* ===============================================
+  Rename functions
+=============================================== */
+// Rename function which has keyword of PHP as its name.
+%rename(andWhere) bzs::db::protocol::tdap::client::queryBase::And;
+%rename(orWhere) bzs::db::protocol::tdap::client::queryBase::Or;
+
+
+/* ===============================================
+  set execCodePage on createObject
+=============================================== */
+%ignore bzs::db::protocol::tdap::client::database::create();
+%extend bzs::db::protocol::tdap::client::database {
+  static bzs::db::protocol::tdap::client::database* createObject()
+  {
+    bzs::db::protocol::tdap::client::nsdatabase::setExecCodePage(CP_UTF8);
+    return bzs::db::protocol::tdap::client::database::create();
+  }
+};
+%newobject bzs::db::protocol::tdap::client::database::createObject;
+%delobject bzs::db::protocol::tdap::client::database::release;
+
+
+/* ===============================================
+  SWIG PHP can't convert String to c++ wchar_t
+  so define _TCHAR as char.
+=============================================== */
+#ifdef _UNICODE
+  #undef _UNICODE
+#endif
+#ifdef UNICODE
+  #undef UNICODE
+#endif
+typedef char  _TCHAR;
+#define _T(x) x
+
+
+/* ===============================================
+  define strtoll and strtoull
+    for Visual Studio 2008 or lesser
+=============================================== */
+%{
+#if _MSC_VER
+#define strtoll _strtoi64
+#define strtoull _strtoui64
+#endif
+%}
+
+
+/* ===============================================
+  typemap
+=============================================== */
+%apply short { char_td }
+%typemap(argout) (const char* u8, int u8size, char* mbc, int mbcsize) {
+  ZVAL_STRING(return_value, (char *)$3, 1);
+}
+%typemap(argout) (const char* mbc, int mbcsize, char* u8, int u8size) {
+  ZVAL_STRING(return_value, (char *)$3, 1);
+}
+
+
+/* ===============================================
+  setFV / getFV for binary data
+=============================================== */
+%ignore bzs::db::protocol::tdap::client::table::setFV(short, const void *, uint_td);
+%extend bzs::db::protocol::tdap::client::table {
+  void setFV(short index, const char * data, uint_td size) {
+    return self->setFV(index, (void const *) data, size);
+  }
+  void setFV(const _TCHAR *fieldName, const char * data, uint_td size) {
+    return self->setFV(fieldName, (void const *) data, size);
+  }
+};
+%typemap(in, numinputs=0) (uint_td & size) (uint_td temp) {
+  $1 = &temp;
+}
+%typemap(argout) (uint_td & size) {
+  ZVAL_STRINGL($result, (char *)result, *$1, 1);
+}
+
+
+/* ===============================================
+  phpinfo
+=============================================== */
+#ifndef SWIGWIN
+%{
+  #define TRANSACTD_PHP_REQUIRED_MODULE_PREFIX "lib"
+%}
+#else
+%{
+  #define TRANSACTD_PHP_REQUIRED_MODULE_PREFIX ""
+%}
+#endif
+%pragma(php) phpinfo="
+  php_info_print_table_start();
+  php_info_print_table_row(2, \"Version\", CPP_INTERFACE_VER_MAJOR \".\" CPP_INTERFACE_VER_MINOR \".\" CPP_INTERFACE_VER_RELEASE);
+  php_info_print_table_row(2, \"Required Module\", TRANSACTD_PHP_REQUIRED_MODULE_PREFIX TDCLC_LIBNAME);
+  php_info_print_table_end();
+"
+
+#endif // =============== For PHP ===============

data/build/swig/ruby/ruby.swg

@@ -36,6 +36,14 @@
 %ignore bzs::db::protocol::tdap::client::database::setOnDeleteRecord;
 
 
+/* ===============================================
+  Rename functions
+=============================================== */
+// Rename function which has keyword of Ruby as its name.
+%rename(andWhere) bzs::db::protocol::tdap::client::queryBase::And;
+%rename(orWhere) bzs::db::protocol::tdap::client::queryBase::Or;
+
+
 /* ===============================================
   Ruby can't convert String to c++ wchar_t
   so define _TCHAR as char.
@@ -65,6 +73,36 @@ typedef char  _TCHAR;
 %delobject bzs::db::protocol::tdap::client::database::release;
 
 
+/* ===============================================
+  setFV / getFV for binary data
+=============================================== */
+%ignore bzs::db::protocol::tdap::client::table::setFV(short, const void *, uint_td);
+%extend bzs::db::protocol::tdap::client::table {
+  void setFV(short index, const char * data, uint_td size) {
+    return self->setFV(index, (void const *) data, size);
+  }
+  void setFV(const _TCHAR *fieldName, const char * data, uint_td size) {
+    return self->setFV(fieldName, (void const *) data, size);
+  }
+  const char * getFVbin(short index, uint_td& size)
+  {
+    return (const char *)(self->getFVbin(index, size));
+  }
+  const char * getFVbin(const _TCHAR *fieldName, uint_td& size)
+  {
+    return (const char *)(self->getFVbin(fieldName, size));
+  }
+};
+%typemap(in, numinputs=0) (uint_td & size) (uint_td temp) {
+  $1 = &temp;
+}
+%typemap(argout) (uint_td & size) {
+  $result = rb_str_new((const char *)result, *$1);
+}
+%ignore bzs::db::protocol::tdap::client::table::getFVbin(short, uint_td&);
+%ignore bzs::db::protocol::tdap::client::table::getFVbin(const _TCHAR *, uint_td&);
+
+
 /* ===============================================
   add encoding support for ruby 1.9
 =============================================== */

data/build/swig/tdcl.i

@@ -21,18 +21,24 @@
 =============================================== */
 #if defined(SWIGRUBY)
   %include "ruby/ruby.swg"
+#elif defined(SWIGPHP)
+  %include "php/php.swg"
 #endif
 
 %module transactd
 
 %include typemaps.i
 %include std_string.i
+%include wchar.i
 
 
 /* ===============================================
       HEADERS (for cpp compilation)
 =============================================== */
 %{
+#ifdef SWIGPHP
+#undef realloc
+#endif
 #include <bzs/env/crosscompile.h>
 #include <bzs/env/compiler.h>
 #include <bzs/db/protocol/tdap/btrDate.h>
@@ -75,6 +81,19 @@ using namespace bzs::db::protocol::tdap::client;
 /* ===============================================
       Ignore section
 =============================================== */
+// functions used by internal C++
+%ignore bzs::db::protocol::tdap::client::nsdatabase::btrvFunc;
+%ignore bzs::db::protocol::tdap::fileSpec;
+%ignore bzs::db::protocol::tdap::keySpec;
+%ignore bzs::db::protocol::tdap::fielddef::dataLen;
+%ignore bzs::db::protocol::tdap::fielddef::keyCopy;
+%ignore bzs::db::protocol::tdap::fielddef::keyData;
+%ignore bzs::db::protocol::tdap::fielddef::keyDataLen;
+%ignore bzs::db::protocol::tdap::fielddef::blobDataPtr;
+%ignore bzs::db::protocol::tdap::fielddef::blobDataLen;
+// overwrote functions
+%ignore bzs::db::protocol::tdap::client::nsdatabase::createTable;
+%ignore bzs::db::protocol::tdap::client::nsdatabase::getBtrVersion(btrVersions*, uchar_td*);
 // ignore members used BizStation internal only
 %ignore bzs::db::protocol::tdap::fielddef::chainChar;
 %ignore bzs::db::protocol::tdap::fielddef::setChainChar;
@@ -99,12 +118,23 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::tabledef::parentKeyNum;
 %ignore bzs::db::protocol::tdap::tabledef::replicaKeyNum;
 %ignore bzs::db::protocol::tdap::tabledef::treeIndex;
+%ignore bzs::db::protocol::tdap::tabledef::filler0;
+%ignore bzs::db::protocol::tdap::tabledef::reserved;
 %ignore bzs::db::protocol::tdap::client::dbdef::fieldNumByViewNum;
 // ignore operator=
 %ignore bzs::db::protocol::tdap::client::nsdatabase::operator=;
 %ignore bzs::db::protocol::tdap::client::database::operator=;
 // ignore internal structures / functions
 %ignore bzs::rtl::benchmark::report;
+// ignore methods that will be replaced other methods
+%ignore bzs::db::protocol::tdap::client::table::keyValueDescription(_TCHAR* buf, int bufsize);
+%ignore bzs::db::protocol::tdap::client::queryBase::addField;
+%ignore bzs::db::protocol::tdap::client::queryBase::addLogic;
+%ignore bzs::db::protocol::tdap::client::queryBase::addSeekKeyValue;
+// ignore queryBase destructor. use release instead of it.
+%ignore bzs::db::protocol::tdap::client::queryBase::~queryBase;
+%newobject bzs::db::protocol::tdap::client::queryBase::create;
+%delobject bzs::db::protocol::tdap::client::queryBase::release;
 
 
 /* ===============================================
@@ -131,9 +161,29 @@ using namespace bzs::db::protocol::tdap::client;
 
 
 /* ===============================================
-      external symbols
+      type defines
 =============================================== */
+%apply unsigned long long { unsigned __int64 }
 %apply long long { __int64 }
+
+
+/* ===============================================
+  typemap and extend for table::keyValueDescription
+=============================================== */
+%typemap(in,numinputs=0) (_TCHAR* keyValueDescription_buf) (_TCHAR tmpbuf[1024 * 8]) {
+  $1 = tmpbuf;
+}
+%extend bzs::db::protocol::tdap::client::table {
+  const _TCHAR* keyValueDescription(_TCHAR* keyValueDescription_buf) {
+    self->keyValueDescription(keyValueDescription_buf, 1024 * 8);
+    return keyValueDescription_buf;
+  }
+};
+
+
+/* ===============================================
+      external symbols
+=============================================== */
 %include bzs/env/compiler.h
 #ifdef SWIGWIN
 #define CP_ACP  0
@@ -155,12 +205,92 @@ using namespace bzs::db::protocol::tdap::client;
 %include bzs/rtl/benchmark.h
 %include bzs/db/protocol/tdap/mysql/characterset.h
 // typemap for btrTimeStamp::toString/btrdtoa/btrttoa/btrstoa --
-%typemap(in,numinputs=0) (char *) (char tmpbuf[255]) { $1=tmpbuf; }
+%typemap(in,numinputs=0) (char * retbuf) (char tmpbuf[255]) { $1=tmpbuf; }
 %include bzs/db/protocol/tdap/btrDate.h
-%clear char *;
+%clear char * retbuf;
 // clear typemap for typemap for btrTimeStamp::toString/btrdtoa/btrttoa/btrstoa --
 
 
+/* ===============================================
+      expand queryBase class
+  * Replace functions for convenience
+=============================================== */
+%extend bzs::db::protocol::tdap::client::queryBase {
+  queryBase* select(const _TCHAR* value1,
+    const _TCHAR* value2 = NULL, const _TCHAR* value3 = NULL, const _TCHAR* value4 = NULL,
+    const _TCHAR* value5 = NULL, const _TCHAR* value6 = NULL, const _TCHAR* value7 = NULL,
+    const _TCHAR* value8 = NULL, const _TCHAR* value9 = NULL, const _TCHAR* value10 = NULL)
+  {
+    self->addField(value1);
+    if (value2 != NULL)
+      self->addField(value2);
+    if (value3 != NULL)
+      self->addField(value3);
+    if (value4 != NULL)
+      self->addField(value4);
+    if (value5 != NULL)
+      self->addField(value5);
+    if (value6 != NULL)
+      self->addField(value6);
+    if (value7 != NULL)
+      self->addField(value7);
+    if (value8 != NULL)
+      self->addField(value8);
+    if (value9 != NULL)
+      self->addField(value9);
+    if (value10 != NULL)
+      self->addField(value10);
+    return self;
+  }
+  queryBase* where(const _TCHAR* field, const _TCHAR* op, const _TCHAR* val)
+  {
+    self->addLogic(field, op, val);
+    return self;
+  }
+  queryBase* And(const _TCHAR* field, const _TCHAR* op, const _TCHAR* val)
+  {
+    self->addLogic(_T("and") ,field, op, val);
+    return self;
+  }
+  queryBase* Or(const _TCHAR* field, const _TCHAR* op, const _TCHAR* val)
+  {
+    self->addLogic(_T("or") ,field, op, val);
+    return self;
+  }
+  queryBase* In(const _TCHAR* value1,
+    const _TCHAR* value2 = NULL, const _TCHAR* value3 = NULL, const _TCHAR* value4 = NULL,
+    const _TCHAR* value5 = NULL, const _TCHAR* value6 = NULL, const _TCHAR* value7 = NULL,
+    const _TCHAR* value8 = NULL, const _TCHAR* value9 = NULL, const _TCHAR* value10 = NULL)
+  {
+    self->addSeekKeyValue(value1, false);
+    if (value2 != NULL)
+      self->addSeekKeyValue(value2, false);
+    if (value3 != NULL)
+      self->addSeekKeyValue(value3, false);
+    if (value4 != NULL)
+      self->addSeekKeyValue(value4, false);
+    if (value5 != NULL)
+      self->addSeekKeyValue(value5, false);
+    if (value6 != NULL)
+      self->addSeekKeyValue(value6, false);
+    if (value7 != NULL)
+      self->addSeekKeyValue(value7, false);
+    if (value8 != NULL)
+      self->addSeekKeyValue(value8, false);
+    if (value9 != NULL)
+      self->addSeekKeyValue(value9, false);
+    if (value10 != NULL)
+      self->addSeekKeyValue(value10, false);
+    return self;
+  }
+  queryBase* addInValue(const _TCHAR* value, bool reset = false)
+  {
+    self->addSeekKeyValue(value, reset);
+    return self;
+  }
+};
+
+
 /* ===============================================
       expand some classes
   * many languages can not use pointer as array so add helper functions.

data/build/tdclc/CMakeLists.txt

@@ -134,10 +134,13 @@ add_library(${this_target} SHARED ${${this_target}_SOURCE_FILES})
 # ==========================================================
 # add link / include
 # ==========================================================
-transactd_link_boost_libraries("filesystem;system;thread")
+transactd_link_boost_libraries("filesystem;thread;chrono;system")
 if(APPLE)
   target_link_libraries(${this_target} iconv)
 endif()
+if(NOT MSVC)
+  target_link_libraries(${this_target} pthread)
+endif()
 
 
 # ==========================================================