transactd 3.1.0 → 3.2.0

data/source/bzs/test/trdclengn/testField.h

@@ -20,6 +20,7 @@
  ================================================================= */
 #include "testbase.h"
 #include <bzs/db/protocol/tdap/btrDate.h>
+#include <bzs/db/protocol/tdap/client/connMgr.h>
 #include <limits.h>
 #include <stdlib.h>
 
@@ -45,7 +46,7 @@ const char* test_records = "INSERT INTO `setenumbit` (`id`, `set5`, `set64`, `en
   "(3, '', '', '0', '0', b'0', b'00000000', b'00000000', b'00000000'),"
   "(4, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);";
 
-
+const char* test_view = "create view idlessthan5 as select * from scores where id < 5";
 
 short createFieldStoreDataBase(database* db)
 {
@@ -55,6 +56,7 @@ short createFieldStoreDataBase(database* db)
         db->open(makeUri(PROTOCOL, HOSTNAME, DBNAMEV3, BDFNAME));
         if (db->stat()) return db->stat();
         db->drop();
+        if (db->stat()) return db->stat();
         db->create(makeUri(PROTOCOL, HOSTNAME, DBNAMEV3, BDFNAME));
     }
     if (db->stat()) return db->stat();
@@ -527,9 +529,9 @@ short createTestScores(database* db)
         td->primaryKeyNum = 0;
         
         short fieldnum = 0;
-        fielddef* fd = insertField(def, tableid, fieldnum, _T("id"), ft_autoinc, 4);
-        fd = insertField(def, tableid, ++fieldnum, _T("subject"), ft_integer, 4);
-        fd = insertField(def, tableid, ++fieldnum, _T("score"), ft_integer, 4);
+        insertField(def, tableid, fieldnum, _T("id"), ft_autoinc, 4);
+        insertField(def, tableid, ++fieldnum, _T("subject"), ft_integer, 4);
+        fielddef* fd = insertField(def, tableid, ++fieldnum, _T("score"), ft_integer, 4);
         fd->setNullable(true);
 
         keydef* kd = insertKey(def, tableid, 0);
@@ -2310,13 +2312,13 @@ void testSetEnumBit()
 
     BOOST_CHECK(rs[1][_T("id")] == 2);
     BOOST_CHECK(rs[1][_T("set5")].i64() == 31);
-    BOOST_CHECK(rs[1][_T("set64")].i64() == 0x8000000000000001);
+    BOOST_CHECK(rs[1][_T("set64")].i64() == (__int64)0x8000000000000001);
     BOOST_CHECK(rs[1][_T("enum2")].i64() == 1);
     BOOST_CHECK(rs[1][_T("enum260")].i64() == 260);
     BOOST_CHECK(rs[1][_T("bit1")].i64() == 1);
     BOOST_CHECK(rs[1][_T("bit8")].i64() == 0xFF);
     BOOST_CHECK(rs[1][_T("bit32")].i64() == 0xFFFFFFFF);
-    BOOST_CHECK(rs[1][_T("bit64")].i64() == 0xFFFFFFFFFFFFFFFF);
+    BOOST_CHECK(rs[1][_T("bit64")].i64() == (__int64)0xFFFFFFFFFFFFFFFF);
 
     BOOST_CHECK(rs[2][_T("id")] == 3);
     BOOST_CHECK(rs[2][_T("set5")].i64() == 0);
@@ -3332,6 +3334,64 @@ void testSnapshotWithbinlog()
     BOOST_CHECK(tb->stat() == STATUS_ALREADY_INSNAPSHOT);
 
     db->endSnapshot();
