transactd 1.2.0 → 2.0.0

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

@@ -16,7 +16,6 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.
  ================================================================= */
-//#define BOOST_TEST_MAIN
 //#define BOOST_TEST_MODULE
 
 #include <boost/test/included/unit_test.hpp>
@@ -28,16 +27,18 @@
 #include <bzs/db/protocol/tdap/client/stringConverter.h>
 #include <stdio.h>
 #include <bzs/db/protocol/tdap/client/filter.h>
+#include <bzs/example/queryData.h>
+#include <bzs/db/protocol/tdap/client/activeTable.h>
 
+#include <bzs/db/protocol/tdap/client/pooledDatabaseManager.h>
 
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
 using namespace std;
 
 #define PROTOCOL _T("tdap")
-static _TCHAR HOSTNAME[MAX_PATH] =
-{_T("127.0.0.1")};
-#define DBNAME	 _T("test")
+static _TCHAR HOSTNAME[MAX_PATH] = { _T("127.0.0.1") };
+#define DBNAME _T("test")
 #define BDFNAME _T("test.bdf")
 // #define ISOLATION_REPEATABLE_READ
 #define ISOLATION_READ_COMMITTED
@@ -53,11 +54,12 @@ boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[])
         if (strstr(argv[i], "--host=") == argv[i])
         {
 #ifdef _UNICODE
-            MultiByteToWideChar(CP_ACP, (CP_ACP == CP_UTF8) ? 0 : MB_PRECOMPOSED, argv[i] + 7, -1, HOSTNAME, MAX_PATH);
+            MultiByteToWideChar(CP_ACP,
+                                (CP_ACP == CP_UTF8) ? 0 : MB_PRECOMPOSED,
+                                argv[i] + 7, -1, HOSTNAME, MAX_PATH);
 #else
             strcpy_s(HOSTNAME, MAX_PATH, argv[i] + 7);
 #endif
-
         }
     }
     return 0;
@@ -65,14 +67,15 @@ boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[])
 
 static _TCHAR g_uri[MAX_PATH];
 
-const _TCHAR* makeUri(const _TCHAR* protocol, const _TCHAR* host, const _TCHAR* dbname, const _TCHAR* dbfile = NULL)
+const _TCHAR* makeUri(const _TCHAR* protocol, const _TCHAR* host,
+                      const _TCHAR* dbname, const _TCHAR* dbfile = NULL)
 {
     if (dbfile)
-        _stprintf_s(g_uri, MAX_PATH, _T("%s://%s/%s?dbfile=%s"), protocol, host, dbname, dbfile);
+        _stprintf_s(g_uri, MAX_PATH, _T("%s://%s/%s?dbfile=%s"), protocol, host,
+                    dbname, dbfile);
     else
         _stprintf_s(g_uri, MAX_PATH, _T("%s://%s/%s"), protocol, host, dbname);
     return g_uri;
-
 }
 
 class fixture
@@ -82,6 +85,7 @@ class fixture
 public:
     fixture() : m_db(NULL)
     {
+        nsdatabase::setCheckTablePtr(true);
         m_db = database::create();
         if (!m_db)
             printf("Error database::create()\n");
@@ -90,18 +94,47 @@ public:
     ~fixture()
     {
         if (m_db)
-			database::destroy(m_db);
+        {
+            // Test for SWIG interface
+            m_db->release();
+            // Test for c++
+            // database::destroy(m_db);
+        }
     }
 
-    ::database* db() const {return m_db;}
+    ::database* db() const { return m_db; }
 };
 
-table* openTable(database* db)
+class fixtureQuery
 {
+    database_ptr m_db;
+
+public:
+    fixtureQuery()
+    {
+        m_db = createDatabaseObject();
+        if (!m_db)
+            printf("Error database::create()\n");
+        connectParams param(PROTOCOL, HOSTNAME, _T("querytest"),
+                            _T("test.bdf"));
+        param.setMode(TD_OPEN_NORMAL);
+
+        prebuiltData(m_db, param);
+    }
+
+    ~fixtureQuery() {}
 
-    db->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME), TYPE_SCHEMA_BDF, TD_OPEN_NORMAL);
+    database* db() const { return m_db.get(); }
+};
+
+table* openTable(database* db, short dbmode = TD_OPEN_NORMAL,
+                 short tbmode = TD_OPEN_NORMAL)
+{
+
+    db->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME), TYPE_SCHEMA_BDF,
+             dbmode);
     BOOST_CHECK_MESSAGE(0 == db->stat(), "open 1" << db->stat());
-    table* tb = db->openTable(_T("user"));
+    table* tb = db->openTable(_T("user"), tbmode);
     BOOST_CHECK_MESSAGE(0 == db->stat(), "openTable" << db->stat());
     return tb;
 }
@@ -117,25 +150,46 @@ void testDropDatabase(database* db)
 
 void testClone(database* db)
 {
+    db->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME), TYPE_SCHEMA_BDF,
+             TD_OPEN_NORMAL);
+
     database* db2 = db->clone();
     BOOST_CHECK_MESSAGE(db2 != NULL, "createNewDataBase stat = " << db->stat());
+    db2->close();
+    db2->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME), TYPE_SCHEMA_BDF,
+              TD_OPEN_NORMAL);
+
+    BOOST_CHECK_MESSAGE(db2->stat() == 0, "db2 close stat = " << db2->stat());
+    db->close();
+    BOOST_CHECK_MESSAGE(db->stat() == 0, "db close stat = " << db->stat());
+    table* tb = db2->openTable(_T("user"), TD_OPEN_NORMAL);
+    BOOST_CHECK_MESSAGE(0 == db2->stat(), "openTable" << db2->stat());
     if (db2)
-		database::destroy(db2);
+        db2->release();
+    bool ret = nsdatabase::testTablePtr(tb);
+    BOOST_CHECK_MESSAGE(ret == true, "testTablePtr");
+    tb->release();
+
+    ret = nsdatabase::testTablePtr(tb);
+    BOOST_CHECK_MESSAGE(ret == false, "testTablePtr");
 }
 
 void testCreateNewDataBase(database* db)
 {
 
-	db->create(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME));
+    db->create(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME));
     if (db->stat() == STATUS_TABLE_EXISTS_ERROR)
     {
         testDropDatabase(db);
         db->create(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME));
     }
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "createNewDataBase stat = " << db->stat());
+    BOOST_CHECK_MESSAGE(0 == db->stat(),
+                        "createNewDataBase stat = " << db->stat());
     // create table
-    db->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME), TYPE_SCHEMA_BDF, TD_OPEN_NORMAL);
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "createNewDataBase 1 stat = " << db->stat());
+    db->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME), TYPE_SCHEMA_BDF,
+             TD_OPEN_NORMAL);
+    BOOST_CHECK_MESSAGE(0 == db->stat(),
+                        "createNewDataBase 1 stat = " << db->stat());
 
     dbdef* def = db->dbDef();
     if (def)
@@ -150,35 +204,40 @@ void testCreateNewDataBase(database* db)
         td.replicaKeyNum = -1;
         td.pageSize = 2048;
         def->insertTable(&td);
-        BOOST_CHECK_MESSAGE(0 == def->stat(), "insertTable stat = " << def->stat());
+        BOOST_CHECK_MESSAGE(0 == def->stat(),
+                            "insertTable stat = " << def->stat());
 
         fielddef* fd = def->insertField(1, 0);
         fd->setName(_T("id"));
         fd->type = ft_integer;
         fd->len = (ushort_td)4;
         def->updateTableDef(1);
-        BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 1 stat = " << def->stat());
+        BOOST_CHECK_MESSAGE(0 == def->stat(),
+                            "updateTableDef 1 stat = " << def->stat());
 
         fd = def->insertField(1, 1);
         fd->setName(_T("name"));
         fd->type = ft_zstring;
         fd->len = (ushort_td)33;
         def->updateTableDef(1);
-        BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 2 stat = " << def->stat());
+        BOOST_CHECK_MESSAGE(0 == def->stat(),
+                            "updateTableDef 2 stat = " << def->stat());
 
         fd = def->insertField(1, 2);
         fd->setName(_T("select"));
         fd->type = ft_integer;
         fd->len = (ushort_td)4;
         def->updateTableDef(1);
-        BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 2 stat = " << def->stat());
+        BOOST_CHECK_MESSAGE(0 == def->stat(),
+                            "updateTableDef 2 stat = " << def->stat());
 
         fd = def->insertField(1, 3);
         fd->setName(_T("in"));
         fd->type = ft_integer;
         fd->len = (ushort_td)4;
         def->updateTableDef(1);
-        BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 2 stat = " << def->stat());
+        BOOST_CHECK_MESSAGE(0 == def->stat(),
+                            "updateTableDef 2 stat = " << def->stat());
 
         keydef* kd = def->insertKey(1, 0);
         kd->segments[0].fieldNum = 0;
@@ -187,16 +246,16 @@ void testCreateNewDataBase(database* db)
         kd->segmentCount = 1;
 
         def->updateTableDef(1);
-        BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 3 stat = " << def->stat());
-
+        BOOST_CHECK_MESSAGE(0 == def->stat(),
+                            "updateTableDef 3 stat = " << def->stat());
     }
-
 }
 
 void testVersion(database* db)
 {
     db->connect(makeUri(PROTOCOL, HOSTNAME, DBNAME));
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "Version connect stat = " << db->stat());
+    BOOST_CHECK_MESSAGE(0 == db->stat(),
+                        "Version connect stat = " << db->stat());
     if (0 == db->stat())
     {
         btrVersions vv;
@@ -204,23 +263,34 @@ void testVersion(database* db)
         BOOST_CHECK_MESSAGE(0 == db->stat(), "Version");
         if (_tcscmp(PROTOCOL, _T("tdap")) == 0)
         {
-            BOOST_CHECK_MESSAGE(atoi(CPP_INTERFACE_VER_MAJOR) == vv.versions[0].majorVersion,
+            BOOST_CHECK_MESSAGE(
+                atoi(CPP_INTERFACE_VER_MAJOR) == vv.versions[0].majorVersion,
                 "clent_Major = " << vv.versions[0].majorVersion);
-            BOOST_CHECK_MESSAGE(atoi(CPP_INTERFACE_VER_MINOR) == vv.versions[0].minorVersion,
+            BOOST_CHECK_MESSAGE(
+                atoi(CPP_INTERFACE_VER_MINOR) == vv.versions[0].minorVersion,
                 "clent_Miner = " << vv.versions[0].minorVersion);
-            BOOST_CHECK_MESSAGE((int)'N' == (int)vv.versions[0].type, "clent_Type = " << vv.versions[0].type);
+            BOOST_CHECK_MESSAGE((int)'N' == (int)vv.versions[0].type,
+                                "clent_Type = " << vv.versions[0].type);
 
-            BOOST_CHECK_MESSAGE(((5 == vv.versions[1].majorVersion)||(10 == vv.versions[1].majorVersion)),
+            BOOST_CHECK_MESSAGE(
+                ((5 == vv.versions[1].majorVersion) ||
+                 (10 == vv.versions[1].majorVersion)),
                 "mysql_server_Major = " << vv.versions[1].majorVersion);
-            BOOST_CHECK_MESSAGE(((5 <= vv.versions[1].minorVersion)||(0 == vv.versions[1].minorVersion)),
+            BOOST_CHECK_MESSAGE(
+                ((5 <= vv.versions[1].minorVersion) ||
+                 (0 == vv.versions[1].minorVersion)),
                 "mysql_server_Miner = " << vv.versions[1].minorVersion);
-            BOOST_CHECK_MESSAGE((int)'M' == (int)vv.versions[1].type, "mysql_server_Type = " << vv.versions[1].type);
+            BOOST_CHECK_MESSAGE((int)'M' == (int)vv.versions[1].type,
+                                "mysql_server_Type = " << vv.versions[1].type);
 
-            BOOST_CHECK_MESSAGE(TRANSACTD_VER_MAJOR == vv.versions[2].majorVersion,
+            BOOST_CHECK_MESSAGE(
+                TRANSACTD_VER_MAJOR == vv.versions[2].majorVersion,
                 "server_Major = " << vv.versions[2].majorVersion);
-            BOOST_CHECK_MESSAGE(TRANSACTD_VER_MINOR == vv.versions[2].minorVersion,
+            BOOST_CHECK_MESSAGE(
+                TRANSACTD_VER_MINOR == vv.versions[2].minorVersion,
                 "server_Miner = " << vv.versions[2].minorVersion);
-            BOOST_CHECK_MESSAGE((int)'T' == (int)vv.versions[2].type, "server_Type = " << vv.versions[2].type);
+            BOOST_CHECK_MESSAGE((int)'T' == (int)vv.versions[2].type,
+                                "server_Type = " << vv.versions[2].type);
         }
     }
 }
@@ -252,13 +322,12 @@ void testInsert(database* db)
         if (i == 87170)
             i = 87170;
         tb->insert();
-
     }
     tb->commitBulkInsert();
     db->endTrn();
 
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "Insert2");
-	tb->release();
+    tb->release();
 }
 
 void testFind(database* db)
@@ -299,7 +368,7 @@ void testFind(database* db)
     tb->setFV((short)0, v);
     tb->find(table::findForword);
     BOOST_CHECK_MESSAGE(STATUS_EOF == tb->stat(), "find stat");
-	tb->release();
+    tb->release();
 }
 
 void testFindNext(database* db)
@@ -317,9 +386,8 @@ void testFindNext(database* db)
         tb->findNext(true); // 11 ～ 19
         BOOST_CHECK_MESSAGE(0 == tb->stat(), "findNext stat()");
         BOOST_CHECK_MESSAGE(i == tb->getFVint(fdi_id), "findNext value");
-
     }
-	tb->release();
+    tb->release();
 }
 
 void testFindIn(database* db)
@@ -336,15 +404,13 @@ void testFindIn(database* db)
     q.addSeekKeyValue(_T("80"));
     q.addSeekKeyValue(_T("5000"));
 
-
-
     tb->setQuery(&q);
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "find in stat = " << tb->stat());
     tb->find();
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "find in stat = " << tb->stat());
     BOOST_CHECK_MESSAGE(tb->getFVint(fdi_id) == 10, "find in 10");
     tb->findNext();
