transactd 1.2.0 → 2.0.0

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

@@ -26,23 +26,21 @@ 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()
+  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")
   ## generate wrapper cpp
   execute_process(
     ERROR_VARIABLE TRANSACTD_GENERATE_ERROR_VAR

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

@@ -17,23 +17,29 @@
 @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
+@REM Generate correct transactd.php
+@REM -- see SWIG bugs:#1350 http://sourceforge.net/p/swig/bugs/1350/
+@REM -- delete %newobject on interface file
   copy "@SWIG_INTERFACE_FILE@" "@SWIG_INTERFACE_FILE@.org"
   findstr /V /B /C:"%%newobject" "@SWIG_INTERFACE_FILE@.org" > "@SWIG_INTERFACE_FILE@"
+@REM -- generate wrapper files
   swig -c++ -php5 -DSWIGWIN -D_WIN32 -I"@SWIG_INC_PATH1@" -I"@SWIG_INC_PATH2@" @SWIG_ADDITONAL_OPTIONS@ -o "@SWIG_NATIVE_OUTFILE@" "@SWIG_INTERFACE_FILE@"
+@REM -- revert interface file
   del "@SWIG_INTERFACE_FILE@"
   copy "@SWIG_INTERFACE_FILE@.org" "@SWIG_INTERFACE_FILE@"
   del "@SWIG_INTERFACE_FILE@.org"
+@REM -- rename transactd.php to transactd.php.correct to use after step
   move "%TDPHPPATH%" "%TDPHPPATH%.correct"
-  exit /b 0
+
+@REM Generate wrappers
+  swig -c++ -php5 -DSWIGWIN -D_WIN32 -I"@SWIG_INC_PATH1@" -I"@SWIG_INC_PATH2@" @SWIG_ADDITONAL_OPTIONS@ -o "@SWIG_NATIVE_OUTFILE@" "@SWIG_INTERFACE_FILE@"
+@REM -- replace correct transactd.php
+  del "%TDPHPPATH%"
+  copy "%TDPHPPATH%.correct" "%TDPHPPATH%"
+  del "%TDPHPPATH%.correct
+
+exit /b 0
 
 :GET_TRANSACTD_PHP_PATH
   setlocal enabledelayedexpansion

data/build/swig/php/php.swg

@@ -17,68 +17,30 @@
    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
+      exception handler
 =============================================== */
-// 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();
+%exception {
+  try {
+    $action
+  } catch (bzs::rtl::exception& e) {
+    SWIG_exception(SWIG_RuntimeError, (* bzs::rtl::getMsg(e)).c_str());
+  } catch (std::exception &e) {
+    SWIG_exception(SWIG_RuntimeError, e.what());
   }
-};
-%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.
+  General settings for PHP
 =============================================== */
+%{
+#ifdef SWIGPHP
+#undef realloc
+#endif
+%}
+
+// SWIG PHP can't convert String to c++ wchar_t so define _TCHAR as char.
 #ifdef _UNICODE
   #undef _UNICODE
 #endif
@@ -88,11 +50,7 @@
 typedef char  _TCHAR;
 #define _T(x) x
 
-
-/* ===============================================
-  define strtoll and strtoull
-    for Visual Studio 2008 or lesser
-=============================================== */
+// define strtoll and strtoull for Visual Studio 2008 or lesser
 %{
 #if _MSC_VER
 #define strtoll _strtoi64
@@ -100,11 +58,27 @@ typedef char  _TCHAR;
 #endif
 %}
 
+// 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();
+"
 
-/* ===============================================
-  typemap
-=============================================== */
+// General typemap
 %apply short { char_td }
+
+// typemaps for encoding support
 %typemap(argout) (const char* u8, int u8size, char* mbc, int mbcsize) {
   ZVAL_STRING(return_value, (char *)$3, 1);
 }
@@ -114,9 +88,77 @@ typedef char  _TCHAR;
 
 
 /* ===============================================
-  setFV / getFV for binary data
+  ignore / rename functions
 =============================================== */
+// * bzs/db/protocol/tdap/btrDate.h *
+%ignore bzs::db::protocol::tdap::btrTimeStamp::btrTimeStamp(const wchar_t *);   // use char*
+%ignore bzs::db::protocol::tdap::btrTimeStamp::toString(wchar_t *);             // use char*
+%ignore bzs::db::protocol::tdap::btrTimeStamp::fromString(const wchar_t *);     // use char*
+%ignore bzs::db::protocol::tdap::atobtrd(const wchar_t *);                  // use char*
+%ignore bzs::db::protocol::tdap::atobtrt(const wchar_t *);                  // use char*
+%ignore bzs::db::protocol::tdap::btrdtoa(int, wchar_t *);                   // use char*
+%ignore bzs::db::protocol::tdap::btrdtoa(int, wchar_t *, bool);             // use char*
+%ignore bzs::db::protocol::tdap::btrdtoa(const btrDate &, wchar_t *);       // use char*
+%ignore bzs::db::protocol::tdap::btrdtoa(const btrDate &, wchar_t *, bool); // use char*
+%ignore bzs::db::protocol::tdap::btrttoa(int, wchar_t *);                   // use char*
+%ignore bzs::db::protocol::tdap::btrttoa(int, wchar_t *, bool);             // use char*
+%ignore bzs::db::protocol::tdap::btrttoa(const btrTime &, wchar_t *);       // use char*
+%ignore bzs::db::protocol::tdap::btrttoa(const btrTime &, wchar_t *, bool); // use char*
+
+// * bzs/db/protocol/tdap/client/database.h *
+%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;
+
+// * bzs/db/protocol/tdap/client/field.h *
+%ignore bzs::db::protocol::tdap::client::field::operator=(const char*);
+%ignore bzs::db::protocol::tdap::client::field::operator=(const std::string&);
+%ignore bzs::db::protocol::tdap::client::field::operator=(int);
+%ignore bzs::db::protocol::tdap::client::field::operator=(float);
+%rename(setFV) bzs::db::protocol::tdap::client::field::operator=(const _TCHAR*);
+%rename(setFV) bzs::db::protocol::tdap::client::field::operator=(__int64);
+%rename(setFV) bzs::db::protocol::tdap::client::field::operator=(double);
+%rename(setFV) bzs::db::protocol::tdap::client::field::setBin;
+%rename(__clone) bzs::db::protocol::tdap::client::fielddefs::clone;
+  // getBin typemap
+%typemap(in, numinputs=0) (uint_td & size) (uint_td temp) {
+  $1 = &temp;
+}
+%typemap(argout) (uint_td & size) {
+  ZVAL_STRINGL($result, (char *)result, *$1, 1);
+}
+
+// * bzs/db/protocol/tdap/client/groupQuery.h *
+%rename(__clone) bzs::db::protocol::tdap::client::groupFuncBase::clone;
+%rename(__clone) bzs::db::protocol::tdap::client::avg::clone;
+%rename(__clone) bzs::db::protocol::tdap::client::count::clone;
+%rename(__clone) bzs::db::protocol::tdap::client::max::clone;
+%rename(__clone) bzs::db::protocol::tdap::client::min::clone;
+%rename(__clone) bzs::db::protocol::tdap::client::sum::clone;
+
+// * bzs/db/protocol/tdap/client/nsDatabase.h *
+%rename(__clone) bzs::db::protocol::tdap::client::nsdatabase::clone;
+
+// * bzs/db/protocol/tdap/client/recordset.h *
+%rename(__clone) bzs::db::protocol::tdap::client::recordset::clone;
+%ignore bzs::db::protocol::tdap::client::recordset::first;
+%ignore bzs::db::protocol::tdap::client::recordset::last;
+
+// * bzs/db/protocol/tdap/client/table.h *
+%ignore bzs::db::protocol::tdap::client::table::setFV(short, float); // use double
+%ignore bzs::db::protocol::tdap::client::table::setFV(short, unsigned char);  // use __int64
+%ignore bzs::db::protocol::tdap::client::table::setFV(short, short);          // use __int64
+%ignore bzs::db::protocol::tdap::client::table::setFV(short, int);            // use __int64
+%ignore bzs::db::protocol::tdap::client::table::setFV(const _TCHAR *, float); // use double
+%ignore bzs::db::protocol::tdap::client::table::setFV(const _TCHAR *, unsigned char); // use __int64
+%ignore bzs::db::protocol::tdap::client::table::setFV(const _TCHAR *, short);         // use __int64
+%ignore bzs::db::protocol::tdap::client::table::setFV(const _TCHAR *, int);           // use __int64
+%ignore bzs::db::protocol::tdap::client::table::setFVW;     // use setFV
+%ignore bzs::db::protocol::tdap::client::table::getFVWstr;  // use getFVstr
+  // define setFVbin
 %ignore bzs::db::protocol::tdap::client::table::setFV(short, const void *, uint_td);
+%ignore bzs::db::protocol::tdap::client::table::setFV(const _TCHAR*, 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);
@@ -125,31 +167,31 @@ typedef char  _TCHAR;
     return self->setFV(fieldName, (void const *) data, size);
   }
 };
