transactd 2.0.1 → 2.1.0

data/build/swig/tdcl.i

@@ -34,8 +34,8 @@
 
 // Suppress warnings
 #pragma SWIG nowarn=SWIGWARN_PARSE_USING_UNDEF
+#pragma SWIG nowarn=SWIGWARN_PARSE_UNNAMED_NESTED_CLASS
 %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) btrstoa;
-%warnfilter(SWIGWARN_PARSE_UNNAMED_NESTED_CLASS) nstable;
 
 
 /* ===============================================
@@ -65,15 +65,13 @@ validatablePointerList g_vPtrList;
 #include <bzs/db/blobStructs.h>
 #include <bzs/db/protocol/tdap/mysql/characterset.h>
 #include <bzs/db/transactd/connectionRecord.h>
-%}
-#ifndef SWIGWIN
-%{
+
+#ifdef LINUX
 #include <linux/linuxTypes.h>
 #include <linux/charsetConvert.h>
 #include <bzs/env/mbcswchrLinux.h>
-%}
 #endif
-%{
+
 #include <bzs/env/tstring.h>
 #include <bzs/rtl/benchmark.h>
 #include <bzs/rtl/datetime.h>
@@ -131,9 +129,14 @@ using namespace bzs::db::protocol::tdap::client;
 %newobject *::create;
 %newobject *::createObject;
 %newobject *::openTable;
+%newobject *::prepare;
+%newobject *::setQuery;
 %delobject *::release;
 
 // * bzs/env/mbcswchrLinux.h *
+%ignore bzs::env::initCvtProcess;
+%ignore bzs::env::deinitCvtProcess;
+%ignore bzs::env::getCvt;
 %ignore bzs::env::u8mbcvt;
 %ignore bzs::env::mbu8cvt;
 %ignore bzs::env::mbcscvt;
@@ -148,7 +151,9 @@ using namespace bzs::db::protocol::tdap::client;
 // * bzs/db/protocol/tdap/client/activeTable.h *
 %ignore bzs::db::protocol::tdap::client::activeTable::create;
 %ignore bzs::db::protocol::tdap::client::activeTable::releaseTable;
-  // activeTable::read returns new object
+%ignore bzs::db::protocol::tdap::client::preparedQuery::getFilter;
+  // activeTable::read and activeTable::prepare returns new object
+%newobject bzs::db::protocol::tdap::client::activeTable::prepare;
 %newobject bzs::db::protocol::tdap::client::activeTable::read;
 %extend bzs::db::protocol::tdap::client::activeTable {
   recordset* read(queryBase& q) {
@@ -156,7 +161,100 @@ using namespace bzs::db::protocol::tdap::client;
     self->read(*rs, q);
     return rs;
   }
+
+  //read(preparedQuery* q) It can give place holder values(0-8)
+  recordset* read(preparedQuery* q, int v) {
+    recordset* rs = recordset::create();
+    self->read(*rs, q->getFilter(), v);
+    return rs;
+  }
+  preparedQuery* prepare(queryBase& q, bool serverPrepare=false) {
+    preparedQuery* p = new preparedQuery(self->prepare(q, serverPrepare));
+    return p;
+  }
+  // join and outerJoin with preparedQuery.
+#if defined(SWIGPHP)
+  // For PHP fixed number of paramatars.
+  activeTable& join(recordset& rs, preparedQuery* q, const _TCHAR* name1,
+                      const _TCHAR* name2, const _TCHAR* name3,
+                      const _TCHAR* name4, const _TCHAR* name5,
+                      const _TCHAR* name6, const _TCHAR* name7,
+                      const _TCHAR* name8) {
+    self->join(rs, q->getFilter(), name1, name2, name3, name4, name5, name6,
+               name7, name8);
+    return *self;
+  }
+  activeTable& outerJoin(recordset& rs, preparedQuery* q, const _TCHAR* name1,
+                      const _TCHAR* name2, const _TCHAR* name3,
+                      const _TCHAR* name4, const _TCHAR* name5,
+                      const _TCHAR* name6, const _TCHAR* name7,
+                      const _TCHAR* name8) {
+    self->outerJoin(rs, q->getFilter(), name1, name2, name3, name4, name5, name6,
+               name7, name8);
+    return *self;
+  }
+  activeTable& join(recordset& rs, queryBase& q, const _TCHAR* name1,
+                      const _TCHAR* name2, const _TCHAR* name3,
+                      const _TCHAR* name4, const _TCHAR* name5,
+                      const _TCHAR* name6, const _TCHAR* name7,
+                      const _TCHAR* name8) {
+    self->join(rs, q, name1, name2, name3, name4, name5, name6,
+               name7, name8);
+    return *self;
+  }
+  activeTable& outerJoin(recordset& rs, queryBase& q, const _TCHAR* name1,
+                      const _TCHAR* name2, const _TCHAR* name3,
+                      const _TCHAR* name4, const _TCHAR* name5,
+                      const _TCHAR* name6, const _TCHAR* name7,
+                      const _TCHAR* name8) {
+    self->outerJoin(rs, q, name1, name2, name3, name4, name5, name6,
+               name7, name8);
+    return *self;
+  }
+#else
+  activeTable& join(recordset& rs, preparedQuery* q, const _TCHAR* name1,
+                      const _TCHAR* name2 = NULL, const _TCHAR* name3 = NULL,
+                      const _TCHAR* name4 = NULL, const _TCHAR* name5 = NULL,
+                      const _TCHAR* name6 = NULL, const _TCHAR* name7 = NULL,
+                      const _TCHAR* name8 = NULL) {
+    self->join(rs, q->getFilter(), name1, name2, name3, name4, name5, name6,
+               name7, name8);
+    return *self;
+  }
+  activeTable& outerJoin(recordset& rs, preparedQuery* q, const _TCHAR* name1,
+                      const _TCHAR* name2 = NULL, const _TCHAR* name3 = NULL,
+                      const _TCHAR* name4 = NULL, const _TCHAR* name5 = NULL,
+                      const _TCHAR* name6 = NULL, const _TCHAR* name7 = NULL,
+                      const _TCHAR* name8 = NULL) {
+    self->outerJoin(rs, q->getFilter(), name1, name2, name3, name4, name5, name6,
+               name7, name8);
+    return *self;
+  }
+  activeTable& join(recordset& rs, queryBase& q, const _TCHAR* name1,
+                      const _TCHAR* name2 = NULL, const _TCHAR* name3 = NULL,
+                      const _TCHAR* name4 = NULL, const _TCHAR* name5 = NULL,
+                      const _TCHAR* name6 = NULL, const _TCHAR* name7 = NULL,
+                      const _TCHAR* name8 = NULL) {
+    self->join(rs, q, name1, name2, name3, name4, name5, name6,
+               name7, name8);
+    return *self;
+  }
+  activeTable& outerJoin(recordset& rs, queryBase& q, const _TCHAR* name1,
+                      const _TCHAR* name2 = NULL, const _TCHAR* name3 = NULL,
+                      const _TCHAR* name4 = NULL, const _TCHAR* name5 = NULL,
+                      const _TCHAR* name6 = NULL, const _TCHAR* name7 = NULL,
+                      const _TCHAR* name8 = NULL) {
+    self->outerJoin(rs, q, name1, name2, name3, name4, name5, name6,
+               name7, name8);
+    return *self;
+  }
+#endif
 };
+  // ignore original methods
+%ignore bzs::db::protocol::tdap::client::activeTable::read;
+%ignore bzs::db::protocol::tdap::client::activeTable::prepare;
+%ignore bzs::db::protocol::tdap::client::activeTable::join;
+%ignore bzs::db::protocol::tdap::client::activeTable::outerJoin;
   // create and release methods for activeTable class
 %extend bzs::db::protocol::tdap::client::activeTable {
   activeTable(idatabaseManager* mgr, const _TCHAR* tableName) {
@@ -182,11 +280,14 @@ using namespace bzs::db::protocol::tdap::client;
   void release() {
     self->releaseTable();
   }
+  table* table() {
+    return self->table().get();
+  }
 };
   // ignore original methods
 %ignore bzs::db::protocol::tdap::client::activeTable::activeTable;
 %ignore bzs::db::protocol::tdap::client::activeTable::~activeTable;
-
+%ignore bzs::db::protocol::tdap::client::activeTable::table;
 
 // * bzs/db/protocol/tdap/btrDate.h *
 %ignore bzs::db::protocol::tdap::bdate;
@@ -256,6 +357,7 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::dbdef::getFileSpec;
 %ignore bzs::db::protocol::tdap::client::dbdef::popBackup;
 %ignore bzs::db::protocol::tdap::client::dbdef::pushBackup;
+%ignore bzs::db::protocol::tdap::client::dbdef::relateData;
 %ignore bzs::db::protocol::tdap::client::dbdef::setStat;
 
 // * bzs/db/protocol/tdap/client/field.h *
@@ -269,10 +371,10 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::field::operator=(const std::_tstring&);
 %ignore bzs::db::protocol::tdap::client::field::initialize;
 %ignore bzs::db::protocol::tdap::client::field::isCompPartAndMakeValue;
+%ignore bzs::db::protocol::tdap::client::field::offsetBlobPtr;
 %ignore bzs::db::protocol::tdap::client::field::ptr;
-%ignore bzs::db::protocol::tdap::client::fielddefs::operator[] (const std::_tstring&) const;
 %ignore bzs::db::protocol::tdap::client::fielddefs::create;
-%rename(getFielddef) bzs::db::protocol::tdap::client::fielddefs::operator[] (int index) const;
+%ignore bzs::db::protocol::tdap::client::getFieldType;
   // create and release methods for fielddefs class
 %extend bzs::db::protocol::tdap::client::fielddefs {
   fielddefs() {
@@ -287,9 +389,12 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::fielddefs::~fielddefs;
 
 // * bzs/db/protocol/tdap/client/fields.h *
+%ignore bzs::db::protocol::tdap::client::MEM_ALLOC_TYPE_NONE;
+%ignore bzs::db::protocol::tdap::client::MEM_ALLOC_TYPE_ONE;
+%ignore bzs::db::protocol::tdap::client::MEM_ALLOC_TYPE_ARRAY;
 %ignore bzs::db::protocol::tdap::client::fields;
-%ignore bzs::db::protocol::tdap::client::fieldsBase::operator[](const std::_tstring&) const;
 %ignore bzs::db::protocol::tdap::client::fieldsBase::fd;
+%ignore bzs::db::protocol::tdap::client::fieldsBase::getFieldNoCheck;
 %ignore bzs::db::protocol::tdap::client::fieldsBase::setInvalidRecord;
   // add methods
 %extend bzs::db::protocol::tdap::client::fieldsBase {
@@ -308,12 +413,14 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::fieldNames::operator=;
 %ignore bzs::db::protocol::tdap::client::fieldNames::create;
 %ignore bzs::db::protocol::tdap::client::groupFuncBase::operator=;
+%ignore bzs::db::protocol::tdap::client::groupFuncBase::operator();
 %ignore bzs::db::protocol::tdap::client::groupQuery::operator=;
 %ignore bzs::db::protocol::tdap::client::groupQuery::create;
 %ignore bzs::db::protocol::tdap::client::max::create;
 %ignore bzs::db::protocol::tdap::client::min::create;
 %ignore bzs::db::protocol::tdap::client::recordsetQuery::operator=;
 %ignore bzs::db::protocol::tdap::client::recordsetQuery::create;
+%ignore bzs::db::protocol::tdap::client::recordsetQuery::internalQuery;
 %ignore bzs::db::protocol::tdap::client::sortField;
 %ignore bzs::db::protocol::tdap::client::sortFields;
 %ignore bzs::db::protocol::tdap::client::sortFields::operator[];
@@ -418,6 +525,7 @@ using namespace bzs::db::protocol::tdap::client;
 // * bzs/db/protocol/tdap/client/memRecord.h *
 %ignore bzs::db::protocol::tdap::client::autoMemory;
 %ignore bzs::db::protocol::tdap::client::autoMemory::operator=;
+%ignore bzs::db::protocol::tdap::client::JOINLIMIT_PER_RECORD;
 %ignore bzs::db::protocol::tdap::client::memoryRecord::clear;
 %ignore bzs::db::protocol::tdap::client::memoryRecord::create;
 %ignore bzs::db::protocol::tdap::client::memoryRecord::setRecordData;
@@ -428,7 +536,7 @@ using namespace bzs::db::protocol::tdap::client;
     return bzs::db::protocol::tdap::client::memoryRecord::create(fds);
   }
   ~memoryRecord() {
-    bzs::db::protocol::tdap::client::memoryRecord::release(self);
+    self->release();
   }
 };
   // ignore original methods
@@ -443,18 +551,34 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::nsdatabase::getDllUnloadCallbackFunc;
 %ignore bzs::db::protocol::tdap::client::nsdatabase::isTestPtrIgnore;
 %ignore bzs::db::protocol::tdap::client::nsdatabase::localSharing;
+%ignore bzs::db::protocol::tdap::client::nsdatabase::maxtables;
 %ignore bzs::db::protocol::tdap::client::nsdatabase::setTestPtrIgnore;
 %ignore bzs::db::protocol::tdap::client::nsdatabase::testTablePtr;
+%ignore bzs::db::protocol::tdap::client::nsdatabase::setTrnsctdEntryPoint;
+%ignore bzs::db::protocol::tdap::client::nsdatabase::getTrnsctdEntryPoint;
+%ignore bzs::db::protocol::tdap::client::nsdatabase::getBtrvEntryPoint;
+%ignore bzs::db::protocol::tdap::client::nsdatabase::setBtrvEntryPoint;
 
 // * bzs/db/protocol/tdap/client/nsTable.h *
+%ignore bzs::db::protocol::tdap::client::nstable::buflen;
 %ignore bzs::db::protocol::tdap::client::nstable::data;
 %ignore bzs::db::protocol::tdap::client::nstable::setBuflen;
 %ignore bzs::db::protocol::tdap::client::nstable::setData;
 %ignore bzs::db::protocol::tdap::client::nstable::setStat;
+%ignore bzs::db::protocol::tdap::client::nstable::tdap;
 %ignore bzs::db::protocol::tdap::client::nstable::test;
 %ignore bzs::db::protocol::tdap::client::nstable::throwError;
 %rename(tdapLastErr) bzs::db::protocol::tdap::client::nstable::tdapErr(HWND, _TCHAR*);
 
+// * bzs/db/protocol/tdap/client/pooledDatabaseManager.h *
+%ignore bzs::db::protocol::tdap::client::xaTransaction;
+%extend bzs::db::protocol::tdap::client::pooledDbManager {
+  table* table(const _TCHAR* name) {
+    return self->table(name).get();
+  }
+}
+%ignore bzs::db::protocol::tdap::client::pooledDbManager::table;
+
 // * bzs/db/protocol/tdap/client/recordset.h *
 %ignore bzs::db::protocol::tdap::client::recordset::operator=;
 %ignore bzs::db::protocol::tdap::client::recordset::create;
@@ -480,6 +604,7 @@ using namespace bzs::db::protocol::tdap::client;
 
 // * bzs/db/protocol/tdap/client/table.h *
 %ignore bzs::db::protocol::tdap::client::keyValuePtr;
+%ignore bzs::db::protocol::tdap::client::makeSupplyValues;
 %ignore bzs::db::protocol::tdap::client::mra_nojoin;
 %ignore bzs::db::protocol::tdap::client::mra_first;
 %ignore bzs::db::protocol::tdap::client::mra_nextrows;
@@ -488,17 +613,30 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::mra_current_block;
 %ignore bzs::db::protocol::tdap::client::multiRecordAlocator;
 %ignore bzs::db::protocol::tdap::client::query::create;
+%ignore bzs::db::protocol::tdap::client::queryBase::reset;
 %ignore bzs::db::protocol::tdap::client::queryBase::operator=;
 %ignore bzs::db::protocol::tdap::client::queryBase::addField;
 %ignore bzs::db::protocol::tdap::client::queryBase::addLogic;
 %ignore bzs::db::protocol::tdap::client::queryBase::addSeekKeyValuePtr;
-%ignore bzs::db::protocol::tdap::client::queryBase::reserveSeekKeyValuePtrSize;
+%ignore bzs::db::protocol::tdap::client::queryBase::create;
+%ignore bzs::db::protocol::tdap::client::queryBase::joinKeySize;
 %ignore bzs::db::protocol::tdap::client::queryBase::queryBase;
 %ignore bzs::db::protocol::tdap::client::queryBase::~queryBase;
-%ignore bzs::db::protocol::tdap::client::queryBase::create;
+%ignore bzs::db::protocol::tdap::client::queryBase::reserveSeekKeyValuePtrSize;
+%ignore bzs::db::protocol::tdap::client::supplyInValues;
+%ignore bzs::db::protocol::tdap::client::supplyValue;
+%ignore bzs::db::protocol::tdap::client::supplyValues;
+%ignore bzs::db::protocol::tdap::client::supplyInValues;
+%ignore bzs::db::protocol::tdap::client::table::buflen;
 %ignore bzs::db::protocol::tdap::client::table::fieldPtr;
 %ignore bzs::db::protocol::tdap::client::table::getCurProcFieldCount;
 %ignore bzs::db::protocol::tdap::client::table::getCurProcFieldIndex;
+%ignore bzs::db::protocol::tdap::client::table::mra;
+%ignore bzs::db::protocol::tdap::client::table::tdap;
+%ignore bzs::db::protocol::tdap::client::table::setMra;
+%ignore bzs::db::protocol::tdap::client::table::setFVA;
+%ignore bzs::db::protocol::tdap::client::table::getFVAstr;
+
   // create and release methods for query class
 %extend bzs::db::protocol::tdap::client::query {
   query() {
@@ -522,6 +660,26 @@ using namespace bzs::db::protocol::tdap::client;
     return keyValueDescription_buf;
   }
 };
+  // table::prepare and table::setQuery returns new object
+%newobject bzs::db::protocol::tdap::client::table::prepare;
+%newobject bzs::db::protocol::tdap::client::table::setQuery;
+%extend bzs::db::protocol::tdap::client::table {
+  preparedQuery* prepare(const queryBase* q, bool serverPrepare=false) {
+    preparedQuery* p = new preparedQuery(self->setQuery(q, serverPrepare));
+    return p;
+  }
+  preparedQuery* setQuery(const queryBase* q, bool serverPrepare=false) {
+    preparedQuery* p = new preparedQuery(self->setQuery(q, serverPrepare));
+    return p;
+  }
+  void setPrepare(preparedQuery* q) {
+    self->setPrepare(q->getFilter());
+  }
+};
+  // ignore original methods
+%ignore bzs::db::protocol::tdap::client::table::prepare;
+%ignore bzs::db::protocol::tdap::client::table::setQuery;
+%ignore bzs::db::protocol::tdap::client::table::setPrepare;
   // create and release methods for table class
 %extend bzs::db::protocol::tdap::client::table {
   void release() {
@@ -579,6 +737,7 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::lexical_cast;
 %ignore bzs::db::protocol::tdap::client::openDatabase;
 %ignore bzs::db::protocol::tdap::client::openTable;
+%ignore bzs::db::protocol::tdap::client::prepare;
 %ignore bzs::db::protocol::tdap::client::readIndex;
 %ignore bzs::db::protocol::tdap::client::readIndex_v;
 %ignore bzs::db::protocol::tdap::client::readIndexRv;
@@ -587,6 +746,7 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::readStepRv;
 %ignore bzs::db::protocol::tdap::client::releaseDatabase;
 %ignore bzs::db::protocol::tdap::client::releaseTable;
+%ignore bzs::db::protocol::tdap::client::setQuery;
 %ignore bzs::db::protocol::tdap::client::snapshot;
 %ignore bzs::db::protocol::tdap::client::tableIterator;
 %ignore bzs::db::protocol::tdap::client::tableIterator::operator++;
@@ -601,6 +761,9 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::filter_validate_value;
 %ignore bzs::db::protocol::tdap::client::filter_validate_block;
 %ignore bzs::db::protocol::tdap::client::filter_invalidate_value;
+%ignore bzs::db::protocol::tdap::client::host;
+%ignore bzs::db::protocol::tdap::client::dbname;
+%ignore bzs::db::protocol::tdap::client::schemaTable;
 
 // * bzs/db/protocol/tdap/client/trdormapi.h *
 %ignore bzs::db::protocol::tdap::client::setValue;
@@ -616,6 +779,29 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::sort;
 %ignore bzs::db::protocol::tdap::client::mraResetter;
 
+// * bzs/db/protocol/tdap/tdapcapi.h *
+%ignore BOOKMARK_ALLOC_SIZE;
+%ignore BTRV_MAX_DATA_SIZE;
+%ignore C_INTERFACE_VER_MAJOR;
+%ignore C_INTERFACE_VER_MINOR;
+%ignore C_INTERFACE_VER_RELEASE;
+%ignore C_INTERFACE_VERSTR;
+%ignore FILTER_COMBINE_NOPREPARE;
+%ignore FILTER_COMBINE_PREPARE;
+%ignore FILTER_TYPE_SEEKS;
+%ignore FILTER_TYPE_SUPPLYVALUE;
+%ignore FILTER_TYPE_FORWORD;
+%ignore STATUS_LMIT_OF_PREPAREED;
+%ignore STATUS_INVALID_EX_DESC;
+%ignore STATUS_INVALID_EX_INS;
+%ignore STATUS_INVALID_PREPAREID;
+%ignore STATUS_INVALID_SUPPLYVALUES;
+%ignore TDAP_MAX_DATA_SIZE;
+%ignore TDCLC_LIBNAME;
+%ignore TD_CPP_LIB_PRE;
+%ignore TD_FILTER_PREPARE;
+%ignore TD_LIB_PART;
+
 // * bzs/db/protocol/tdap/tdapSchema.h *
 %ignore DLLUNLOADCALLBACK_PTR;
 %ignore dllUnloadCallback;
@@ -626,14 +812,17 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::fielddef::chainChar;
 %ignore bzs::db::protocol::tdap::fielddef::dataLen;
 %ignore bzs::db::protocol::tdap::fielddef::getKeyValueFromKeybuf;
+%ignore bzs::db::protocol::tdap::fielddef::isBlob;
 %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::maxVarDatalen;
 %ignore bzs::db::protocol::tdap::fielddef::nameA;
+%ignore bzs::db::protocol::tdap::fielddef::setBlobFieldPointer;
 %ignore bzs::db::protocol::tdap::fielddef::setChainChar;
 %ignore bzs::db::protocol::tdap::fielddef::setNameA;
 %ignore bzs::db::protocol::tdap::fielddef::unPackCopy;
+%ignore bzs::db::protocol::tdap::fielddef::varLenByteForKey;
 %ignore bzs::db::protocol::tdap::fielddef_t::defValue;
 %ignore bzs::db::protocol::tdap::fielddef_t::defViewWidth;
 %ignore bzs::db::protocol::tdap::fielddef_t::enableFlags;
@@ -644,6 +833,7 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::fielddef_t::lookFields;
 %ignore bzs::db::protocol::tdap::fielddef_t::lookTable;
 %ignore bzs::db::protocol::tdap::fielddef_t::userOption;
+%ignore bzs::db::protocol::tdap::fielddef_t::varLenByteForKey;
 %ignore bzs::db::protocol::tdap::fielddef_t::viewNum;
 %ignore bzs::db::protocol::tdap::fielddef_t::viewWidth;
 %ignore bzs::db::protocol::tdap::tabledef::autoIncExSpace;
@@ -661,7 +851,6 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::tabledef::treeIndex;
 %ignore bzs::db::protocol::tdap::tabledef::setFileNameA;
 %ignore bzs::db::protocol::tdap::tabledef::setTableNameA;
-
   // add methods
 %extend bzs::db::protocol::tdap::keydef {
   keySegment* segment(const int index)
@@ -679,6 +868,13 @@ using namespace bzs::db::protocol::tdap::client;
     return &(self->keyDefs[index]);
   }
 };
+%extend bzs::db::protocol::tdap::fielddef {
+  const char* name() const
+  {
+     return self->name();
+  }
+}
+%ignore bzs::db::protocol::tdap::fielddef::name;
 %extend bzs::db::protocol::tdap::btrVersions {
   btrVersion* version(const int index) {
     return &(self->versions[index]);
@@ -738,31 +934,14 @@ using namespace bzs::db::protocol::tdap::client;
 /* ===============================================
       template
 =============================================== */