-    BOOST_CHECK_MESSAGE(tb->stat() == 4, "find in 300000");
+    BOOST_CHECK_MESSAGE(tb->stat() == 4, "find in 300000 stat =" << tb->stat());
 
     _TCHAR msg[1024];
     tb->keyValueDescription(msg, 1024);
@@ -369,15 +435,15 @@ void testFindIn(database* db)
 
     // Many params
     _TCHAR buf[20];
-	_ltot_s(1, buf, 20, 10);
+    _ltot_s(1, buf, 20, 10);
     q.addSeekKeyValue(buf, true);
 
-    for (int i=2;i<=10000;++i)
-	{
+    for (int i = 2; i <= 10000; ++i)
+    {
         _ltot_s(i, buf, 20, 10);
-		q.addSeekKeyValue(buf);
-	}
-	tb->setQuery(&q);
+        q.addSeekKeyValue(buf);
+    }
+    tb->setQuery(&q);
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "find in stat = " << tb->stat());
 
     tb->find();
@@ -391,7 +457,7 @@ void testFindIn(database* db)
     BOOST_CHECK_MESSAGE(i == 10000, "findNext in count");
     BOOST_CHECK_MESSAGE(9 == tb->stat(), "find in end stat = " << tb->stat());
 
-    //LogicalCountLimit
+    // LogicalCountLimit
     q.addField(_T("id"));
     tb->setQuery(&q);
 
@@ -406,7 +472,7 @@ void testFindIn(database* db)
     BOOST_CHECK_MESSAGE(i == 10000, "findNext in count");
     BOOST_CHECK_MESSAGE(9 == tb->stat(), "find in end stat = " << tb->stat());
 
-	tb->release();
+    tb->release();
 }
 
 void testGetPercentage(database* db)
@@ -420,7 +486,7 @@ void testGetPercentage(database* db)
     percentage_td per = tb->getPercentage();
 
     BOOST_CHECK_MESSAGE(true == (1200 > abs(5000 - per)), "GetPercentage");
-	tb->release();
+    tb->release();
 }
 
 void testMovePercentage(database* db)
@@ -430,8 +496,9 @@ void testMovePercentage(database* db)
     tb->seekByPercentage(5000); // 50%
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "MovePercentage");
     // If mainus is less than 500 then ok.
-    BOOST_CHECK_MESSAGE(true == (3000 > abs(10001 - tb->getFVint(fdi_id))), "MovePercentage 1");
-	tb->release();
+    BOOST_CHECK_MESSAGE(true == (3000 > abs(10001 - tb->getFVint(fdi_id))),
+                        "MovePercentage 1");
+    tb->release();
 }
 
 void testGetEqual(database* db)
@@ -445,10 +512,9 @@ void testGetEqual(database* db)
 
         tb->seek();
         BOOST_CHECK_MESSAGE(i == tb->getFVint(fdi_id), "GetEqual");
-
     }
     db->endSnapshot();
-	tb->release();
+    tb->release();
 }
 
 void testGetNext(database* db)
@@ -467,7 +533,7 @@ void testGetNext(database* db)
             tb->seekNext();
         db->endSnapshot();
     }
-	tb->release();
+    tb->release();
 }
 
 void testGetPrevious(database* db)
@@ -485,10 +551,11 @@ void testGetPrevious(database* db)
         BOOST_CHECK_MESSAGE(i == tb->getFVint(fdi_id), "GetPrevious I");
     }
     tb->seekPrev();
-    BOOST_CHECK_MESSAGE(_tstring(_T("kosaka")) == _tstring(tb->getFVstr(1)), "GetPrevious kosaka");
+    BOOST_CHECK_MESSAGE(_tstring(_T("kosaka")) == _tstring(tb->getFVstr(1)),
+                        "GetPrevious kosaka");
 
     db->endSnapshot();
-	tb->release();
+    tb->release();
 }
 
 void testGetGreater(database* db)
@@ -509,7 +576,7 @@ void testGetGreater(database* db)
     BOOST_CHECK_MESSAGE(vv + 1 == tb->getFVint(fdi_id), "GetGreater false");
     tb->seekPrev();
     BOOST_CHECK_MESSAGE(vv == tb->getFVint(fdi_id), "GetGreater GetPrevious");
-	tb->release();
+    tb->release();
 }
 
 void testGetLessThan(database* db)
@@ -530,8 +597,9 @@ void testGetLessThan(database* db)
     tb->seekLessThan(false);
     BOOST_CHECK_MESSAGE(vv - 1 == tb->getFVint(fdi_id), "GetLessThan false");
     tb->seekPrev();
-    BOOST_CHECK_MESSAGE(vv - 2 == tb->getFVint(fdi_id), "GetLessThan GetPrevious");
-	tb->release();
+    BOOST_CHECK_MESSAGE(vv - 2 == tb->getFVint(fdi_id),
+                        "GetLessThan GetPrevious");
+    tb->release();
 }
 
 void testGetFirst(database* db)
@@ -539,8 +607,9 @@ void testGetFirst(database* db)
     table* tb = openTable(db);
     tb->clearBuffer();
     tb->seekFirst();
-    BOOST_CHECK_MESSAGE(_tstring(_T("kosaka")) == _tstring(tb->getFVstr(1)), "GetFirst");
-	tb->release();
+    BOOST_CHECK_MESSAGE(_tstring(_T("kosaka")) == _tstring(tb->getFVstr(1)),
+                        "GetFirst");
+    tb->release();
 }
 
 void testGetLast(database* db)
@@ -549,7 +618,7 @@ void testGetLast(database* db)
     tb->clearBuffer();
     tb->seekLast();
     BOOST_CHECK_MESSAGE(20002 == tb->getFVint(fdi_id), "GetLast");
-	tb->release();
+    tb->release();
 }
 
 void testMovePosition(database* db)
@@ -571,11 +640,12 @@ void testMovePosition(database* db)
     tb->seekLessThan(false);
     BOOST_CHECK_MESSAGE(vv - 1 == tb->getFVint(fdi_id), "GetLessThan false");
     tb->seekPrev();
-    BOOST_CHECK_MESSAGE(vv - 2 == tb->getFVint(fdi_id), "GetLessThan GetPrevious");
+    BOOST_CHECK_MESSAGE(vv - 2 == tb->getFVint(fdi_id),
+                        "GetLessThan GetPrevious");
 
     tb->seekByBookmark(pos);
     BOOST_CHECK_MESSAGE(15000 == tb->getFVint(fdi_id), "MovePosition");
-	tb->release();
+    tb->release();
 }
 
 void testUpdate(database* db)
@@ -609,7 +679,7 @@ void testUpdate(database* db)
     v = 19999;
     tb->setFV(fdi_id, v);
     tb->update(table::changeCurrentCc); // 6 ->  19999 cur 19999
-    tb->seekPrev();                     // prev 19999
+    tb->seekPrev(); // prev 19999
     BOOST_CHECK_MESSAGE(v - 1 == tb->getFVint(fdi_id), "UpDate3");
     v = 10;
     tb->clearBuffer();
@@ -642,8 +712,9 @@ void testUpdate(database* db)
     tb->clearBuffer();
     tb->setFV(fdi_id, v);
     tb->seek();
-    BOOST_CHECK_MESSAGE(_tcscmp(_T("ABC"), tb->getFVstr(fdi_name)) == 0, "update changeInKey2");
-	tb->release();
+    BOOST_CHECK_MESSAGE(_tcscmp(_T("ABC"), tb->getFVstr(fdi_name)) == 0,
+                        "update changeInKey2");
+    tb->release();
 }
 
 void testSnapShot(database* db)
@@ -669,10 +740,11 @@ void testSnapShot(database* db)
     tb2->setFV(fdi_name, tb2->getFVint(fdi_name) + 1);
     tb2->update();
 #ifdef ISOLATION_READ_COMMITTED
-    BOOST_CHECK_MESSAGE(0 == tb2->stat(), "tb2->update(");
+    BOOST_CHECK_MESSAGE(0 == tb2->stat(), "tb2->update stat = " << tb2->stat());
 #else
 #ifdef ISOLATION_REPEATABLE_READ
-    BOOST_CHECK_MESSAGE(STATUS_LOCK_ERROR == tb2->stat(), "tb2->update(");
+    BOOST_CHECK_MESSAGE(STATUS_LOCK_ERROR == tb2->stat(),
+                        "tb2->update stat = " << tb2->stat());
 #endif
 #endif
     /* -------------------------------------------------- */
@@ -690,8 +762,8 @@ void testSnapShot(database* db)
 #endif
 
     /* -------------------------------------------------- */
-	tb->release();
-	tb2->release();
+    tb->release();
+    tb2->release();
     database::destroy(db2);
 }
 
@@ -740,15 +812,15 @@ void testConflict(database* db)
     tb->update();
     BOOST_CHECK_MESSAGE(STATUS_CHANGE_CONFLICT == tb->stat(), "tb->update(");
     /* -------------------------------------------------- */
-	tb->release();
-	tb2->release();
+    tb->release();
+    tb2->release();
     database::destroy(db2);
 }
 
 void testTransactionLock(database* db)
 {
-	
-	database* db2 = database::create();
+
+    database* db2 = database::create();
     db2->connect(makeUri(PROTOCOL, HOSTNAME, DBNAME), true);
     BOOST_CHECK_MESSAGE(0 == db2->stat(), "connect");
     table* tb = openTable(db);
@@ -839,13 +911,96 @@ void testTransactionLock(database* db)
 
     tb2->setKeyNum(0);
     tb2->seekFirst();
-    BOOST_CHECK_MESSAGE(_tcscmp(tb2->getFVstr(fdi_name), _T("ABC")) == 0, "tb->seekFirst");
+    BOOST_CHECK_MESSAGE(_tcscmp(tb2->getFVstr(fdi_name), _T("ABC")) == 0,
+                        "tb->seekFirst");
 
-	tb->release();
-	tb2->release();
+    tb->release();
+    tb2->release();
     database::destroy(db2);
 }
 
+void testExclusive()
+{
+
+    // db mode exclusive
+    database* db = database::create();
+    table* tb = openTable(db, TD_OPEN_EXCLUSIVE);
+    BOOST_CHECK_MESSAGE(0 == db->stat(), "Exclusive opened 1 ");
+
+    // Can not open another connections.
+    database* db2 = database::create();
+    db2->connect(makeUri(PROTOCOL, HOSTNAME, DBNAME), true);
+    BOOST_CHECK_MESSAGE(0 == db2->stat(), "connect");
+    db2->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME), TYPE_SCHEMA_BDF);
+    BOOST_CHECK_MESSAGE(STATUS_CANNOT_LOCK_TABLE == db2->stat(),
+                        "open 1" << db->stat());
+
+    table* tb2 = db->openTable(_T("user"));
+    BOOST_CHECK_MESSAGE(0 == db->stat(), "Exclusive opened 2");
+
+    tb->setKeyNum(0);
+    tb->seekFirst();
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "tb->seekFirst");
+
+    tb->setFV(fdi_name, _T("ABC123"));
+    tb->update();
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "update");
+
+    tb2->setKeyNum(0);
+    tb2->seekFirst();
+    BOOST_CHECK_MESSAGE(0 == tb2->stat(), "update");
+    tb2->setFV(fdi_name, _T("ABC124"));
+    tb2->update();
+    BOOST_CHECK_MESSAGE(0 == tb2->stat(), "update");
+
+    tb->close();
+    tb2->close();
+    db->close();
+    db2->close();
+
+    // table mode exclusive
+    db = database::create();
+    tb = openTable(db, TD_OPEN_READONLY, TD_OPEN_EXCLUSIVE);
+
+    db2 = database::create();
+    db2->connect(makeUri(PROTOCOL, HOSTNAME, DBNAME), true);
+    BOOST_CHECK_MESSAGE(0 == db2->stat(), "connect");
+    db2->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME), TYPE_SCHEMA_BDF);
+    BOOST_CHECK_MESSAGE(0 == db2->stat(), "open 1" << db->stat());
+
+    // Can not open another connections.
+    tb2 = db2->openTable(_T("user"));
+    BOOST_CHECK_MESSAGE(STATUS_CANNOT_LOCK_TABLE == db2->stat(),
+                        "Exclusive opened 2");
+
+    // Can open a same connection.
+    table* tb3 = db->openTable(_T("user"));
+    BOOST_CHECK_MESSAGE(0 == db->stat(), "Exclusive opened 2");
+
+    tb->close();
+    if (tb2 != NULL)
+        tb2->close();
+    tb3->close();
+    db->close();
+    db2->close();
+    db->release();
+    db2->release();
+    // reopen and update
+    db = database::create();
+    tb = openTable(db);
+
+    tb->setKeyNum(0);
+    tb->seekFirst();
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "tb->seekFirst");
+
+    tb->setFV(fdi_name, _T("ABC123"));
+    tb->update();
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "update");
+
+    tb->release();
+    db->release();
+}
+
 void testInsert2(database* db)
 {
     table* tb = openTable(db);
@@ -863,9 +1018,7 @@ void testInsert2(database* db)
     tb->seekNext();
     BOOST_CHECK_MESSAGE(11 == tb->getFVint(fdi_id), "GetEqual InsNext");
     db->endTrn();
-	tb->release();
-
-
+    tb->release();
 }
 
 void testDelete(database* db)
@@ -874,16 +1027,20 @@ void testDelete(database* db)
 
     // estimate number
     int count = tb->recordCount(true);
-    bool c = (abs(count - 20003) < 3000);
+    bool c = (abs(count - 20003) < 5000);
     BOOST_CHECK_MESSAGE(c == true, "RecordCount1");
     if (!c)
     {
         char tmp[256];
-        sprintf_s(tmp, 256, "true record count = 20003 as estimate recordCount count = %d ", count);
+        sprintf_s(
+            tmp, 256,
+            "true record count = 20003 as estimate recordCount count = %d ",
+            count);
         BOOST_CHECK_MESSAGE(false, tmp);
     }
     // true number
-    BOOST_CHECK_MESSAGE((uint_td)20003 == tb->recordCount(false), "RecordCount2");
+    BOOST_CHECK_MESSAGE((uint_td)20003 == tb->recordCount(false),
+                        "RecordCount2");
     int vv = 15001;
     tb->clearBuffer();
     tb->setFV(fdi_id, vv);