+    db->createTable(test_view);// create view for next test
+    BOOST_CHECK(db->stat() == 0);
+}
+
+
+void testTableList()
+{
+    nsdatabase::setCheckTablePtr(true);
+    database_ptr db = createDatabaseObject();
+    connMgr_ptr mgr(createConnMgr(db.get()));
+    mgr->connect(makeUri(PROTOCOL, HOSTNAME, _T("")));
+    BOOST_CHECK(mgr->stat() == 0);
+    {
+        const connMgr::records& recs = mgr->tables(DBNAMEV3);
+        BOOST_CHECK(mgr->stat() == 0);
+        BOOST_CHECK(recs.size() == 10); //8 + setenumbit + test.bdf
+    }
+    {
+        const connMgr::records& recs = mgr->views(DBNAMEV3);
+        BOOST_CHECK(mgr->stat() == 0);
+        BOOST_CHECK(recs.size() == 1);
+        BOOST_CHECK(recs[0].name == std::string("idlessthan5"));
+    }
+    {
+        const connMgr::records& recs = mgr->schemaTables(DBNAMEV3);
+        BOOST_CHECK(mgr->stat() == 0);
+        BOOST_CHECK(recs.size() == 1);
+        BOOST_CHECK(recs[0].name == std::string("test"));
+    }
+    {
+        mgr->slaveStatus();
+        BOOST_CHECK(mgr->stat() == 0);
+    }
+    mgr->disconnect();
+
+}
+
+void testCreateInfo()
+{
+    nsdatabase::setCheckTablePtr(true);
+    database_ptr db = createDatabaseObject();
+    openDatabase(db, makeUri(PROTOCOL, HOSTNAME, DBNAMEV3, BDFNAME), TYPE_SCHEMA_BDF,TD_OPEN_READONLY);
+    BOOST_CHECK(db->stat() == 0);
+
+    char buf[2048];
+    uint_td size = 2048;
+    db->getCreateViewSql(_T("idlessthan5"), buf, &size);
+    BOOST_CHECK(db->stat() == 0);
+    BOOST_CHECK(size > 20);
+
+    table* tb = db->openTable(1, TD_OPEN_READONLY);
+    BOOST_CHECK(db->stat() == 0);
+    size = 2048;
+    tb->getCreateSql(buf, &size);
+    BOOST_CHECK(db->stat() == 0);
+    BOOST_CHECK(size > 1000);
+    db->close();
+    BOOST_CHECK(db->stat() == 0);
 }
 
 #pragma warning(default : 4996) 

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

@@ -1053,5 +1053,14 @@ BOOST_AUTO_TEST_CASE(snapshot_binlog)
 }
 BOOST_AUTO_TEST_SUITE_END()
 
-
+BOOST_AUTO_TEST_SUITE(tablelist)
+BOOST_AUTO_TEST_CASE(tablelist)
+{
+    testTableList();
+}
+BOOST_AUTO_TEST_CASE(createInfo)
+{
+    testCreateInfo();
+}
+BOOST_AUTO_TEST_SUITE_END()
 // ------------------------------------------------------------------------

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

@@ -3073,6 +3073,8 @@ void stringFileterCreateTable(database* db, int id, const _TCHAR* name,
     }
 
     fd->keylen = fd->len;
+    if (use_nullfield)
+        fd->setNullable(true, true);
     def->updateTableDef(id);
     BOOST_CHECK_MESSAGE(0 == def->stat(),
                         "updateTableDef 2 stat = " << def->stat());
@@ -3091,6 +3093,8 @@ void stringFileterCreateTable(database* db, int id, const _TCHAR* name,
         fd->len = 12; // 8+4
     }
     fd->keylen = fd->len;
+    if (use_nullfield)
+        fd->setNullable(true, true);
     def->updateTableDef(id);
     BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef 3");
 
@@ -3294,6 +3298,86 @@ void doTestSF(table* tb)
                         "doTestReadSF2 field value");
 }
 
+void doTestSF_Select(table* tb)
+{
+    tb->setKeyNum(0);
+    tb->clearBuffer();
+
+    tb->setFilter(_T("select id,name,namew 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(2 == (int)tb->recordCount(), "doTestReadSF2");
+
+    tb->setFilter(_T("select id,name,namew name <> 'あい*'"), 0, 10);
+    BOOST_CHECK_MESSAGE(3 == (int)tb->recordCount(), "doTestReadSF2");
+    tb->clearBuffer();
+    tb->setFilter(_T("select id,name,namew name <> 'あい*'"), 0, 10);
+    tb->seekFirst();
+    tb->findNext(false);
+    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");
+
+    tb->findNext();
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1");
+    BOOST_CHECK_MESSAGE(_tstring(_T("おめでとうございます。")) ==
+                            _tstring(tb->getFVstr(2)),
+                        "doTestReadSF1");
+    tb->findNext();
+    BOOST_CHECK_MESSAGE(9 == tb->stat(), "doTestReadSF1");
+
+    tb->clearBuffer();
+    tb->seekLast();
+    tb->findPrev(false);
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "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");
+
+    tb->findPrev(false);
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "doTestReadSF1");
+    BOOST_CHECK_MESSAGE(_tstring(_T("A123456")) == _tstring(tb->getFVstr(2)),
+                        "doTestReadSF1");
+
+    tb->findPrev();
+    BOOST_CHECK_MESSAGE(9 == tb->stat(), "doTestReadSF1");
+
+    tb->setFilter(_T("select id,name,namew name = 'あい'"), 0, 10);
+    BOOST_CHECK_MESSAGE(0 == (int)tb->recordCount(), "doTestReadSF2");
+
+    tb->setFilter(_T("select id,name,namew name <> ''"), 0, 10);
+    BOOST_CHECK_MESSAGE(5 == (int)tb->recordCount(), "doTestReadSF2");
+
+    // test setFilter don't change field value
+    tb->clearBuffer();
+    tb->setFV(_T("name"), _T("ABCDE"));
+    tb->setFilter(_T("select id,name,namew name = 'あい'"), 0, 10);
+    BOOST_CHECK_MESSAGE(_tstring(_T("ABCDE")) == _tstring(tb->getFVstr(1)),
+                        "doTestReadSF2 field value");
+}
+
+
 void doTestUpdateSF(table* tb)
 {
 
@@ -3344,6 +3428,7 @@ void doTestStringFileter(database* db, int id, const _TCHAR* name,
     doInsertStringFileter(tb);
     doTestReadSF(tb);
     doTestSF(tb);
+    doTestSF_Select(tb);
     doTestUpdateSF(tb);
     tb->release();
 }

data/source/bzs/test/trdclengn/testbase.h

@@ -72,7 +72,7 @@ const _TCHAR* makeUri(const _TCHAR* protocol, const _TCHAR* host,
     return g_uri;
 }
 
-static bool use_nullfield = false;
+static bool use_nullfield = true;
 static bool use_mysqlNullMode = true;
 
 boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]);