+/*
+C++ templates are not supported in SWIG.
+Template methods are declared only one signature pattern here.
+We need to change the wrap_cpp manually to expand template codes.
+*/
+
 // * bzs/db/protocol/tdap/client/activeTable.h *
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<_TCHAR*>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<_TCHAR*, _TCHAR*>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<_TCHAR*, _TCHAR*, _TCHAR*>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<_TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<_TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<_TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<_TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*>;
 %template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<_TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<__int64>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<__int64, __int64>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<__int64, __int64, __int64>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<__int64, __int64, __int64, __int64>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<__int64, __int64, __int64, __int64, __int64>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<__int64, __int64, __int64, __int64, __int64, __int64>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<__int64, __int64, __int64, __int64, __int64, __int64, __int64>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<__int64, __int64, __int64, __int64, __int64, __int64, __int64, __int64>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<double>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<double, double>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<double, double, double>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<double, double, double, double>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<double, double, double, double, double>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<double, double, double, double, double, double>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<double, double, double, double, double, double, double>;
-%template(keyValue) bzs::db::protocol::tdap::client::activeTable::keyValue<double, double, double, double, double, double, double, double>;
 
 // * bzs/db/protocol/tdap/client/groupQuery.h *
 %template(when) bzs::db::protocol::tdap::client::recordsetQuery::when<_TCHAR*>;