@@ -904,7 +1061,8 @@ void testDelete(database* db)
     tb->clearBuffer();
     tb->setFV(fdi_id, vv);
     tb->seek();
-    BOOST_CHECK_MESSAGE(tb->stat() == STATUS_NOT_FOUND_TI, "delete changeInKey2");
+    BOOST_CHECK_MESSAGE(tb->stat() == STATUS_NOT_FOUND_TI,
+                        "delete changeInKey2");
 
     db->beginTrn();
     tb->stepFirst();
@@ -917,8 +1075,7 @@ void testDelete(database* db)
     BOOST_CHECK_MESSAGE(9 == tb->stat(), "StepNext");
     db->endTrn();
     BOOST_CHECK_MESSAGE((uint_td)0 == tb->recordCount(false), "RecordCount");
-	tb->release();
-
+    tb->release();
 }
 
 void testSetOwner(database* db)
@@ -928,7 +1085,7 @@ void testSetOwner(database* db)
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "SetOwner");
     tb->clearOwnerName();
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "SetOwner");
-	tb->release();
+    tb->release();
 }
 
 void testDropIndex(database* db)
@@ -936,8 +1093,7 @@ void testDropIndex(database* db)
     table* tb = openTable(db);
     tb->dropIndex(false);
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "DropIndex");
-	tb->release();
-
+    tb->release();
 }
 
 void testLogin(database* db)
@@ -952,16 +1108,19 @@ void testLogin(database* db)
         // second connection
         database* db2 = database::create();
         db2->connect(makeUri(PROTOCOL, HOSTNAME, _T("")), true);
-        BOOST_CHECK_MESSAGE(0 == db->stat(), "new connection connect");
+        BOOST_CHECK_MESSAGE(
+            0 == db->stat(),
+            "new connection connect  db->stat() = " << db->stat());
         database::destroy(db2);
 
         db->disconnect(makeUri(PROTOCOL, HOSTNAME, _T("")));
-        BOOST_CHECK_MESSAGE(0 == db->stat(), "disconnect");
-
+        BOOST_CHECK_MESSAGE(0 == db->stat(),
+                            "disconnect  db->stat() = " << db->stat());
     }
     // invalid host name
     db->connect(makeUri(PROTOCOL, _T("localhost123"), _T("")));
-    bool f = (db->stat() == ERROR_TD_INVALID_CLINETHOST) || (db->stat() == ERROR_TD_HOSTNAME_NOT_FOUND);
+    bool f = (db->stat() == ERROR_TD_INVALID_CLINETHOST) ||
+             (db->stat() == ERROR_TD_HOSTNAME_NOT_FOUND);
     BOOST_CHECK_MESSAGE(f, "bad host stat =" << db->stat());
     if (!f)
     {
@@ -972,35 +1131,48 @@ void testLogin(database* db)
         BOOST_MESSAGE(buf);
 #endif
     }
+
+    db->open(makeUri(PROTOCOL, _T("localhost123"), DBNAME, BDFNAME),
+             TYPE_SCHEMA_BDF, TD_OPEN_NORMAL);
+    f = (db->stat() == ERROR_TD_INVALID_CLINETHOST) ||
+        (db->stat() == ERROR_TD_HOSTNAME_NOT_FOUND);
+    BOOST_CHECK_MESSAGE(f, "bad host stat =" << db->stat());
+
     testCreateNewDataBase(db);
     db->disconnect(makeUri(PROTOCOL, HOSTNAME, DBNAME));
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "databese disconnect");
+    BOOST_CHECK_MESSAGE(0 == db->stat(),
+                        "databese disconnect db->stat() = " << db->stat());
 
     // true database name
     db->connect(makeUri(PROTOCOL, HOSTNAME, DBNAME));
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "databese ");
+    BOOST_CHECK_MESSAGE(0 == db->stat(),
+                        "databese  connect db->stat() = " << db->stat());
     if (db->stat() == 0)
     {
         db->disconnect(makeUri(PROTOCOL, HOSTNAME, DBNAME));
-        BOOST_CHECK_MESSAGE(0 == db->stat(), "databese disconnect");
+        BOOST_CHECK_MESSAGE(0 == db->stat(),
+                            "databese disconnect db->stat() = " << db->stat());
     }
     // invalid database name
     testDropDatabase(db);
     db->disconnect(makeUri(PROTOCOL, HOSTNAME, DBNAME));
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "databese disconnect");
+    BOOST_CHECK_MESSAGE(0 == db->stat(),
+                        "databese disconnect db->stat() = " << db->stat());
 
     db->connect(makeUri(PROTOCOL, HOSTNAME, DBNAME));
-    BOOST_CHECK_MESSAGE(25000 + 1049 == db->stat(), "bad databese connect");
+    BOOST_CHECK_MESSAGE(25000 + 1049 == db->stat(),
+                        "databese connect db->stat() = " << db->stat());
 
     db->disconnect(makeUri(PROTOCOL, HOSTNAME, DBNAME));
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "bad databese disconnect");
-
+    BOOST_CHECK_MESSAGE(0 == db->stat(),
+                        "databese disconnect db->stat() = " << db->stat());
 }
 
 // ------------------------------------------------------------------------
 
 // ------------------------------------------------------------------------
-void doCreateVarTable(database* db, int id, const _TCHAR* name, char fieldType, int charset)
+void doCreateVarTable(database* db, int id, const _TCHAR* name, char fieldType,
+                      int charset)
 {
     // create table
     dbdef* def = db->dbDef();
@@ -1015,6 +1187,7 @@ void doCreateVarTable(database* db, int id, const _TCHAR* name, char fieldType,
     td.keyCount = 0;
     td.fieldCount = 0;
     td.flags.all = 0;
+
     td.primaryKeyNum = -1;
     td.parentKeyNum = -1;
     td.replicaKeyNum = -1;
@@ -1030,34 +1203,33 @@ void doCreateVarTable(database* db, int id, const _TCHAR* name, char fieldType,
     fd->setName(_T("id"));
     fd->type = ft_integer;
     fd->len = (ushort_td)4;
-    def->updateTableDef(id);
-    BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 1");
 
     fd = def->insertField(id, 1);
     fd->setName(_T("name"));
     fd->type = fieldType;
     if (fieldType == ft_mywvarchar)
-        fd->len = (ushort_td)1 + mysql::charsize(CHARSET_UTF16LE) * 3; // max 3 char len byte
+        fd->len = (ushort_td)1 +
+                  mysql::charsize(CHARSET_UTF16LE) * 3; // max 3 char len byte
     else if (fieldType == ft_mywvarbinary)
-        fd->len = (ushort_td)1 + mysql::charsize(CHARSET_UTF16LE) * 3; // max 6 char len byte
+        fd->len = (ushort_td)1 +
+                  mysql::charsize(CHARSET_UTF16LE) * 3; // max 6 char len byte
     else if (fieldType == ft_myvarchar)
     {
         if (charset == CHARSET_CP932)
-            fd->len = (ushort_td)1 + mysql::charsize(CHARSET_CP932) * 3; // max 6 char len byte
+            fd->len = (ushort_td)1 +
+                      mysql::charsize(CHARSET_CP932) * 3; // max 6 char len byte
         else if (charset == CHARSET_UTF8B4)
-            fd->len = (ushort_td)1 + mysql::charsize(CHARSET_UTF8B4) * 3; // max 6 char len byte
+            fd->len =
+                (ushort_td)1 +
+                mysql::charsize(CHARSET_UTF8B4) * 3; // max 6 char len byte
     }
     else
         fd->len = (ushort_td)7; // max 6 char len byte
-    def->updateTableDef(id);
-    BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 2");
 
     fd = def->insertField(id, 2);
     fd->setName(_T("groupid"));
     fd->type = ft_integer;
     fd->len = (ushort_td)4;
-    def->updateTableDef(id);
-    BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 3");
 
     keydef* kd = def->insertKey(id, 0);
 
@@ -1066,8 +1238,6 @@ void doCreateVarTable(database* db, int id, const _TCHAR* name, char fieldType,
     kd->segments[0].flags.bit1 = 1; // changeable
     kd->segmentCount = 1;
 
-    def->updateTableDef(id);
-
     kd = def->insertKey(id, 1);
 
     kd->segments[0].fieldNum = 1;
@@ -1088,7 +1258,6 @@ void doCreateVarTable(database* db, int id, const _TCHAR* name, char fieldType,
     BOOST_CHECK_MESSAGE(0 == db->stat(), "openTable");
     if (tb)
         tb->release();
-
 }
 
 bool isUtf16leSupport(database* db)
@@ -1111,8 +1280,12 @@ void testCreateDataBaseVar(database* db)
     if (_tcscmp(PROTOCOL, _T("tdap")) != 0)
         return;
 
+    if (db->open(makeUri(PROTOCOL, HOSTNAME, _T("testvar"), BDFNAME)))
+        db->drop();
+
     db->create(makeUri(PROTOCOL, HOSTNAME, _T("testvar"), BDFNAME));
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "createNewDataBase stat = " << db->stat());
+    BOOST_CHECK_MESSAGE(0 == db->stat(),
+                        "createNewDataBase stat = " << db->stat());
     if (0 == db->stat())
     {
         db->open(makeUri(PROTOCOL, HOSTNAME, _T("testvar"), BDFNAME), 0, 0);
@@ -1123,14 +1296,17 @@ void testCreateDataBaseVar(database* db)
             doCreateVarTable(db, 1, _T("user1"), ft_myvarchar, CHARSET_CP932);
             doCreateVarTable(db, 2, _T("user2"), ft_myvarbinary, CHARSET_CP932);
             if (isUtf16leSupport(db))
-                doCreateVarTable(db, 3, _T("user3"), ft_mywvarchar, CHARSET_CP932);
-            doCreateVarTable(db, 4, _T("user4"), ft_mywvarbinary, CHARSET_CP932);
+                doCreateVarTable(db, 3, _T("user3"), ft_mywvarchar,
+                                 CHARSET_CP932);
+            doCreateVarTable(db, 4, _T("user4"), ft_mywvarbinary,
+                             CHARSET_CP932);
             doCreateVarTable(db, 5, _T("user5"), ft_myvarchar, CHARSET_UTF8B4);
             db->close();
-            db->open(makeUri(PROTOCOL, HOSTNAME, _T("testvar"), TRANSACTD_SCHEMANAME), 0, 0);
+            db->open(makeUri(PROTOCOL, HOSTNAME, _T("testvar"),
+                             TRANSACTD_SCHEMANAME),
+                     0, 0);
         }
     }
-
 }
 
 void testDropDataBaseVar(database* db)
@@ -1171,7 +1347,7 @@ void dump(const char* p, int size)
 
 void doTestverField(table* tb, bool unicodeField, bool varCharField)
 {
-    // Set Wide Get Wide
+// Set Wide Get Wide
 #ifdef _WIN32
     tb->setFVW(2, L"68");
 #else
@@ -1183,17 +1359,22 @@ void doTestverField(table* tb, bool unicodeField, bool varCharField)
     tb->setFVW(1, L"1234567");
     if (varCharField)
     {
-        BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(1)) == wstring(L"123"), "Get Set W1");
+        BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(1)) == wstring(L"123"),
+                            "Get Set W1");
         if (wstring(tb->getFVWstr(1)) != wstring(L"123"))
             dump((const char*)tb->getFVWstr(1), 7);
     }
     else
-        BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(1)) == wstring(L"123456"), "Get Set W1");
-    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"), "Orverrun 1");
+        BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(1)) == wstring(L"123456"),
+                            "Get Set W1");
+    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"),
+                        "Orverrun 1");
     // short
     tb->setFVW(1, L"12 ");
-    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(1)) == wstring(L"12 "), "Get Set W2");
-    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"), "Orverrun 2");
+    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(1)) == wstring(L"12 "),
+                        "Get Set W2");
+    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"),
+                        "Orverrun 2");
     // too long lanji
 
     if (unicodeField)
@@ -1201,36 +1382,46 @@ void doTestverField(table* tb, bool unicodeField, bool varCharField)
 
         tb->setFVW(1, L"あいうえお\xD867\xDE3D"); // kanji that "aiueohokke"
         if (varCharField)
-            BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(1)) == wstring(L"あいう"), "Get Set W3");
+            BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(1)) == wstring(L"あいう"),
+                                "Get Set W3");
         else
-            BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(1)) == wstring(L"あいうえお"), "Get Set W3");
+            BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(1)) ==
+                                    wstring(L"あいうえお"),
+                                "Get Set W3");
     }
     else
     {
         tb->setFVW(1, L"0松本市"); // kanji that "matumostoshi"
-        BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(1)) == wstring(L"0松本"), "Get Set W3");
+        BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(1)) == wstring(L"0松本"),
+                            "Get Set W3");
     }
-    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"), "Orverrun 2");
+    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"),
+                        "Orverrun 2");
 #endif
 
     // Set Ansi Get Wide
     // too long string
     tb->setFVA(1, "1234567");
     if (varCharField)
-        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("123"), "Get Set A1");
+        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("123"),
+                            "Get Set A1");
     else
-        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("123456"), "Get Set A1");
+        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("123456"),
+                            "Get Set A1");
 
 #ifdef _WIN32
-    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"), "Orverrun 1");
+    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"),
+                        "Orverrun 1");
 #else
     BOOST_CHECK_MESSAGE(string(tb->getFVAstr(2)) == string("68"), "Orverrun 1");
 #endif
     // short string
     tb->setFVA(1, "13 ");
-    BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("13 "), "Get Set A2");
+    BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("13 "),
+                        "Get Set A2");
 #ifdef _WIN32
-    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"), "Orverrun 2");
+    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"),
+                        "Orverrun 2");
 #else
     BOOST_CHECK_MESSAGE(string(tb->getFVAstr(2)) == string("68"), "Orverrun 2");
 #endif
@@ -1241,9 +1432,11 @@ void doTestverField(table* tb, bool unicodeField, bool varCharField)
 #ifdef LINUX
         tb->setFVA(1, "あいうえお𩸽"); // kanji that "aiueohokke"
         if (varCharField)
-            BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("あいう"), "Get Set A3");
+            BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("あいう"),
+                                "Get Set A3");
         else
-            BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("あいうえお"), "Get Set A3");
+            BOOST_CHECK_MESSAGE(
+                string(tb->getFVAstr(1)) == string("あいうえお"), "Get Set A3");
 #endif
     }
     else