data/source/global/tdclatl/BinlogPos.cpp

@@ -0,0 +1,64 @@
+/*=================================================================
+   Copyright (C) 2016 BizStation Corp All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+=================================================================*/
+// BinlogPos.cpp : CBinlogPos �̎���
+
+#include "stdafx.h"
+#include "BinlogPos.h"
+
+
+// CBinlogPos
+#ifdef _WIN64
+STDMETHODIMP CBinlogPos::get_Pos(__int64* retVal)
+{
+    *retVal = (__int64)m_pos.pos;
+    return S_OK;
+}
+#else
+STDMETHODIMP CBinlogPos::get_Pos(int* retVal)
+{
+    *retVal = (int)m_pos.pos;
+    return S_OK;
+}
+#endif
+
+STDMETHODIMP CBinlogPos::get_Type(short* retVal)
+{
+    *retVal = (short)m_pos.type;
+    return S_OK;
+}
+
+STDMETHODIMP CBinlogPos::get_Filename(BSTR* retVal)
+{
+    CComBSTR ret;
+    ret = m_pos.filename;
+    *retVal = ret.Copy();
+    return S_OK;
+}
+
+STDMETHODIMP CBinlogPos::get_Gtid(BSTR* retVal)
+{
+    CComBSTR ret;
+    ret = m_pos.gtid;
+    *retVal = ret.Copy();
+    return S_OK;
+}
+
+
+
+    

data/source/global/tdclatl/BinlogPos.h

@@ -0,0 +1,84 @@
+/*=================================================================
+   Copyright (C) 2016 BizStation Corp All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+=================================================================*/
+// BinlogPos.h : CBinlogPos �̐錾
+
+#pragma once
+#include "resource.h"       // ���C�� �V���{��
+
+
+
+#include "tdclatl_i.h"
+#include <bzs/db/protocol/tdap/client/nsdatabase.h>
+
+
+#if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)
+#error "DCOM �̊��S�T�|�[�g���܂�ł��Ȃ� Windows Mobile �v���b�g�t�H�[���̂悤�� Windows CE �v���b�g�t�H�[���ł́A�P��X���b�h COM �I�u�W�F�N�g�͐������T�|�[�g����Ă��܂���BATL ���P��X���b�h COM �I�u�W�F�N�g�̍쐬���T�|�[�g���邱�ƁA����т��̒P��X���b�h COM �I�u�W�F�N�g�̎����̎g�p�����‚��邱�Ƃ���������ɂ́A_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA ���`���Ă��������B���g�p�� rgs �t�@�C���̃X���b�h ���f���� 'Free' �ɐݒ肳��Ă���ADCOM Windows CE �ȊO�̃v���b�g�t�H�[���ŃT�|�[�g�����B��̃X���b�h ���f���Ɛݒ肳��Ă��܂����B"
+#endif
+
+using namespace ATL;
+
+
+// CBitset
+
+class ATL_NO_VTABLE CBinlogPos :
+  public CComObjectRootEx<CComSingleThreadModel>,
+  public CComCoClass<CBinlogPos, &CLSID_BinlogPos>,
+  public IDispatchImpl<IBinlogPos, &IID_IBinlogPos, &LIBID_transactd, /*wMajor =*/ 1, /*wMinor =*/ 0>
+{
+
+public:
+    bzs::db::protocol::tdap::client::binlogPos m_pos;
+
+  CBinlogPos()
+  {
+  }
+
+DECLARE_REGISTRY_RESOURCEID(IDR_BITSET)
+
+
+BEGIN_COM_MAP(CBinlogPos)
+  COM_INTERFACE_ENTRY(IBinlogPos)
+  COM_INTERFACE_ENTRY(IDispatch)
+END_COM_MAP()
+
+
+
+  DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+  HRESULT FinalConstruct()
+  {
+    return S_OK;
+  }
+
+  void FinalRelease()
+  {
+  }
+
+public:
+#ifdef _WIN64
+    STDMETHOD(get_Pos)(__int64* retVal);
+#else
+    STDMETHOD(get_Pos)(int* retVal);
+#endif
+    STDMETHOD(get_Type)(short* retVal);
+    STDMETHOD(get_Filename)(BSTR* retVal);
+    STDMETHOD(get_Gtid)(BSTR* retVal);
+};
+
+//OBJECT_ENTRY_AUTO(__uuidof(Bitset), CBitset)