@@ -773,31 +952,7 @@ using namespace bzs::db::protocol::tdap::client;
 %template(where) bzs::db::protocol::tdap::client::query::where<_TCHAR*>;
 %template(and_) bzs::db::protocol::tdap::client::query::and_<_TCHAR*>;
 %template(or_)  bzs::db::protocol::tdap::client::query::or_<_TCHAR*>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<_TCHAR*>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<_TCHAR*, _TCHAR*>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<_TCHAR*, _TCHAR*, _TCHAR*>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<_TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<_TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<_TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<_TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*>;
 %template(in)   bzs::db::protocol::tdap::client::query::in<_TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*, _TCHAR*>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<__int64>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<__int64, __int64>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<__int64, __int64, __int64>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<__int64, __int64, __int64, __int64>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<__int64, __int64, __int64, __int64, __int64>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<__int64, __int64, __int64, __int64, __int64, __int64>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<__int64, __int64, __int64, __int64, __int64, __int64, __int64>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<__int64, __int64, __int64, __int64, __int64, __int64, __int64, __int64>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<double>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<double, double>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<double, double, double>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<double, double, double, double>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<double, double, double, double, double>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<double, double, double, double, double, double>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<double, double, double, double, double, double, double>;
-%template(in)   bzs::db::protocol::tdap::client::query::in<double, double, double, double, double, double, double, double>;
-
 /* ===============================================
       cpointer
 =============================================== */