@@ -1253,26 +1446,30 @@ void doTestverField(table* tb, bool unicodeField, bool varCharField)
         BOOST_CHECK_MESSAGE(f, "Get Set A3");
         if (!f)
             BOOST_MESSAGE(tb->getFVAstr(1));
-
     }
     BOOST_CHECK_MESSAGE(string(tb->getFVAstr(2)) == string("68"), "Orverrun 2");
 
-    // Set Wide Get Ansi
+// Set Wide Get Ansi
 #ifdef _WIN32
     // too long string
     tb->setFVW(1, L"1234567");
     if (varCharField)
-        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("123"), "GetA Set W1");
+        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("123"),
+                            "GetA Set W1");
     else
-        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("123456"), "GetA Set W1");
+        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("123456"),
+                            "GetA Set W1");
 
-    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"), "Orverrun 1");
+    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"),
+                        "Orverrun 1");
 
     // short string
     tb->setFVW(1, L"23 ");
-    BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("23 "), "GetA Set W2");
+    BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("23 "),
+                        "GetA Set W2");
 
-    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"), "Orverrun 2");
+    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"),
+                        "Orverrun 2");
 
     // too long lanji
     if (unicodeField)
@@ -1280,28 +1477,36 @@ void doTestverField(table* tb, bool unicodeField, bool varCharField)
 
         tb->setFVW(1, L"あいうえお\xD867\xDE3D"); // kanji that "aiueohokke"
         if (varCharField)
-            BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("あいう"), "GetA Set W3");
+            BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("あいう"),
+                                "GetA Set W3");
         else
-            BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("あいうえお"), "GetA Set W3");
+            BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) ==
+                                    string("あいうえお"),
+                                "GetA Set W3");
     }
     else
     {
         tb->setFVW(1, L"0松本市"); // kanji that "matumostoshi"
-        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("0松本"), "GetA Set W3");
+        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("0松本"),
+                            "GetA Set W3");
     }
-    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"), "Orverrun 2");
+    BOOST_CHECK_MESSAGE(wstring(tb->getFVWstr(2)) == wstring(L"68"),
+                        "Orverrun 2");
 #endif
     // Set Ansi Get Ansi
     // too long string
     tb->setFVA(1, "1234567");
     if (varCharField)
-        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("123"), "GetA Set A1");
+        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("123"),
+                            "GetA Set A1");
     else
-        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("123456"), "GetA Set A1");
+        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("123456"),
+                            "GetA Set A1");
     BOOST_CHECK_MESSAGE(string(tb->getFVAstr(2)) == string("68"), "Orverrun 1");
     // short string
     tb->setFVA(1, "13 ");
-    BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("13 "), "GetA Set A2");
+    BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("13 "),
+                        "GetA Set A2");
     BOOST_CHECK_MESSAGE(string(tb->getFVAstr(2)) == string("68"), "Orverrun 2");
 
     // too long lanji
@@ -1310,18 +1515,20 @@ void doTestverField(table* tb, bool unicodeField, bool varCharField)
 #ifdef LINUX
         tb->setFVA(1, "あいうえお𩸽"); // kanji that "aiueohokke"
         if (varCharField)
-            BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("あいう"), "Get Set A3");
+            BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("あいう"),
+                                "Get Set A3");
         else
-            BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("あいうえお"), "Get Set A3");
+            BOOST_CHECK_MESSAGE(
+                string(tb->getFVAstr(1)) == string("あいうえお"), "Get Set A3");
 #endif
     }
     else
     {
         tb->setFVA(1, "0松本市"); // kanji that "matumostoshi"
-        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("0松本"), "GetA Set A3");
+        BOOST_CHECK_MESSAGE(string(tb->getFVAstr(1)) == string("0松本"),
+                            "GetA Set A3");
     }
     BOOST_CHECK_MESSAGE(string(tb->getFVAstr(2)) == string("68"), "Orverrun 2");
-
 }
 
 void testVarField(database* db)
@@ -1363,11 +1570,10 @@ void testVarField(database* db)
     doTestverField(tb, true, true);
 
     tb->release();
-
 }
 
-void doVarInsert(database* db, const _TCHAR* name, unsigned int codePage, const _TCHAR* str, int start, int end,
-    bool bulk)
+void doVarInsert(database* db, const _TCHAR* name, unsigned int codePage,
+                 const _TCHAR* str, int start, int end, bool bulk)
 {
     _TCHAR buf[256];
     table* tb = db->openTable(name);
@@ -1385,7 +1591,6 @@ void doVarInsert(database* db, const _TCHAR* name, unsigned int codePage, const
         v = i + 10;
         tb->setFV((short)2, v);
         tb->insert();
-
     }
     if (bulk)
         tb->commitBulkInsert();
@@ -1433,10 +1638,10 @@ void testVarInsert(database* db)
         doVarInsert(db, _T("user4"), CP_ACP, _T(""), start, end, bulk);
         doVarInsert(db, _T("user5"), CP_UTF8, _T(""), start, end, bulk);
     }
-
 }
 
-void doVarRead(database* db, const _TCHAR* name, unsigned int codePage, const _TCHAR* str, int num, char_td key)
+void doVarRead(database* db, const _TCHAR* name, unsigned int codePage,
+               const _TCHAR* str, int num, char_td key)
 {
 
     table* tb = db->openTable(name);
@@ -1460,10 +1665,10 @@ void doVarRead(database* db, const _TCHAR* name, unsigned int codePage, const _T
     BOOST_CHECK_MESSAGE(f, "GetEqual var field1");
 
     // test read of second field
-    BOOST_CHECK_MESSAGE((int)(num + 10) == tb->getFVint(2), "GetEqual var field2");
+    BOOST_CHECK_MESSAGE((int)(num + 10) == tb->getFVint(2),
+                        "GetEqual var field2");
 
     tb->release();
-
 }
 
 void testVarRead(database* db)
@@ -1510,7 +1715,8 @@ void testVarRead(database* db)
     }
 }
 
-void doVarFilter(database* db, const _TCHAR* name, unsigned int codePage, const _TCHAR* str, int num, char_td key)
+void doVarFilter(database* db, const _TCHAR* name, unsigned int codePage,
+                 const _TCHAR* str, int num, char_td key)
 {
     table* tb = db->openTable(name);
     BOOST_CHECK_MESSAGE(0 == db->stat(), "openTable");
@@ -1534,7 +1740,8 @@ void doVarFilter(database* db, const _TCHAR* name, unsigned int codePage, const
             // test read of var field
             BOOST_CHECK_MESSAGE(i == tb->getFVint(1), "findNext");
             // test read of second field
-            BOOST_CHECK_MESSAGE((int)(i + 10) == tb->getFVint(2), "GetEqual var field2");
+            BOOST_CHECK_MESSAGE((int)(i + 10) == tb->getFVint(2),
+                                "GetEqual var field2");
         }
 
         // find previous
@@ -1551,11 +1758,13 @@ void doVarFilter(database* db, const _TCHAR* name, unsigned int codePage, const
             // test read of var field
             BOOST_CHECK_MESSAGE(i == tb->getFVint(1), "FindPrev");
             // test read of second field
-            BOOST_CHECK_MESSAGE((int)(i + 10) == tb->getFVint(2), "FindPrev var field2");
+            BOOST_CHECK_MESSAGE((int)(i + 10) == tb->getFVint(2),
+                                "FindPrev var field2");
         }
 
         // test record count
-        BOOST_CHECK_MESSAGE((uint_td)10 == tb->recordCount(), "GetEqual var field2");
+        BOOST_CHECK_MESSAGE((uint_td)10 == tb->recordCount(),
+                            "GetEqual var field2");
     }
     else
     {
@@ -1564,7 +1773,6 @@ void doVarFilter(database* db, const _TCHAR* name, unsigned int codePage, const
         tb->setFV((short)2, v);
     }
     tb->release();
-
 }
 
 void testFilterVar(database* db)
@@ -1578,8 +1786,6 @@ void testFilterVar(database* db)
     {
         const _TCHAR* str = _T("漢字文");
         const _TCHAR* str3 = _T("漢字文字のテ");
-        const _TCHAR* str2 = _T("123");
-        const _TCHAR* str4 = _T("1232");
         bool utf16leSupport = isUtf16leSupport(db);
 
         int num = 10;
@@ -1593,6 +1799,8 @@ void testFilterVar(database* db)
 
 #ifdef _UNICODE
         // short string
+        const _TCHAR* str2 = _T("123");
+        const _TCHAR* str4 = _T("1232");
         ++num;
         doVarFilter(db, L"user1", CP_ACP, str2, num, key);
         doVarFilter(db, L"user2", CP_ACP, str4, num, key);
@@ -1600,6 +1808,7 @@ void testFilterVar(database* db)
             doVarFilter(db, L"user3", CP_ACP, str2, num, key);
         doVarFilter(db, L"user4", CP_ACP, str4, num, key);
         doVarFilter(db, L"user5", CP_UTF8, str2, num, key);
+
 #endif
 
         key = 1;
@@ -1610,13 +1819,13 @@ void testFilterVar(database* db)
         doVarFilter(db, _T("user4"), CP_ACP, _T("120"), 120, key);
         doVarFilter(db, _T("user5"), CP_UTF8, _T("120"), 120, key);
     }
-
 }
 // ------------------------------------------------------------------------
 
 // ------------------------------------------------------------------------
 
-void stringFileterCreateTable(database* db, int id, const _TCHAR* name, uchar_td type, uchar_td type2)
+void stringFileterCreateTable(database* db, int id, const _TCHAR* name,
+                              uchar_td type, uchar_td type2)
 {
     // create table
 
@@ -1644,7 +1853,8 @@ void stringFileterCreateTable(database* db, int id, const _TCHAR* name, uchar_td
     fd->type = ft_integer;
     fd->len = (ushort_td)4;
     def->updateTableDef(id);
-    BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 1 stat = " << def->stat());
+    BOOST_CHECK_MESSAGE(0 == def->stat(),
+                        "updateTableDef 1 stat = " << def->stat());
 
     fd = def->insertField(id, 1);
     fd->setName(_T("name"));
@@ -1658,12 +1868,12 @@ void stringFileterCreateTable(database* db, int id, const _TCHAR* name, uchar_td
     if (fd->blobLenBytes())
     {
         fd->len = 12; // 8+4
-
     }
 
     fd->keylen = fd->len;
     def->updateTableDef(id);
-    BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 2 stat = " << def->stat());
+    BOOST_CHECK_MESSAGE(0 == def->stat(),
+                        "updateTableDef 2 stat = " << def->stat());
 
     fd = def->insertField(id, 2);
     fd->setName(_T("namew"));
@@ -1677,7 +1887,6 @@ void stringFileterCreateTable(database* db, int id, const _TCHAR* name, uchar_td
     if (fd->blobLenBytes())
     {
         fd->len = 12; // 8+4
-
     }
     fd->keylen = fd->len;
     def->updateTableDef(id);
@@ -1708,18 +1917,18 @@ void stringFileterCreateTable(database* db, int id, const _TCHAR* name, uchar_td
     kd->segmentCount = 1;
     def->updateTableDef(id);
     BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 6");
-
 }
 
 void doInsertStringFileter(table* tb)
 {
-    tb->beginBulkInsert(BULKBUFSIZE);
+
     tb->clearBuffer();
     int id = 1;
     tb->setFV(_T("id"), id);
     tb->setFV(_T("name"), _T("あいうえおかきくこ"));
     tb->setFV(_T("namew"), _T("あいうえおかきくこ"));
     tb->insert();
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "InsertStringFileter 1");
 
     tb->clearBuffer();
     id = 2;
@@ -1727,14 +1936,16 @@ void doInsertStringFileter(table* tb)
     tb->setFV(_T("name"), _T("A123456"));
     tb->setFV(_T("namew"), _T("A123456"));
     tb->insert();
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "InsertStringFileter 2");
 
-
+    tb->beginBulkInsert(BULKBUFSIZE);
     tb->clearBuffer();
     id = 3;
     tb->setFV(_T("id"), id);
     tb->setFV(_T("name"), _T("あいがあればOKです"));
     tb->setFV(_T("namew"), _T("あいがあればOKです"));
     tb->insert();
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "InsertStringFileter 3");
 
     tb->clearBuffer();
     id = 4;
@@ -1742,6 +1953,7 @@ void doInsertStringFileter(table* tb)
     tb->setFV(_T("name"), _T("おはようございます"));
     tb->setFV(_T("namew"), _T("おはようございます"));
     tb->insert();
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "InsertStringFileter 3");
 
     tb->clearBuffer();
     id = 5;
@@ -1749,7 +1961,9 @@ void doInsertStringFileter(table* tb)
     tb->setFV(_T("name"), _T("おめでとうございます。"));
     tb->setFV(_T("namew"), _T("おめでとうございます。"));
     tb->insert();
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "InsertStringFileter 4");
     tb->commitBulkInsert();
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "InsertStringFileter 5");
 }
 
 void doTestReadSF(table* tb)
@@ -1760,28 +1974,39 @@ void doTestReadSF(table* tb)
     tb->setFV(_T("id"), id);
     tb->seek();
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1");
-    BOOST_CHECK_MESSAGE(_tstring(_T("あいうえおかきくこ")) == _tstring(tb->getFVstr(1)), "doTestReadSF2");
+    BOOST_CHECK_MESSAGE(_tstring(_T("あいうえおかきくこ")) ==
+                            _tstring(tb->getFVstr(1)),
+                        "doTestReadSF2");
+    BOOST_CHECK_MESSAGE(_tstring(_T("あいうえおかきくこ")) ==
+                            _tstring(tb->getFVstr(1)),
+                        "doTestReadSF2b");
 
     id = 3;
     tb->setFV(_T("id"), id);
     tb->seek();
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF3");
-    BOOST_CHECK_MESSAGE(_tstring(_T("あいがあればOKです")) == _tstring(tb->getFVstr(1)), "doTestReadSF4");
+    BOOST_CHECK_MESSAGE(_tstring(_T("あいがあればOKです")) ==
+                            _tstring(tb->getFVstr(1)),
+                        "doTestReadSF4");
+    BOOST_CHECK_MESSAGE(_tstring(_T("あいがあればOKです")) ==
+                            _tstring(tb->getFVstr(2)),
+                        "doTestReadSF4b");
 
     tb->setKeyNum(1);
     tb->clearBuffer();
     tb->setFV(_T("name"), _T("A123456"));
     tb->seek();
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF5");
-    BOOST_CHECK_MESSAGE(_tstring(_T("A123456")) == _tstring(tb->getFVstr(1)), "doTestReadSF6");
+    BOOST_CHECK_MESSAGE(_tstring(_T("A123456")) == _tstring(tb->getFVstr(1)),
+                        "doTestReadSF6");
 
     tb->setKeyNum(2);
     tb->clearBuffer();
     tb->setFV(_T("namew"), _T("A123456"));
     tb->seek();
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF5");
-    BOOST_CHECK_MESSAGE(_tstring(_T("A123456")) == _tstring(tb->getFVstr(2)), "doTestReadSF6");
-
+    BOOST_CHECK_MESSAGE(_tstring(_T("A123456")) == _tstring(tb->getFVstr(2)),
+                        "doTestReadSF6");
 }
 
 void doTestSF(table* tb)