data/source/global/tdclatl/ConnMgr.cpp

@@ -0,0 +1,285 @@
+/*=================================================================
+   Copyright (C) 2016 BizStation Corp All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+=================================================================*/
+#include "stdafx.h"
+#include "ConnMgr.h"
+#include "ConnRecords.h"
+#include "Database.h"
+
+using namespace bzs::db::protocol::tdap::client;
+
+STDMETHODIMP CConnMgr::InterfaceSupportsErrorInfo(REFIID riid)
+{
+	static const IID* const arr[] = 
+	{
+		&IID_IConnMgr
+	};
+
+	for (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)
+	{
+		if (InlineIsEqualGUID(*arr[i],riid))
+			return S_OK;
+	}
+	return S_FALSE;
+}
+
+STDMETHODIMP CConnMgr::SetDatabase(VARIANT Value)
+{
+    try
+    {
+        if (Value.vt != VT_DISPATCH)
+        {
+            _TCHAR tmp[256];
+            wsprintf(tmp, _T("SetDatabase Type error type = %d"), Value.vt);
+            return Error(tmp, IID_IConnMgr);
+        }
+
+        CDatabase* p = dynamic_cast<CDatabase*>(Value.pdispVal);
+        if (p)
+        {
+            m_mgr = connMgr::create(p->database());
+            return S_OK;
+        }
+        return Error(_T("SetDatabase Type error"), IID_IConnMgr);
+    }
+    catch (bzs::rtl::exception& e)
+    {
+        return Error((*bzs::rtl::getMsg(e)).c_str(), IID_IConnMgr);
+    }
+}
+
+
+STDMETHODIMP CConnMgr::Connect(BSTR uri, VARIANT_BOOL* retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    m_mgr->connect(uri);
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::Disconnect()
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    m_mgr->disconnect();
+    return S_OK;
+}
+
+void setResult(CComObject<CConnRecords>* obj, IConnRecords** retVal)
+{
+    IConnRecords* recs;
+    obj->QueryInterface(IID_IConnRecords, (void**)&recs);
+    _ASSERTE(recs);
+    *retVal = recs;
+
+}
+
+STDMETHODIMP CConnMgr::Databases(IConnRecords** retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    CComObject<CConnRecords>* obj;
+    CComObject<CConnRecords>::CreateInstance(&obj);
+    if (!obj)
+        return Error("CreateInstance ConnRecords", IID_IConnMgr);
+    obj->m_recs = m_mgr->databases();
+    setResult(obj, retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::Tables(BSTR dbname, IConnRecords** retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    CComObject<CConnRecords>* obj;
+    CComObject<CConnRecords>::CreateInstance(&obj);
+    if (!obj)
+        return Error("CreateInstance ConnRecords", IID_IConnMgr);
+    obj->m_recs = m_mgr->tables(dbname);
+    setResult(obj, retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::Views(BSTR dbname, IConnRecords** retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    CComObject<CConnRecords>* obj;
+    CComObject<CConnRecords>::CreateInstance(&obj);
+    if (!obj)
+        return Error("CreateInstance ConnRecords", IID_IConnMgr);
+    obj->m_recs = m_mgr->views(dbname);
+    setResult(obj, retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::SchemaTables(BSTR dbname, IConnRecords** retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    CComObject<CConnRecords>* obj;
+    CComObject<CConnRecords>::CreateInstance(&obj);
+    if (!obj)
+        return Error("CreateInstance ConnRecords", IID_IConnMgr);
+    obj->m_recs = m_mgr->schemaTables(dbname);
+    setResult(obj, retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::Sysvars(IConnRecords** retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    CComObject<CConnRecords>* obj;
+    CComObject<CConnRecords>::CreateInstance(&obj);
+    if (!obj)
+        return Error("CreateInstance ConnRecords", IID_IConnMgr);
+    obj->m_recs = m_mgr->sysvars();
+    setResult(obj, retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::SlaveStatus(IConnRecords** retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    CComObject<CConnRecords>* obj;
+    CComObject<CConnRecords>::CreateInstance(&obj);
+    if (!obj)
+        return Error("CreateInstance ConnRecords", IID_IConnMgr);
+    obj->m_recs = m_mgr->slaveStatus();
+    setResult(obj, retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::Connections(IConnRecords** retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    CComObject<CConnRecords>* obj;
+    CComObject<CConnRecords>::CreateInstance(&obj);
+    if (!obj)
+        return Error("CreateInstance ConnRecords", IID_IConnMgr);
+    obj->m_recs = m_mgr->connections();
+    setResult(obj, retVal);
+    return S_OK;
+}
+
+#ifdef _WIN64
+STDMETHODIMP CConnMgr::InUseDatabases(__int64 connid, IConnRecords** retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    CComObject<CConnRecords>* obj;
+    CComObject<CConnRecords>::CreateInstance(&obj);
+    if (!obj)
+        return Error("CreateInstance ConnRecords", IID_IConnMgr);
+    obj->m_recs = m_mgr->inUseDatabases(connid);
+    setResult(obj, retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::InUseTables(__int64 connid, int db, IConnRecords** retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    CComObject<CConnRecords>* obj;
+    CComObject<CConnRecords>::CreateInstance(&obj);
+    if (!obj)
+        return Error("CreateInstance ConnRecords", IID_IConnMgr);
+    obj->m_recs = m_mgr->inUseTables(connid, db);
+    setResult(obj, retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::PostDisconnectOne(__int64 connid)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    m_mgr->postDisconnectOne(connid);
+    return S_OK;
+}
+
+#else
+
+STDMETHODIMP CConnMgr::InUseDatabases(BSTR connid, IConnRecords** retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    CComObject<CConnRecords>* obj;
+    CComObject<CConnRecords>::CreateInstance(&obj);
+    if (!obj)
+        return Error("CreateInstance ConnRecords", IID_IConnMgr);
+    obj->m_recs = m_mgr->inUseDatabases(_wtoi64(connid));
+    setResult(obj, retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::InUseTables(BSTR connid, int db, IConnRecords** retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    CComObject<CConnRecords>* obj;
+    CComObject<CConnRecords>::CreateInstance(&obj);
+    if (!obj)
+        return Error("CreateInstance ConnRecords", IID_IConnMgr);
+    obj->m_recs = m_mgr->inUseTables(_wtoi64(connid), db);
+    setResult(obj, retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::PostDisconnectOne(BSTR connid)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    m_mgr->postDisconnectOne(_wtoi64(connid));
+    return S_OK;
+}
+
+#endif
+
+STDMETHODIMP CConnMgr::PostDisconnectAll()
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    m_mgr->postDisconnectAll();
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::get_Stat(short* retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    *retVal = m_mgr->stat();
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::TdapErr(OLE_HANDLE hWnd, BSTR* retVal)
+{
+    return S_OK;
+}
+    
+STDMETHODIMP CConnMgr::RemoveSystemDb(IConnRecords** retVal)
+{
+    CConnRecords* p = dynamic_cast<CConnRecords*>(*retVal);
+    if (p)
+    {
+        connMgr::removeSystemDb(p->m_recs);
+        return S_OK;
+    }
+    return Error(_T("Invalid object"), IID_IConnMgr);
+}
+
+STDMETHODIMP CConnMgr::SlaveStatusName(int index, BSTR* retVal)
+{
+    CComBSTR ret= connMgr::slaveStatusName(index);
+    *retVal = ret.Copy();
+    return S_OK;
+}
+
+STDMETHODIMP CConnMgr::SysvarName(int index, BSTR* retVal)
+{
+    CComBSTR ret= connMgr::sysvarName(index);
+    *retVal = ret.Copy();
+    return S_OK;
+}
+
+