-%typemap(in, numinputs=0) (uint_td & size) (uint_td temp) {
+  // fix getFVbin
+%typemap(in, numinputs=0) (uint_td & table_getFVbin_size) (uint_td temp) {
   $1 = &temp;
 }
-%typemap(argout) (uint_td & size) {
+%typemap(argout) (uint_td & table_getFVbin_size) {
   ZVAL_STRINGL($result, (char *)result, *$1, 1);
 }
+%extend bzs::db::protocol::tdap::client::table {
+  void* getFVbin(short index, uint_td& table_getFVbin_size)
+  {
+    return self->getFVbin(index, table_getFVbin_size);
+  }
+  void* getFVbin(const _TCHAR *fieldName, uint_td& table_getFVbin_size)
+  {
+    return self->getFVbin(fieldName, table_getFVbin_size);
+  }
+};
+%ignore bzs::db::protocol::tdap::client::table::getFVbin(short, uint_td&);
+%ignore bzs::db::protocol::tdap::client::table::getFVbin(const _TCHAR *, uint_td&);
 
 
 /* ===============================================
-  phpinfo
+  add code to init section
 =============================================== */
-#ifndef SWIGWIN
-%{
-  #define TRANSACTD_PHP_REQUIRED_MODULE_PREFIX "lib"
+%init %{
+    bzs::db::protocol::tdap::client::nsdatabase::setCheckTablePtr(true);
 %}
-#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 ===============