@@ -1789,33 +2014,38 @@ void doTestSF(table* tb)
     tb->setKeyNum(0);
     tb->clearBuffer();
 
-
-
     tb->setFilter(_T("name = 'あい*'"), 0, 10);
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1");
     tb->seekFirst();
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1");
     tb->findNext(false);
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1");
-    BOOST_CHECK_MESSAGE(_tstring(_T("あいうえおかきくこ")) == _tstring(tb->getFVstr(1)), "doTestReadSF2");
+    BOOST_CHECK_MESSAGE(_tstring(_T("あいうえおかきくこ")) ==
+                            _tstring(tb->getFVstr(1)),
+                        "doTestReadSF2");
     BOOST_CHECK_MESSAGE(2 == (int)tb->recordCount(), "doTestReadSF2");
 
-
     tb->setFilter(_T("name <> 'あい*'"), 0, 10);
     BOOST_CHECK_MESSAGE(3 == (int)tb->recordCount(), "doTestReadSF2");
     tb->clearBuffer();
+    tb->setFilter(_T("name <> 'あい*'"), 0, 10);
     tb->seekFirst();
     tb->findNext(false);
-    BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1");
-    BOOST_CHECK_MESSAGE(_tstring(_T("A123456")) == _tstring(tb->getFVstr(2)), "doTestReadSF1");
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1 stat = " << tb->stat());
+    BOOST_CHECK_MESSAGE(_tstring(_T("A123456")) == _tstring(tb->getFVstr(2)),
+                        "doTestReadSF1");
 
     tb->findNext();
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1");
-    BOOST_CHECK_MESSAGE(_tstring(_T("おはようございます")) == _tstring(tb->getFVstr(2)), "doTestReadSF1");
+    BOOST_CHECK_MESSAGE(_tstring(_T("おはようございます")) ==
+                            _tstring(tb->getFVstr(2)),
+                        "doTestReadSF1");
 
     tb->findNext();
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1");
-    BOOST_CHECK_MESSAGE(_tstring(_T("おめでとうございます。")) == _tstring(tb->getFVstr(2)), "doTestReadSF1");
+    BOOST_CHECK_MESSAGE(_tstring(_T("おめでとうございます。")) ==
+                            _tstring(tb->getFVstr(2)),
+                        "doTestReadSF1");
     tb->findNext();
     BOOST_CHECK_MESSAGE(9 == tb->stat(), "doTestReadSF1");
 
@@ -1823,15 +2053,20 @@ void doTestSF(table* tb)
     tb->seekLast();
     tb->findPrev(false);
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1");
-    BOOST_CHECK_MESSAGE(_tstring(_T("おめでとうございます。")) == _tstring(tb->getFVstr(2)), "doTestReadSF1");
+    BOOST_CHECK_MESSAGE(_tstring(_T("おめでとうございます。")) ==
+                            _tstring(tb->getFVstr(2)),
+                        "doTestReadSF1");
 
     tb->findPrev();
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1");
-    BOOST_CHECK_MESSAGE(_tstring(_T("おはようございます")) == _tstring(tb->getFVstr(2)), "doTestReadSF1");
+    BOOST_CHECK_MESSAGE(_tstring(_T("おはようございます")) ==
+                            _tstring(tb->getFVstr(2)),
+                        "doTestReadSF1");
 
     tb->findPrev(false);
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1");
-    BOOST_CHECK_MESSAGE(_tstring(_T("A123456")) == _tstring(tb->getFVstr(2)), "doTestReadSF1");
+    BOOST_CHECK_MESSAGE(_tstring(_T("A123456")) == _tstring(tb->getFVstr(2)),
+                        "doTestReadSF1");
 
     tb->findPrev();
     BOOST_CHECK_MESSAGE(9 == tb->stat(), "doTestReadSF1");
@@ -1842,12 +2077,12 @@ void doTestSF(table* tb)
     tb->setFilter(_T("name <> ''"), 0, 10);
     BOOST_CHECK_MESSAGE(5 == (int)tb->recordCount(), "doTestReadSF2");
 
-    //test setFilter don't change field value
+    // test setFilter don't change field value
     tb->clearBuffer();
     tb->setFV(_T("name"), _T("ABCDE"));
     tb->setFilter(_T("name = 'あい'"), 0, 10);
-    BOOST_CHECK_MESSAGE(_tstring(_T("ABCDE")) == _tstring(tb->getFVstr(1)), "doTestReadSF2 field value");
-
+    BOOST_CHECK_MESSAGE(_tstring(_T("ABCDE")) == _tstring(tb->getFVstr(1)),
+                        "doTestReadSF2 field value");
 }
 
 void doTestUpdateSF(table* tb)
@@ -1856,31 +2091,41 @@ void doTestUpdateSF(table* tb)
     tb->setKeyNum(0);
     tb->clearBuffer();
     tb->seekFirst();
-    BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestUpdateSF stat = " << tb->stat());
+    BOOST_CHECK_MESSAGE(0 == tb->stat(),
+                        "doTestUpdateSF stat = " << tb->stat());
     tb->setFV(_T("name"), _T("ABCDE"));
     tb->setFV(_T("namew"), _T("ABCDEW"));
     tb->update();
-    BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestUpdateSF stat = " << tb->stat());
+    BOOST_CHECK_MESSAGE(0 == tb->stat(),
+                        "doTestUpdateSF stat = " << tb->stat());
     tb->seekNext();
-    BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestUpdateSF stat = " << tb->stat());
+    BOOST_CHECK_MESSAGE(0 == tb->stat(),
+                        "doTestUpdateSF stat = " << tb->stat());
 
     tb->setFV(_T("name"), _T("ABCDE2"));
     tb->setFV(_T("namew"), _T("ABCDEW2"));
     tb->update();
-    BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestUpdateSF stat = " << tb->stat());
+    BOOST_CHECK_MESSAGE(0 == tb->stat(),
+                        "doTestUpdateSF stat = " << tb->stat());
 
     tb->seekFirst();
-    BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestUpdateSF stat = " << tb->stat());
-    BOOST_CHECK_MESSAGE(_tstring(_T("ABCDE")) == _tstring(tb->getFVstr(1)), "doTestUpdateSF");
-    BOOST_CHECK_MESSAGE(_tstring(_T("ABCDEW")) == _tstring(tb->getFVstr(2)), "doTestUpdateSF" );
+    BOOST_CHECK_MESSAGE(0 == tb->stat(),
+                        "doTestUpdateSF stat = " << tb->stat());
+    BOOST_CHECK_MESSAGE(_tstring(_T("ABCDE")) == _tstring(tb->getFVstr(1)),
+                        "doTestUpdateSF");
+    BOOST_CHECK_MESSAGE(_tstring(_T("ABCDEW")) == _tstring(tb->getFVstr(2)),
+                        "doTestUpdateSF");
     tb->seekNext();
-    BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestUpdateSF stat = " << tb->stat());
-    BOOST_CHECK_MESSAGE(_tstring(_T("ABCDE2")) == _tstring(tb->getFVstr(1)), "doTestUpdateSF");
-    BOOST_CHECK_MESSAGE(_tstring(_T("ABCDEW2")) == _tstring(tb->getFVstr(2)), "doTestUpdateSF" );
-
+    BOOST_CHECK_MESSAGE(0 == tb->stat(),
+                        "doTestUpdateSF stat = " << tb->stat());
+    BOOST_CHECK_MESSAGE(_tstring(_T("ABCDE2")) == _tstring(tb->getFVstr(1)),
+                        "doTestUpdateSF");
+    BOOST_CHECK_MESSAGE(_tstring(_T("ABCDEW2")) == _tstring(tb->getFVstr(2)),
+                        "doTestUpdateSF");
 }
 
-void doTestStringFileter(database* db, int id, const _TCHAR* name, uchar_td type, uchar_td type2)
+void doTestStringFileter(database* db, int id, const _TCHAR* name,
+                         uchar_td type, uchar_td type2)
 {
 
     stringFileterCreateTable(db, id, name, type, type2);
@@ -1900,18 +2145,19 @@ void testStringFileter(database* db)
     BOOST_CHECK_MESSAGE(0 == db->stat(), "createNewDataBase");
 
     db->open(makeUri(PROTOCOL, HOSTNAME, _T("testString"), BDFNAME), 0, 0);
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "createNewDataBase 1 stat = " << db->stat());
+    BOOST_CHECK_MESSAGE(0 == db->stat(),
+                        "createNewDataBase 1 stat = " << db->stat());
 
     doTestStringFileter(db, 1, _T("zstring"), ft_zstring, ft_wzstring);
     if (isUtf16leSupport(db))
-        doTestStringFileter(db, 2, _T("myvarchar"), ft_myvarchar, ft_mywvarchar);
+        doTestStringFileter(db, 2, _T("myvarchar"), ft_myvarchar,
+                            ft_mywvarchar);
     else
         doTestStringFileter(db, 2, _T("myvarchar"), ft_myvarchar, ft_myvarchar);
 
     doTestStringFileter(db, 3, _T("mytext"), ft_mytext, ft_myblob);
 
     db->close();
-
 }
 
 void testDropDataBaseStr(database* db)
@@ -1919,21 +2165,16 @@ void testDropDataBaseStr(database* db)
     db->open(makeUri(PROTOCOL, HOSTNAME, _T("testString"), BDFNAME), 0, 0);
     BOOST_CHECK_MESSAGE(0 == db->stat(), "createNewDataBase 1");
     db->drop();
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "DropDataBaseTestString stat=" << db->stat());
-
+    BOOST_CHECK_MESSAGE(0 == db->stat(),
+                        "DropDataBaseTestString stat=" << db->stat());
 }
 // ------------------------------------------------------------------------
 
-_TCHAR dbNmae[50] =
-{_T("テスト")};
-_TCHAR bdfNmae[50] =
-{_T("構成.bdf")};
-_TCHAR tableNmae[50] =
-{_T("漢字テーブル")};
-_TCHAR fdName1[50] =
-{_T("番号")};
-_TCHAR fdName2[50] =
-{_T("名前")};
+_TCHAR dbNmae[50] = { _T("テスト") };
+_TCHAR bdfNmae[50] = { _T("構成.bdf") };
+_TCHAR tableNmae[50] = { _T("漢字テーブル") };
+_TCHAR fdName1[50] = { _T("番号") };
+_TCHAR fdName2[50] = { _T("名前") };
 
 bool nameInited = false;
 
@@ -1957,7 +2198,6 @@ void initKanjiName()
         nameInited = true;
     }
 #endif
-
 }
 
 void testDropDatabaseKanji(database* db)
@@ -1978,10 +2218,13 @@ void testKnajiCreateSchema(database* db)
         testDropDatabaseKanji(db);
         db->create(makeUri(PROTOCOL, HOSTNAME, dbNmae, bdfNmae));
     }
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "createKanjiDatabase stat = " << db->stat());
+    BOOST_CHECK_MESSAGE(0 == db->stat(),
+                        "createKanjiDatabase stat = " << db->stat());
     // create table
-    db->open(makeUri(PROTOCOL, HOSTNAME, dbNmae, bdfNmae), TYPE_SCHEMA_BDF, TD_OPEN_NORMAL);
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "createKanjiDatabase 1 stat = " << db->stat());
+    db->open(makeUri(PROTOCOL, HOSTNAME, dbNmae, bdfNmae), TYPE_SCHEMA_BDF,
+             TD_OPEN_NORMAL);
+    BOOST_CHECK_MESSAGE(0 == db->stat(),
+                        "createKanjiDatabase 1 stat = " << db->stat());
 
     dbdef* def = db->dbDef();
     if (def)
@@ -2000,21 +2243,24 @@ void testKnajiCreateSchema(database* db)
         td.pageSize = 2048;
 
         def->insertTable(&td);
-        BOOST_CHECK_MESSAGE(0 == def->stat(), "insertTable stat = " << def->stat());
+        BOOST_CHECK_MESSAGE(0 == def->stat(),
+                            "insertTable stat = " << def->stat());
 
         fielddef* fd = def->insertField(1, 0);
         fd->setName(fdName1);
         fd->type = ft_integer;
         fd->len = (ushort_td)4;
         def->updateTableDef(1);
-        BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 1 stat = " << def->stat());
+        BOOST_CHECK_MESSAGE(0 == def->stat(),
+                            "updateTableDef 1 stat = " << def->stat());
 
         fd = def->insertField(1, 1);
         fd->setName(fdName2);
         fd->type = ft_zstring;
         fd->len = (ushort_td)33;
         def->updateTableDef(1);
-        BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 2 stat = " << def->stat());
+        BOOST_CHECK_MESSAGE(0 == def->stat(),
+                            "updateTableDef 2 stat = " << def->stat());
 
         keydef* kd = def->insertKey(1, 0);
         kd->segments[0].fieldNum = 0;
@@ -2023,15 +2269,16 @@ void testKnajiCreateSchema(database* db)
         kd->segmentCount = 1;
 
         def->updateTableDef(1);
-        BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 3 stat = " << def->stat());
-
+        BOOST_CHECK_MESSAGE(0 == def->stat(),
+                            "updateTableDef 3 stat = " << def->stat());
     }
 }
 
 table* openKnajiTable(database* db)
 {
 
-    db->open(makeUri(PROTOCOL, HOSTNAME, dbNmae, bdfNmae), TYPE_SCHEMA_BDF, TD_OPEN_NORMAL);
+    db->open(makeUri(PROTOCOL, HOSTNAME, dbNmae, bdfNmae), TYPE_SCHEMA_BDF,
+             TD_OPEN_NORMAL);
     BOOST_CHECK_MESSAGE(0 == db->stat(), "openKnajiTable 1");
     table* tb = db->openTable(tableNmae);
     BOOST_CHECK_MESSAGE(0 == db->stat(), "openKnajiTable 2");
@@ -2053,8 +2300,7 @@ void testInsertKanji(database* db)
     tb->setFV(fdName2, _T("矢口"));
     tb->insert();
     BOOST_CHECK_MESSAGE(0 == tb->stat(), "insert 2");
-	tb->release();
-
+    tb->release();
 }
 
 void testGetEqualKanji(database* db)
@@ -2064,14 +2310,15 @@ void testGetEqualKanji(database* db)
     tb->setFV((short)0, 1);
     tb->seek();
     BOOST_CHECK_MESSAGE(1 == tb->getFVint(fdName1), "GetEqual id 1");
-    BOOST_CHECK_MESSAGE(_tcscmp(tb->getFVstr(fdName2), _T("小坂")) == 0, "GetEqual name 2");
+    BOOST_CHECK_MESSAGE(_tcscmp(tb->getFVstr(fdName2), _T("小坂")) == 0,
+                        "GetEqual name 2");
 
     tb->setFV((short)0, 2);
     tb->seek();
     BOOST_CHECK_MESSAGE(2 == tb->getFVint(fdName1), "GetEqual id 2");
-    BOOST_CHECK_MESSAGE(_tcscmp(tb->getFVstr(fdName2), _T("矢口")) == 0, "GetEqual name 2");
-	tb->release();
-
+    BOOST_CHECK_MESSAGE(_tcscmp(tb->getFVstr(fdName2), _T("矢口")) == 0,
+                        "GetEqual name 2");
+    tb->release();
 }
 
 // ------------------------------------------------------------------------
@@ -2086,7 +2333,7 @@ void testResultField(database* db)
 
     size_t len = rf.writeBuffer(0, true) - (unsigned char*)0;
     BOOST_CHECK_MESSAGE(len == 4, " resultField.writeBuffer");
-
+    tb->release();
 }
 
 void testResultDef()
@@ -2099,11 +2346,8 @@ void testResultDef()
 
     size_t len = rd.writeBuffer(0, true) - (unsigned char*)0;
     BOOST_CHECK_MESSAGE(len == 4, " resultDef.writeBuffer");
-
- 
 }
 
-
 void testLogic(database* db)
 {
     table* tb = openTable(db);
@@ -2111,71 +2355,70 @@ void testLogic(database* db)
 
     lc.setParam(tb, _T("name"), _T("="), _T("abc"), eCend);
 
-
     BOOST_CHECK_MESSAGE(lc.type == ft_zstring, " logic.type");
     BOOST_CHECK_MESSAGE(lc.len == 33, " logic.len");
     BOOST_CHECK_MESSAGE(lc.pos == 4, " logic.pos");
     BOOST_CHECK_MESSAGE(lc.logType == 1, " logic.logType");
     BOOST_CHECK_MESSAGE(lc.opr == eCend, " logic.opr");
-    BOOST_CHECK_MESSAGE(strcmp((char*)lc.data, "abc")==0, " logic.data");
+    BOOST_CHECK_MESSAGE(strcmp((char*)lc.data, "abc") == 0, " logic.data");
 
     size_t len = lc.writeBuffer(0, true, false) - (unsigned char*)0;
-    BOOST_CHECK_MESSAGE(len == 7+33, " logic.writeBuffer");
+    BOOST_CHECK_MESSAGE(len == 7 + 33, " logic.writeBuffer");
 
-    //compField invalid filed name
+    // compField invalid filed name
     bool ret = lc.setParam(tb, _T("name"), _T("="), _T("1"), eCend, true);
     BOOST_CHECK_MESSAGE(ret == false, " logic invalid filed name");
 
-    //compField
+    // compField
     ret = lc.setParam(tb, _T("name"), _T("="), _T("id"), eCend, true);
     BOOST_CHECK_MESSAGE(ret == true, " logic filed name");
     BOOST_CHECK_MESSAGE(lc.type == ft_zstring, " logic.type");
     BOOST_CHECK_MESSAGE(lc.len == 33, " logic.len");
     BOOST_CHECK_MESSAGE(lc.pos == 4, " logic.pos");
-    BOOST_CHECK_MESSAGE(lc.logType == 1+CMPLOGICAL_FIELD, " logic.logType compField");
+    BOOST_CHECK_MESSAGE(lc.logType == 1 + CMPLOGICAL_FIELD,
+                        " logic.logType compField");
     BOOST_CHECK_MESSAGE(lc.opr == eCend, " logic.opr");
     BOOST_CHECK_MESSAGE(*((short*)lc.data) == 0, " logic.data");
     len = lc.writeBuffer(0, true, false) - (unsigned char*)0;
-    BOOST_CHECK_MESSAGE(len == 7+2, " logic.writeBuffer");
+    BOOST_CHECK_MESSAGE(len == 7 + 2, " logic.writeBuffer");
 
-    //invalid filed name
+    // invalid filed name
     ret = lc.setParam(tb, _T("name1"), _T("="), _T("id"), eCend, true);
     BOOST_CHECK_MESSAGE(ret == false, " logic invalid filed name2");
 
-    //wildcard
-    ret = lc.setParam(tb, _T("name"), _T("="), _T("abc*"), eCend, false);
+    // wildcard
+    lc.setParam(tb, _T("name"), _T("="), _T("abc*"), eCend, false);
     BOOST_CHECK_MESSAGE(lc.type == ft_zstring, " logic.type");
     BOOST_CHECK_MESSAGE(lc.len == 3, " logic.len");
     BOOST_CHECK_MESSAGE(lc.pos == 4, " logic.pos");
     BOOST_CHECK_MESSAGE(lc.logType == 1, " logic.logType");
     BOOST_CHECK_MESSAGE(lc.opr == eCend, " logic.opr");
-    BOOST_CHECK_MESSAGE(strcmp((char*)lc.data, "abc")==0, " logic.data");
+    BOOST_CHECK_MESSAGE(strcmp((char*)lc.data, "abc") == 0, " logic.data");
 
     len = lc.writeBuffer(0, true, false) - (unsigned char*)0;
-    BOOST_CHECK_MESSAGE(len == 7+3, " logic.writeBuffer");
+    BOOST_CHECK_MESSAGE(len == 7 + 3, " logic.writeBuffer");
 
-    ret = lc.setParam(tb, _T("name"), _T("="), _T("漢字*"), eCend, false);
-    BOOST_CHECK_MESSAGE(strcmp((char*)lc.data, "漢字")==0, " logic.data");
+    lc.setParam(tb, _T("name"), _T("="), _T("漢字*"), eCend, false);
+    BOOST_CHECK_MESSAGE(strcmp((char*)lc.data, "漢字") == 0, " logic.data");
 
     len = lc.writeBuffer(0, true, false) - (unsigned char*)0;
-    BOOST_CHECK_MESSAGE(len == 7 + (_tcslen(_T("漢字"))*sizeof(_TCHAR))
-                                    , " logic.writeBuffer len =" << len);
+    BOOST_CHECK_MESSAGE(len == 7 + (_tcslen(_T("漢字")) * sizeof(_TCHAR)),
+                        " logic.writeBuffer len =" << len);
 
-
-    //combine
-    ret = lc.setParam(tb, _T("name"), _T("="), _T("abc*"), eCor, false);
+    // combine
+    lc.setParam(tb, _T("name"), _T("="), _T("abc*"), eCor, false);
     BOOST_CHECK_MESSAGE(lc.opr == 2, " logic.opr or");
-    ret = lc.setParam(tb, _T("name"), _T("="), _T("abc*"), eCand, false);
+    lc.setParam(tb, _T("name"), _T("="), _T("abc*"), eCand, false);
     BOOST_CHECK_MESSAGE(lc.opr == 1, " logic.opr and");
 
-    //logType
+    // logType
     ret = lc.setParam(tb, _T("name"), _T("!="), _T("abc*"), eCend, false);
     BOOST_CHECK_MESSAGE(lc.logType == 255, " logic.logType !=");
     BOOST_CHECK_MESSAGE(ret == false, " logic invalid logType");
 
-    //canJoin
+    // canJoin
 
-    //zstring is cannot join
+    // zstring is cannot join
     lc.setParam(tb, _T("name"), _T("="), _T("1"), eCand, false);
     BOOST_CHECK_MESSAGE(lc.canJoin(false) == false, " logic canJoin");
     BOOST_CHECK_MESSAGE(lc.canJoin(true) == false, " logic canJoin");
@@ -2191,7 +2434,6 @@ void testLogic(database* db)
     BOOST_CHECK_MESSAGE(lc.canJoin(true) == false, " logic canJoin");
     BOOST_CHECK_MESSAGE(lc.canJoin(false) == true, " logic canJoin");
 
-
     lc.opr = eCand;
 
     logic lc2;
@@ -2203,7 +2445,7 @@ void testLogic(database* db)
     lc2.pos = 4;
     BOOST_CHECK_MESSAGE(lc.isNextFiled(&lc2) == true, " logic isNextFiled");
 
-    //join
+    // join
     lc.joinAfter(&lc2);
     BOOST_CHECK_MESSAGE(lc.len == 8, " logic joinAfter");
 
@@ -2212,96 +2454,109 @@ void testLogic(database* db)
     header hd;
     len = hd.writeBuffer(0, true) - (unsigned char*)0;
     BOOST_CHECK_MESSAGE(len == 8, " header.writeBuffer");
-
-
+    tb->release();
 }
 
-
-
 void testQuery()
 {
     queryBase q;
     q.queryString(_T("id = 0 and name = 'Abc efg'"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("id = '0' and name = 'Abc efg'")
-                          ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) ==
+                            _T("id = '0' and name = 'Abc efg'"),
+                        "queryString");
+
     q.queryString(_T(""));
     q.addLogic(_T("id"), _T("="), _T("0"));
     q.addLogic(_T("and"), _T("name"), _T("="), _T("Abc efg"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("id = '0' and name = 'Abc efg'"), "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) ==
+                            _T("id = '0' and name = 'Abc efg'"),
+                        "queryString");
+
     q.queryString(_T("select id,name id = 0 AND name = 'Abc&' efg'"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name id = '0' AND name = 'Abc&' efg'")
-                          ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(
+        _tstring(q.toString()) ==
+            _T("select id,name id = '0' AND name = 'Abc&' efg'"),
+        "queryString");
+
     q.queryString(_T(""));
     q.addField(_T("id"));
     q.addField(_T("name"));
     q.addLogic(_T("id"), _T("="), _T("0"));
     q.addLogic(_T("AND"), _T("name"), _T("="), _T("Abc' efg"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name id = '0' AND name = 'Abc&' efg'")
-                          ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(
+        _tstring(q.toString()) ==
+            _T("select id,name id = '0' AND name = 'Abc&' efg'"),
+        "queryString");
+
     q.queryString(_T("select id,name id = 0 AND name = 'Abc&& efg'"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name id = '0' AND name = 'Abc&& efg'")
-                          ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(
+        _tstring(q.toString()) ==
+            _T("select id,name id = '0' AND name = 'Abc&& efg'"),
+        "queryString");
+
     q.queryString(_T(""));
     q.addField(_T("id"));
     q.addField(_T("name"));
     q.addLogic(_T("id"), _T("="), _T("0"));
     q.addLogic(_T("AND"), _T("name"), _T("="), _T("Abc& efg"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name id = '0' AND name = 'Abc&& efg'")
-                          ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(
+        _tstring(q.toString()) ==
+            _T("select id,name id = '0' AND name = 'Abc&& efg'"),
+        "queryString");
+
     q.queryString(_T("*"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("*"),  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("*"), "queryString");
+
     q.queryString(_T(""));
     q.all();
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("*"),  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("*"), "queryString");
+
     q.queryString(_T("Select id,name id = 2"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name id = '2'")
-                            ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name id = '2'"),
+                        "queryString");
+
     q.queryString(_T(""));
     q.addField(_T("id"));
     q.addField(_T("name"));
     q.addLogic(_T("id"), _T("="), _T("2"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name id = '2'")
-                            ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name id = '2'"),
+                        "queryString");
+
     q.queryString(_T("SELECT id,name,fc id = 2"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name,fc id = '2'")
-                            ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) ==
+                            _T("select id,name,fc id = '2'"),
+                        "queryString");
+
     q.queryString(_T(""));
     q.addField(_T("id"));
     q.addField(_T("name"));
     q.addField(_T("fc"));
     q.addLogic(_T("id"), _T("="), _T("2"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name,fc id = '2'")
-                            ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) ==
+                            _T("select id,name,fc id = '2'"),
+                        "queryString");
+
     q.queryString(_T("select id,name,fc id = 2 and name = '3'"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name,fc id = '2' and name = '3'")
-                            ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) ==
+                            _T("select id,name,fc id = '2' and name = '3'"),
+                        "queryString");
+
     q.queryString(_T(""));
     q.addField(_T("id"));
     q.addField(_T("name"));
     q.addField(_T("fc"));
     q.addLogic(_T("id"), _T("="), _T("2"));
     q.addLogic(_T("and"), _T("name"), _T("="), _T("3"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name,fc id = '2' and name = '3'")
-                            ,  "queryString");
-    
-    //IN include
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) ==
+                            _T("select id,name,fc id = '2' and name = '3'"),
+                        "queryString");
+
+    // IN include
     q.queryString(_T("select id,name,fc IN '1','2','3'"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name,fc in '1','2','3'")
-                            ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) ==
+                            _T("select id,name,fc in '1','2','3'"),
+                        "queryString");
+
     q.queryString(_T(""));
     q.addField(_T("id"));
     q.addField(_T("name"));
@@ -2309,107 +2564,610 @@ void testQuery()
     q.addSeekKeyValue(_T("1"));
     q.addSeekKeyValue(_T("2"));
     q.addSeekKeyValue(_T("3"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select id,name,fc in '1','2','3'")
-                            ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) ==
+                            _T("select id,name,fc in '1','2','3'"),
+                        "queryString");
+
     q.queryString(_T("IN '1','2','3'"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("in '1','2','3'")
-                            ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("in '1','2','3'"),
+                        "queryString");
+
     q.queryString(_T("IN 1,2,3"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("in '1','2','3'")
-                            ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("in '1','2','3'"),
+                        "queryString");
+
     q.queryString(_T(""));
     q.addSeekKeyValue(_T("1"));
     q.addSeekKeyValue(_T("2"));
     q.addSeekKeyValue(_T("3"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("in '1','2','3'")
-                            ,  "queryString");
-    
-    //special field name
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("in '1','2','3'"),
+                        "queryString");
+
+    // special field name
     q.queryString(_T("select = 1"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select = '1'")
-                            ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select = '1'"),
+                        "queryString");
+
     q.queryString(_T(""));
     q.addLogic(_T("select"), _T("="), _T("1"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select = '1'")
-                            ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("select = '1'"),
+                        "queryString");
+
     q.queryString(_T("in <> 1"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("in <> '1'")
-                            ,  "queryString");
-    
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("in <> '1'"),
+                        "queryString");
+
     q.queryString(_T(""));
     q.addLogic(_T("in"), _T("<>"), _T("1"));
-    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("in <> '1'")
-                            ,  "queryString");
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("in <> '1'"),
+                        "queryString");
+
+    // test auto_escape
+    q.queryString(_T("code = ab'c"), true);
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("code = 'ab&'c'"),
+                        "queryString");
+
+    q.queryString(_T("code = ab&c"), true);
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("code = 'ab&&c'"),
+                        "queryString");
+
+    q.queryString(_T("code = abc&"), true);
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("code = 'abc&&'"),
+                        "queryString");
+    q.queryString(_T("code = abc&&"), true);
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("code = 'abc&&&&'"),
+                        "queryString");
+
+    q.queryString(_T("code = 'abc&'"), true);
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("code = 'abc&&'"),
+                        "queryString");
+    q.queryString(_T("code = 'abc&&'"), true);
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("code = 'abc&&&&'"),
+                        "queryString");
+
+    q.queryString(_T("code = 'ab'c'"), true);
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("code = 'ab&'c'"),
+                        "queryString");
+
+    q.queryString(_T("code = 'abc''"), true);
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("code = 'abc&''"),
+                        "queryString");
+
+    q.queryString(_T("code = abc'"), true);
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("code = 'abc&''"),
+                        "queryString");
+
+    // Invalid end no close '
+    q.queryString(_T("code = 'abc"), true);
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("code = 'abc'"),
+                        "queryString");
+
+    q.queryString(_T("code = &abc"), true);
+    BOOST_CHECK_MESSAGE(_tstring(q.toString()) == _T("code = '&&abc'"),
+                        "queryString");
 }
-// ------------------------------------------------------------------------
-BOOST_AUTO_TEST_SUITE(btrv_nativ)
 
-    BOOST_FIXTURE_TEST_CASE(createNewDataBase, fixture)
+void teetNewDelete(database* db)
+{
+    // printf("new delete start \n");
+    for (int i = 0; i < 500; ++i)
     {
-        const _TCHAR* uri = makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME);
-		_tprintf(_T("URI = %s\n"), uri);
-		if (db()->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME)))
-            db()->drop();
-        testCreateNewDataBase(db());
-    }
-    BOOST_FIXTURE_TEST_CASE(clone, fixture) {testClone(db());}
+        queryBase qb;
+        qb.reset();
 
-    BOOST_FIXTURE_TEST_CASE(version, fixture) {testVersion(db());}
+        query q;
+        q.reset();
 
-    BOOST_FIXTURE_TEST_CASE(insert, fixture) {testInsert(db());}
+        recordsetQuery rq;
+        rq.reset();
 
-    BOOST_FIXTURE_TEST_CASE(find, fixture) {testFind(db());}
+        groupQuery gq;
+        gq.reset();
 
-    BOOST_FIXTURE_TEST_CASE(findNext, fixture)
-    {
-        testFindNext(db());
-        testFindIn(db());
+        fieldNames f;
+        f.addValue(_T("abc"));
+
+        activeTable atu(db, _T("user"));
+        atu.index(0);
+        activeTable atg(db, _T("groups"));
+        atg.index(0);
+        fieldNames fns;
+        fns.keyField(_T("a"));
+
+        client::sum s(fns);
+        s.reset();
+
+        client::count c(_T("a"));
+        c.reset();
+
+        client::avg a(fns);
+        a.reset();
+        client::min mi(fns);
+        mi.reset();
+        client::max ma(fns);
+        ma.reset();
+
+        recordset rs;
+        rs.clear();
+
+#ifndef BCB_64
+        queryBase* nqb1 = new queryBase(); // bcb64 bad
+        delete nqb1;
+#endif
+        queryBase* nqb = queryBase::create(); // All OK
+        nqb->release();
+
+        query* nqq = query::create(); // All OK
+        nqq->release();
+
+#ifndef BCB_64
+        query* nqq1 = new query(); // bcb64 bad
+        delete nqq1;
+#endif
+        recordsetQuery* nrq = recordsetQuery::create(); // All OK
+        nrq->release();
+
+#ifndef BCB_64
+        recordsetQuery* nrqq = new recordsetQuery(); // bcb64 bad
+        delete nrqq;
+
+        groupQuery* ngq1 = new groupQuery(); // bcb64 bad
+        delete ngq1;
+#endif
+        groupQuery* ngq = groupQuery::create(); // All OK
+        ngq->release();
+
+        fieldNames* nfn = fieldNames::create(); // All OK
+        nfn->release();
+
+#ifndef BCB_64
+        fieldNames* nfn1 = new fieldNames(); // bcb64 bad
+        delete nfn1;
+#endif
+
+        activeTable* at = new activeTable(db, _T("user")); // All OK
+        activeTable* atg1 = new activeTable(db, _T("groups")); // All OK
+        delete atg1;
+        delete at;
+
+#ifndef BCB_64
+
+        client::sum* ns1 = new sum(fns); // bcb64 bad
+        delete ns1;
+
+        client::count* nc1 = new client::count(_T("a")); // bcb64 bad
+        delete nc1;
+
+        client::avg* na1 = new client::avg(fns); // bcb64 bad
+        delete na1;
+
+        client::min* nmin1 = new client::min(fns); // bcb64 bad
+        delete nmin1;
+
+        client::max* nmax1 = new client::max(fns); // bcb64 bad
+        delete nmax1;
+
+#endif
+
+        client::sum* ns = sum::create(fns); // All OK
+        ns->release();
+
+        client::count* nc = client::count::create(_T("a")); // All OK
+        nc->release();
+
+        client::avg* na = client::avg::create(fns); // All OK
+        na->release();
+
+        client::min* nmin = client::min::create(fns); // All OK
+        nmin->release();
+
+        client::max* nmax = client::max::create(fns); // All OK
+        nmax->release();
+
+        recordset* r = new recordset(); // All OK
+
+        recordset* rc(r->clone()); // All OK
+        // delete rc;                          //All bad
+        rc->release();
+
+        delete r; // All OK
     }
 
-    BOOST_FIXTURE_TEST_CASE(getPercentage, fixture) {testGetPercentage(db());}
+    // activeTable releaseTable
+    activeTable* at = new activeTable(db, _T("user"));
+    at->releaseTable();
+    BOOST_CHECK_MESSAGE(at->table() == NULL, " activeTable::releaseTable");
+    delete at;
+}
+
+void testJoin(database* db)
+{
+
+#ifdef LINUX
+    const char* fd_name = "名前";
+#else
+#ifdef _UNICODE
+    const wchar_t fd_name[] = { L"名前" };
+#else
+    char fd_name[30];
+    WideCharToMultiByte(CP_UTF8, 0, L"名前", -1, fd_name, 30, NULL, NULL);
+#endif
+#endif
+
+    activeTable atu(db, _T("user"));
+
+    activeTable atg(db, _T("groups"));
+
+    activeTable ate(db, _T("extention"));
+    recordset rs;
+    query q;
+
+    atu.alias(fd_name, _T("name"));
+    q.select(_T("id"), _T("name"), _T("group"))
+        .where(_T("id"), _T("<="), 15000);
+    atu.index(0).keyValue(1).read(rs, q);
+    BOOST_CHECK_MESSAGE(rs.size() == 15000, " rs.size()== 15000");
+
+    // Join extention::comment
+    q.reset();
+    ate.index(0).join(
+        rs, q.select(_T("comment")).optimize(queryBase::joinHasOneOrHasMany),
+        _T("id"));
+    BOOST_CHECK_MESSAGE(rs.size() == 15000, "join  rs.size()== 15000");
+
+    // test reverse
+
+    row& last = rs.reverse().first();
+    BOOST_CHECK_MESSAGE(last[_T("id")].i() == 15000, "last field id == 15000");
+    BOOST_CHECK_MESSAGE(_tstring(last[_T("comment")].c_str()) ==
+                            _tstring(_T("15000 comment")),
+                        "last field comment");
+
+    // Join group::name
+    q.reset();
+    atg.alias(_T("name"), _T("group_name"));
+    atg.index(0).join(rs, q.select(_T("group_name")), _T("group"));
+    BOOST_CHECK_MESSAGE(rs.size() == 15000, "join2  rs.size()== 15000");
+    row& first = rs.last();
+
+    BOOST_CHECK_MESSAGE(first[_T("id")].i() == 1, "first field id == 1");
+    BOOST_CHECK_MESSAGE(_tstring(first[_T("comment")].c_str()) ==
+                            _tstring(_T("1 comment")),
+                        "first field comment");
+
+    BOOST_CHECK_MESSAGE(
+        _tstring(first[_T("group_name")].c_str()) == _tstring(_T("1 group")),
+        "first field group_name " << string(first[_T("group_name")].a_str()));
+    BOOST_CHECK_MESSAGE(
+        _tstring(first[_T("group_name")].c_str()) == _tstring(_T("1 group")),
+        "first field group_name " << string(first[_T("group_name")].a_str()));
+    // row_ptr row = rs[15000 - 9];
+    row& rec = rs[15000 - 9];
+    BOOST_CHECK_MESSAGE(
+        _tstring(rec[_T("group_name")].c_str()) == _tstring(_T("4 group")),
+        "group_name = 4 group " << string((rec)[_T("group_name")].a_str()));
+
+    // Test orderby
+    rs.orderBy(_T("group_name"));
+    // rec = rs[(size_t)0];
+    BOOST_CHECK_MESSAGE(_tstring(rs[(size_t)0][_T("group_name")].c_str()) ==
+                            _tstring(_T("1 group")),
+                        "group_name = 1 group "
+                            << string(rs[(size_t)0][_T("group_name")].a_str()));
+
+    sortFields orderRv;
+    orderRv.add(_T("group_name"), false);
+    rs.orderBy(orderRv);
+
+    sortFields order;
+    order.add(_T("group_name"), true);
+    rs.orderBy(order);
+    BOOST_CHECK_MESSAGE(_tstring(rs[(size_t)0][_T("group_name")].c_str()) ==
+                            _tstring(_T("1 group")),
+                        "group_name = 1 group "
+                            << string(rs[(size_t)0][_T("group_name")].a_str()));
+
+    // test union
+    recordset rs2;
+    atu.alias(fd_name, _T("name"));
+
+    q.reset().select(_T("id"), _T("name"), _T("group")).where(_T("id"),
+                                                              _T("<="), 16000);
+    atu.index(0).keyValue(15001).read(rs2, q);
+    ate.index(0).join(rs2, q.reset().select(_T("comment")).optimize(
+                               queryBase::joinHasOneOrHasMany),
+                      _T("id"));
+
+    atg.alias(_T("name"), _T("group_name"));
+    atg.index(0).join(rs2, q.reset().select(_T("group_name")), _T("group"));
+    BOOST_CHECK_MESSAGE(rs2.size() == 1000, "join2  rs2.size()== 1000");
+
+    rs += rs2;
+    BOOST_CHECK_MESSAGE(rs.size() == 16000, "union  rs.size()== 16000");
+    // row = rs[15000];
+    BOOST_CHECK_MESSAGE(rs[15000][_T("id")].i() == 15001, "id = 15001");
+    // row = rs.last();
+    BOOST_CHECK_MESSAGE(rs.last()[_T("id")].i() == 16000, "id = 16000");
+
+    // test group by
+    groupQuery gq;
+    gq.keyField(_T("group"), _T("id"));
+
+    client::count count1(_T("count"));
+    gq.addFunction(&count1);
+
+    client::count count2(_T("gropu1_count"));
+    count2.when(_T("group"), _T("="), 1);
+
+    gq.addFunction(&count2);
+    rs.groupBy(gq);
+    BOOST_CHECK_MESSAGE(rs.size() == 16000, "group by  rs.size()== 16000");
+    int v = rs[0][_T("gropu1_count")].i();
+    BOOST_CHECK_MESSAGE(v == 1, "gropu1_count = " << v);
+
+    // clone
+    recordset* rsv(rs.clone());
+
+    gq.reset();
+    client::count count3(_T("count"));
+    gq.addFunction(&count3).keyField(_T("group")); //.resultField(_T("count"));
+    rs.groupBy(gq);
+    BOOST_CHECK_MESSAGE(rs.size() == 5,
+                        "group by2  rs.size()==" << rsv->size());
+
+    // having
+    recordsetQuery rq;
+    rq.when(_T("gropu1_count"), _T("="), 1).or_(_T("gropu1_count"), _T("="), 2);
+    rsv->matchBy(rq);
+    BOOST_CHECK_MESSAGE(rsv->size() == 3200,
+                        "matchBy  rsv.size() ==" << rsv->size());
+    rsv->release();
+    // top
+    recordset rs3;
+    rs.top(rs3, 10);
+    BOOST_CHECK_MESSAGE(rs3.size() == 5, "top 10  rs3.size()== 5");
+
+    // query new / delete
+    recordsetQuery* q1 = recordsetQuery::create();
+    q1->when(_T("gropu1_count"), _T("="), 1)
+        .or_(_T("gropu1_count"), _T("="), 2);
+    q1->release();
+
+    query* q2 = query::create();
+    q2->where(_T("gropu1_count"), _T("="), 1)
+        .or_(_T("gropu1_count"), _T("="), 2);
+    q2->release();
+
+    groupQuery* q3 = groupQuery::create();
+    q3->keyField(_T("group"), _T("id"));
+    q3->release();
+}
+
+void testWirtableRecord(database* db)
+{
+
+#ifdef LINUX
+    const char* fd_name = "名前";
+#else
+#ifdef _UNICODE
+    const wchar_t fd_name[] = { L"名前" };
+#else
+    char fd_name[30];
+    WideCharToMultiByte(CP_UTF8, 0, L"名前", -1, fd_name, 30, NULL, NULL);
+#endif
+#endif
+
+    activeTable atu(db, _T("user"));
+
+    writableRecord& rec = atu.index(0).getWritableRecord();
+
+    rec[_T("id")] = 120000;
+    rec[fd_name] = _T("aiba");
+    rec.save();
+
+    rec.clear();
+    rec[_T("id")] = 120000;
+    rec.read();
+    BOOST_CHECK_MESSAGE(_tstring(rec[fd_name].c_str()) == _tstring(_T("aiba")),
+                        "rec 120000 name ");
+
+    rec.clear();
+    rec[_T("id")] = 120001;
+    bool r = rec.read();
+    rec[fd_name] = _T("oono");
+    if (!r)
+        rec.insert();
+    else
+        rec.update();
+
+    rec.clear();
+    rec[_T("id")] = 120001;
+    rec.read();
+
+    BOOST_CHECK_MESSAGE(_tstring(rec[1].c_str()) == _tstring(_T("oono")),
+                        "rec 120001 name ");
+    // update changed filed only
+    rec.clear();
+    rec[_T("id")] = 120001;
+    rec[fd_name] = _T("matsumoto");
+    rec.update();
+
+    rec.clear();
+    rec[_T("id")] = 120001;
+    rec.read();
+    BOOST_CHECK_MESSAGE(_tstring(rec[fd_name].c_str()) ==
+                            _tstring(_T("matsumoto")),
+                        "rec 120001 update name ");
+
+    rec.del();
+    rec[_T("id")] = 120000;
+    rec.del();
+
+    rec.clear();
+    rec[_T("id")] = 120001;
+    bool ret = rec.read();
+    BOOST_CHECK_MESSAGE(ret == false, "rec 120001 delete ");
+
+    rec.clear();
+    rec[_T("id")] = 120000;
+    ret = rec.read();
+    BOOST_CHECK_MESSAGE(ret == false, "rec 120000 delete ");
+}
+
+void testDbPool()
+{
+    pooledDbManager poolMgr;
+    pooledDbManager::setMaxConnections(4);
+
+    connectParams pm(PROTOCOL, HOSTNAME, _T("querytest"), DBNAME);
+    poolMgr.use(&pm);
+    poolMgr.use(&pm);
+    poolMgr.use(&pm);
+    poolMgr.unUse();
+    poolMgr.reset(0);
+}
+
+// ------------------------------------------------------------------------
+BOOST_AUTO_TEST_SUITE(btrv_nativ)
+
+BOOST_FIXTURE_TEST_CASE(createNewDataBase, fixture)
+{
+    const _TCHAR* uri = makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME);
+    _tprintf(_T("URI = %s\n"), uri);
+    if (db()->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME)))
+        db()->drop();
+    testCreateNewDataBase(db());
+}
+BOOST_FIXTURE_TEST_CASE(clone, fixture)
+{
+    testClone(db());
+}
+
+BOOST_FIXTURE_TEST_CASE(version, fixture)
+{
+    testVersion(db());
+}
+
+BOOST_FIXTURE_TEST_CASE(insert, fixture)
+{
+    testInsert(db());
+}
+
+BOOST_FIXTURE_TEST_CASE(find, fixture)
+{
+    testFind(db());
+}
+
+BOOST_FIXTURE_TEST_CASE(findNext, fixture)
+{
+    testFindNext(db());
+    testFindIn(db());
+}
+
+BOOST_FIXTURE_TEST_CASE(getPercentage, fixture)
+{
+    testGetPercentage(db());
+}
+
+BOOST_FIXTURE_TEST_CASE(movePercentage, fixture)
+{
+    testMovePercentage(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(movePercentage, fixture) {testMovePercentage(db());}
+BOOST_FIXTURE_TEST_CASE(getEqual, fixture)
+{
+    testGetEqual(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(getEqual, fixture) {testGetEqual(db());}
+BOOST_FIXTURE_TEST_CASE(getNext, fixture)
+{
+    testGetNext(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(getNext, fixture) {testGetNext(db());}
+BOOST_FIXTURE_TEST_CASE(getPrevious, fixture)
+{
+    testGetPrevious(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(getPrevious, fixture) {testGetPrevious(db());}
+BOOST_FIXTURE_TEST_CASE(getGreater, fixture)
+{
+    testGetGreater(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(getGreater, fixture) {testGetGreater(db());}
+BOOST_FIXTURE_TEST_CASE(getLessThan, fixture)
+{
+    testGetLessThan(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(getLessThan, fixture) {testGetLessThan(db());}
+BOOST_FIXTURE_TEST_CASE(getFirst, fixture)
+{
+    testGetFirst(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(getFirst, fixture) {testGetFirst(db());}
+BOOST_FIXTURE_TEST_CASE(getLast, fixture)
+{
+    testGetLast(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(getLast, fixture) {testGetLast(db());}
+BOOST_FIXTURE_TEST_CASE(movePosition, fixture)
+{
+    testMovePosition(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(movePosition, fixture) {testMovePosition(db());}
+BOOST_FIXTURE_TEST_CASE(update, fixture)
+{
+    testUpdate(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(update, fixture) {testUpdate(db());}
+BOOST_FIXTURE_TEST_CASE(snapShot, fixture)
+{
+    testSnapShot(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(snapShot, fixture) {testSnapShot(db());}
+BOOST_FIXTURE_TEST_CASE(conflict, fixture)
+{
+    testConflict(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(conflict, fixture) {testConflict(db());}
+BOOST_FIXTURE_TEST_CASE(transactionLock, fixture)
+{
+    testTransactionLock(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(transactionLock, fixture) {testTransactionLock(db());}
+BOOST_AUTO_TEST_CASE(Exclusive)
+{
+    testExclusive();
+}
 
-    BOOST_FIXTURE_TEST_CASE(insert2, fixture) {testInsert2(db());}
+BOOST_FIXTURE_TEST_CASE(insert2, fixture)
+{
+    testInsert2(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(delete_, fixture) {testDelete(db());}
+BOOST_FIXTURE_TEST_CASE(delete_, fixture)
+{
+    testDelete(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(setOwner, fixture) {testSetOwner(db());}
+BOOST_FIXTURE_TEST_CASE(setOwner, fixture)
+{
+    testSetOwner(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(dropIndex, fixture) {testDropIndex(db());}
+BOOST_FIXTURE_TEST_CASE(dropIndex, fixture)
+{
+    testDropIndex(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(dropDatabase, fixture) {testDropDatabase(db());}
+BOOST_FIXTURE_TEST_CASE(dropDatabase, fixture)
+{
+    testDropDatabase(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(connect, fixture) {testLogin(db());}
+BOOST_FIXTURE_TEST_CASE(connect, fixture)
+{
+    testLogin(db());
+}
 BOOST_AUTO_TEST_SUITE_END()
 
 // ------------------------------------------------------------------------
@@ -2419,24 +3177,23 @@ BOOST_AUTO_TEST_SUITE_END()
 #include <bzs/env/mbcswchrLinux.h>
 
 BOOST_AUTO_TEST_SUITE(convert)
-    BOOST_AUTO_TEST_CASE(u8tombc)
-    {
-        char mbc[256];
-        char u8[256] = "123";
+BOOST_AUTO_TEST_CASE(u8tombc)
+{
+    char mbc[256];
+    char u8[256] = "123";
 
-        bzs::env::u8tombc(u8, -1, mbc, 256);
-        BOOST_CHECK_MESSAGE(!strcmp(mbc, u8), u8);
+    bzs::env::u8tombc(u8, -1, mbc, 256);
+    BOOST_CHECK_MESSAGE(!strcmp(mbc, u8), u8);
 
-        strcpy(u8, "漢字");
-        char mbcKanji[20] =
-        {0x8A, 0xBF, 0x8E, 0x9A, 0x00};
-        bzs::env::u8tombc(u8, -1, mbc, 256);
-        BOOST_CHECK_MESSAGE(!strcmp(mbc, mbcKanji), u8);
+    strcpy(u8, "漢字");
+    unsigned char mbcKanji[20] = { 0x8A, 0xBF, 0x8E, 0x9A, 0x00 };
+    bzs::env::u8tombc(u8, -1, mbc, 256);
+    BOOST_CHECK_MESSAGE(!strcmp(mbc, (const char*)mbcKanji), u8);
 
-        memset(u8, 0, 256);
-        bzs::env::mbctou8(mbc, -1, u8, 256);
-        BOOST_CHECK_MESSAGE(!strcmp(u8, "漢字"), "漢字2");
-    }
+    memset(u8, 0, 256);
+    bzs::env::mbctou8(mbc, -1, u8, 256);
+    BOOST_CHECK_MESSAGE(!strcmp(u8, "漢字"), "漢字2");
+}
 
 BOOST_AUTO_TEST_SUITE_END()
 #endif
@@ -2445,17 +3202,35 @@ BOOST_AUTO_TEST_SUITE_END()
 // ------------------------------------------------------------------------
 BOOST_AUTO_TEST_SUITE(var_field)
 
-    BOOST_FIXTURE_TEST_CASE(createDataBaseVar, fixture) {testCreateDataBaseVar(db());}
+BOOST_FIXTURE_TEST_CASE(createDataBaseVar, fixture)
+{
+    testCreateDataBaseVar(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(varField, fixture) {testVarField(db());}
+BOOST_FIXTURE_TEST_CASE(varField, fixture)
+{
+    testVarField(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(varInsert, fixture) {testVarInsert(db());}
+BOOST_FIXTURE_TEST_CASE(varInsert, fixture)
+{
+    testVarInsert(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(varRead, fixture) {testVarRead(db());}
+BOOST_FIXTURE_TEST_CASE(varRead, fixture)
+{
+    testVarRead(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(filterVar, fixture) {testFilterVar(db());}
+BOOST_FIXTURE_TEST_CASE(filterVar, fixture)
+{
+    testFilterVar(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(dropDataBaseVar, fixture) {testDropDataBaseVar(db());}
+BOOST_FIXTURE_TEST_CASE(dropDataBaseVar, fixture)
+{
+    testDropDataBaseVar(db());
+}
 
 BOOST_AUTO_TEST_SUITE_END()
 // ------------------------------------------------------------------------
@@ -2463,9 +3238,15 @@ BOOST_AUTO_TEST_SUITE_END()
 // ------------------------------------------------------------------------
 BOOST_AUTO_TEST_SUITE(filter)
 
-    BOOST_FIXTURE_TEST_CASE(stringFileter, fixture) {testStringFileter(db());}
+BOOST_FIXTURE_TEST_CASE(stringFileter, fixture)
+{
+    testStringFileter(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(dropDataBaseStr, fixture) {testDropDataBaseStr(db());}
+BOOST_FIXTURE_TEST_CASE(dropDataBaseStr, fixture)
+{
+    testDropDataBaseStr(db());
+}
 
 BOOST_AUTO_TEST_SUITE_END()
 // ------------------------------------------------------------------------
@@ -2473,38 +3254,75 @@ BOOST_AUTO_TEST_SUITE_END()
 // ------------------------------------------------------------------------
 BOOST_AUTO_TEST_SUITE(kanjiSchema)
 
-    BOOST_FIXTURE_TEST_CASE(knajiCreateSchema, fixture) {testKnajiCreateSchema(db());}
+BOOST_FIXTURE_TEST_CASE(knajiCreateSchema, fixture)
+{
+    testKnajiCreateSchema(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(insertKanji, fixture) {testInsertKanji(db());}
+BOOST_FIXTURE_TEST_CASE(insertKanji, fixture)
+{
+    testInsertKanji(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(getEqualKanji, fixture) {testGetEqualKanji(db());}
+BOOST_FIXTURE_TEST_CASE(getEqualKanji, fixture)
+{
+    testGetEqualKanji(db());
+}
 
-    BOOST_FIXTURE_TEST_CASE(dropDatabaseKanji, fixture) {testDropDatabaseKanji(db());}
+BOOST_FIXTURE_TEST_CASE(dropDatabaseKanji, fixture)
+{
+    testDropDatabaseKanji(db());
+}
 
 BOOST_AUTO_TEST_SUITE_END()
 
 // ------------------------------------------------------------------------
 BOOST_AUTO_TEST_SUITE(filter)
 
-    BOOST_FIXTURE_TEST_CASE(resultField, fixture)
-    {
+BOOST_FIXTURE_TEST_CASE(resultField, fixture)
+{
 
-		if (db()->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME)))
-            db()->drop();
-        testCreateNewDataBase(db());
-        testResultField(db());
-        testResultDef();
-        testLogic(db());
-        testQuery();
-    }
-    BOOST_FIXTURE_TEST_CASE(drop, fixture)
-    {
-        testDropDatabase(db());
-    }
-    BOOST_FIXTURE_TEST_CASE(fuga, fixture) {BOOST_CHECK_EQUAL(2 * 3, 6);}
+    if (db()->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME)))
+        db()->drop();
+    testCreateNewDataBase(db());
+    testResultField(db());
+    testResultDef();
+    testLogic(db());
+    testQuery();
+}
+BOOST_FIXTURE_TEST_CASE(drop, fixture)
+{
+    testDropDatabase(db());
+}
 
 BOOST_AUTO_TEST_SUITE_END()
 
-// ------------------------------------------------------------------------
+BOOST_AUTO_TEST_SUITE(query)
+
+BOOST_FIXTURE_TEST_CASE(new_delete, fixtureQuery)
+{
+    teetNewDelete(db());
+}
 
+BOOST_FIXTURE_TEST_CASE(join, fixtureQuery)
+{
+    testJoin(db());
+    testWirtableRecord(db());
+}
 
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(dbPool)
+
+BOOST_AUTO_TEST_CASE(pool)
+{
+    testDbPool();
+}
+BOOST_AUTO_TEST_CASE(fuga)
+{
+    BOOST_CHECK_EQUAL(2 * 3, 6);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+// ------------------------------------------------------------------------