transactd 1.2.0 → 2.0.0

data/source/global/tdclatl/Database.cpp

@@ -12,8 +12,8 @@
    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  
+   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"
@@ -24,7 +24,8 @@
 
 using namespace bzs::db::protocol::tdap::client;
 
-STDMETHODIMP CDatabase::Open(BSTR Uri, eSchemaType SchemaType, eOpenMode Mode, BSTR Dir, BSTR Ownername, VARIANT_BOOL* Param6)
+STDMETHODIMP CDatabase::Open(BSTR Uri, eSchemaType SchemaType, eOpenMode Mode,
+                             BSTR Dir, BSTR Ownername, VARIANT_BOOL* Param6)
 {
     *Param6 = m_db->open(Uri, (short)SchemaType, Mode, Dir, Ownername);
     return S_OK;
@@ -40,48 +41,50 @@ STDMETHODIMP CDatabase::get_DbDef(IDbDef** Value)
     CComObject<CDbDef>::CreateInstance(&dbDefObj);
     if (dbDefObj)
     {
-		dbDefObj->m_dbDef = m_db->dbDef();
+        dbDefObj->m_dbDef = m_db->dbDef();
         m_IsAtatchOK = false;
-		IDbDef* dbdef;
-		dbDefObj->QueryInterface(IID_IDbDef, (void**)&dbdef);
-		_ASSERTE(dbdef);
-		*Value = dbdef;
-    }else
-		*Value = 0;
-   
+        IDbDef* dbdef;
+        dbDefObj->QueryInterface(IID_IDbDef, (void**)&dbdef);
+        _ASSERTE(dbdef);
+        *Value = dbdef;
+    }
+    else
+        *Value = 0;
 
     return S_OK;
 }
 
-STDMETHODIMP CDatabase::OpenTable(VARIANT TableID, eOpenMode Mode, VARIANT_BOOL AutoCreate, BSTR OwnerName, BSTR Uri,
-    ITable** ret)
+STDMETHODIMP CDatabase::OpenTable(VARIANT TableID, eOpenMode Mode,
+                                  VARIANT_BOOL AutoCreate, BSTR OwnerName,
+                                  BSTR Uri, ITable** ret)
 {
 
     if (!m_db->dbDef())
         return Error("database is not opened. ", IID_IDatabase);
 
     table* tb = NULL;
-	if (TableID.vt == VT_BSTR)
-		tb = m_db->openTable(TableID.bstrVal, Mode, (bool)AutoCreate, OwnerName, Uri);
+    if (TableID.vt == VT_BSTR)
+        tb = m_db->openTable(TableID.bstrVal, Mode, (bool)AutoCreate, OwnerName,
+                             Uri);
     else if ((TableID.vt == VT_I2) || (TableID.vt == VT_I4))
-		tb = m_db->openTable(TableID.iVal, Mode, (bool)AutoCreate, OwnerName, Uri);
+        tb = m_db->openTable(TableID.iVal, Mode, (bool)AutoCreate, OwnerName,
+                             Uri);
 
-	if (tb == NULL)
-		return Error("Invalid tableid", IID_IDatabase);
+    if (tb == NULL)
+        return Error("Invalid tableid", IID_IDatabase);
 
     CComObject<CTableTd>* ptb;
     CComObject<CTableTd>::CreateInstance(&ptb);
-    
+
     if (ptb)
     {
-        ptb->m_tb = tb;
-		ptb->m_db = m_db;
-		tb->setOptionalData((void*)ptb);
-        ITable* tb;
-        ptb->QueryInterface(IID_ITable, (void**)&tb);
-        _ASSERTE(tb);
-        *ret = tb;
-       m_IsAtatchOK = false;
+        ptb->m_tb.reset(tb, releaseTable);
+        tb->setOptionalData((void*)ptb);
+        ITable* itb;
+        ptb->QueryInterface(IID_ITable, (void**)&itb);
+        _ASSERTE(itb);
+        *ret = itb;
+        m_IsAtatchOK = false;
     }
     else
         *ret = NULL;
@@ -89,23 +92,28 @@ STDMETHODIMP CDatabase::OpenTable(VARIANT TableID, eOpenMode Mode, VARIANT_BOOL
     return S_OK;
 }
 
-STDMETHODIMP CDatabase::AtatchDatabase(__int64* nativeDatabase)
+STDMETHODIMP CDatabase::AtatchDatabase(__int64* nativeDatabase,
+                                       VARIANT_BOOL noRelease)
 {
     if ((nativeDatabase) && (m_IsAtatchOK))
     {
         bzs::db::protocol::tdap::client::database* nativePtr =
-            reinterpret_cast<bzs::db::protocol::tdap::client::database*>(nativeDatabase);
+            reinterpret_cast<bzs::db::protocol::tdap::client::database*>(
+                nativeDatabase);
         if (nativePtr)
         {
-            Close();
-			m_db->release();
+            if (m_needRelese)
+            {
+                Close();
+                m_db->release();
+            }
+            m_needRelese = (noRelease == 0);
             m_db = nativePtr;
-			return S_OK;
+            return S_OK;
         }
         return Error("Can not get native database pointer.", IID_IDatabase);
     }
     return Error("Current database is already used.", IID_IDatabase);
-   
 }
 
 STDMETHODIMP CDatabase::get_RootDir(BSTR* Value)
@@ -146,7 +154,6 @@ STDMETHODIMP CDatabase::EndTrn()
 {
     m_db->endTrn();
     return S_OK;
-
 }
 
 STDMETHODIMP CDatabase::get_NativeDatabase(__int64** Value)
@@ -192,7 +199,8 @@ STDMETHODIMP CDatabase::Close()
     return S_OK;
 }
 
-STDMETHODIMP CDatabase::Connect(BSTR URI, VARIANT_BOOL newConnection, VARIANT_BOOL* Value)
+STDMETHODIMP CDatabase::Connect(BSTR URI, VARIANT_BOOL newConnection,
+                                VARIANT_BOOL* Value)
 
 {
     *Value = m_db->connect(URI, newConnection);
@@ -213,14 +221,15 @@ STDMETHODIMP CDatabase::get_EnableTrn(VARIANT_BOOL* Value)
 
 STDMETHODIMP CDatabase::GetBtrVersion(int index, ITdVersion** Value)
 {
-	if ((index < 0) || (index > 2))
+    if ((index < 0) || (index > 2))
         return Error("Invalid index", IID_IDatabase);
     bzs::db::protocol::tdap::btrVersions vers;
     m_db->getBtrVersion(&vers);
 
-    CComObject<CTdVersion> *ptb;
+    CComObject<CTdVersion>* ptb;
     CComObject<CTdVersion>::CreateInstance(&ptb);
-    ptb->m_ver = vers.versions[index]; //not refarence. no need the this life time control
+    ptb->m_ver = vers.versions[index]; // not refarence. no need the this life
+    // time control
     ITdVersion* tdVer;
     ptb->QueryInterface(IID_ITdVersion, (void**)&tdVer);
     _ASSERTE(tdVer);
@@ -303,8 +312,7 @@ STDMETHODIMP CDatabase::get_OpenTableCount(short* Value)
 
 STDMETHODIMP CDatabase::ReadDatabaseDirectory(BSTR* Value)
 {
-    wchar_t tmp[255] =
-    {NULL};
+    wchar_t tmp[255] = { NULL };
     m_db->readDatabaseDirectory(tmp, (uchar_td)255);
     *Value = ::SysAllocString(tmp);
     return S_OK;
@@ -327,177 +335,173 @@ STDMETHODIMP CDatabase::TdapErr(OLE_HANDLE hWnd, BSTR* Value)
 {
     if (Value)
     {
-        wchar_t tmp[512] =
-        {NULL};
+        wchar_t tmp[512] = { NULL };
         m_db->tdapErr((HWND)hWnd, tmp);
         *Value = ::SysAllocString(tmp);
     }
     else
         m_db->tdapErr((HWND)hWnd);
     return S_OK;
-
 }
 
-
-
 STDMETHODIMP CDatabase::Clone(IDatabase** Value)
 {
-	CComObject<CDatabase> *ptb;
+    CComObject<CDatabase>* ptb;
     CComObject<CDatabase>::CreateInstance(&ptb);
-	HRESULT ret = ptb->AtatchDatabase((__int64*)m_db->clone());
-    if (ret==S_OK)
-	{
-		IDatabase* dbPtr;
-		ptb->QueryInterface(IID_IDatabase, (void**)&dbPtr);
-		_ASSERTE(dbPtr);
-		*Value = dbPtr;
-		return S_OK;
-	}
-	return ret;
+    HRESULT ret = ptb->AtatchDatabase((__int64*)m_db->clone());
+    if (ret == S_OK)
+    {
+        IDatabase* dbPtr;
+        ptb->QueryInterface(IID_IDatabase, (void**)&dbPtr);
+        _ASSERTE(dbPtr);
+        *Value = dbPtr;
+        return S_OK;
+    }
+    return ret;
 }
 
 STDMETHODIMP CDatabase::AssignSchemaData(IDbDef* Src, short* Value)
 {
-	CDbDef* dbdef = NULL;
-	dbdef = dynamic_cast<CDbDef*>(Src);
-	_ASSERTE(dbdef);
-	m_db->assignSchemaData(dbdef->m_dbDef);
-	return S_OK;
+    CDbDef* dbdef = NULL;
+    dbdef = dynamic_cast<CDbDef*>(Src);
+    _ASSERTE(dbdef);
+    m_db->assignSchemaData(dbdef->m_dbDef);
+    return S_OK;
 }
 
-STDMETHODIMP CDatabase::Continuous(eContinusOpr Op, VARIANT_BOOL inclideRepfile, eContinusStatus* Value)
+STDMETHODIMP CDatabase::Continuous(eContinusOpr Op, VARIANT_BOOL inclideRepfile,
+                                   eContinusStatus* Value)
 {
-	*Value = (eContinusStatus)m_db->continuous((char_td)Op, inclideRepfile);
-	return S_OK;
+    *Value = (eContinusStatus)m_db->continuous((char_td)Op, inclideRepfile);
+    return S_OK;
 }
 
-STDMETHODIMP CDatabase::ConvertTable(short TableIndex, VARIANT_BOOL Turbo, BSTR OwnerName)
+STDMETHODIMP CDatabase::ConvertTable(short TableIndex, VARIANT_BOOL Turbo,
+                                     BSTR OwnerName)
 {
-	m_db->convertTable(TableIndex, Turbo, OwnerName);
-	return S_OK;
+    m_db->convertTable(TableIndex, Turbo, OwnerName);
+    return S_OK;
 }
 
-STDMETHODIMP CDatabase::CopyTableData(ITable* Dest, ITable* Src, VARIANT_BOOL Turbo,int Offset, short KeyNum
-		, int MaxSkip, short* Value)
+STDMETHODIMP CDatabase::CopyTableData(ITable* Dest, ITable* Src,
+                                      VARIANT_BOOL Turbo, int Offset,
+                                      short KeyNum, int MaxSkip, short* Value)
 {
-	CTableTd* dest = dynamic_cast<CTableTd*>(Dest);
-	CTableTd* src = dynamic_cast<CTableTd*>(Src);
+    CTableTd* dest = dynamic_cast<CTableTd*>(Dest);
+    CTableTd* src = dynamic_cast<CTableTd*>(Src);
 
     _ASSERTE(dest);
     _ASSERTE(dest);
 
-	*Value = m_db->copyTableData(dest->m_tb, src->m_tb, Turbo, KeyNum, MaxSkip);
-	return S_OK;
+    *Value = m_db->copyTableData(dest->m_tb.get(), src->m_tb.get(), Turbo,
+                                 KeyNum, MaxSkip);
+    return S_OK;
 }
 
-STDMETHODIMP CDatabase::CreateTable(short FileNum, BSTR Uri, VARIANT_BOOL* Value)
+STDMETHODIMP CDatabase::CreateTable(short FileNum, BSTR Uri,
+                                    VARIANT_BOOL* Value)
 {
-	*Value = m_db->createTable(FileNum, Uri);
-	return S_OK;
+    *Value = m_db->createTable(FileNum, Uri);
+    return S_OK;
 }
 
 STDMETHODIMP CDatabase::ExistsTableFile(short TableIndex, BSTR OwnerName)
 {
-	m_db->existsTableFile(TableIndex, OwnerName);
-	return S_OK;
-
+    m_db->existsTableFile(TableIndex, OwnerName);
+    return S_OK;
 }
 
 STDMETHODIMP CDatabase::GetTableUri(short FileNum, BSTR* Value)
 {
-	wchar_t tmp[MAX_PATH]={NULL};
+    wchar_t tmp[MAX_PATH] = { NULL };
     m_db->getTableUri(tmp, FileNum);
     *Value = ::SysAllocString(tmp);
-	return S_OK;
+    return S_OK;
 }
 
 STDMETHODIMP CDatabase::get_IsOpened(VARIANT_BOOL* Value)
 {
-	*Value = m_db->isOpened();
-	return S_OK;
+    *Value = m_db->isOpened();
+    return S_OK;
 }
 
 STDMETHODIMP CDatabase::get_TableReadOnly(VARIANT_BOOL* Value)
 {
-	*Value = m_db->tableReadOnly();
-	return S_OK;
+    *Value = m_db->tableReadOnly();
+    return S_OK;
 }
 
 STDMETHODIMP CDatabase::put_TableReadOnly(VARIANT_BOOL Value)
 {
-	m_db->setTableReadOnly(Value);
-	return S_OK;
+    m_db->setTableReadOnly(Value);
+    return S_OK;
 }
 
-STDMETHODIMP CDatabase::SwapTablename(BSTR Uri1,  BSTR Uri2)
+STDMETHODIMP CDatabase::SwapTablename(BSTR Uri1, BSTR Uri2)
 {
-	m_db->swapTablename(Uri1, Uri2);
-	return S_OK;
-
+    m_db->swapTablename(Uri1, Uri2);
+    return S_OK;
 }
 
 STDMETHODIMP CDatabase::get_ClientID(short* Value)
 {
-	*Value = (short)m_db->clientID();
-	return S_OK;
+    *Value = (short)m_db->clientID();
+    return S_OK;
 }
 
 STDMETHODIMP CDatabase::get_RefCount(int* Value)
 {
-	*Value = m_db->refCount();
-	return S_OK;
+    *Value = m_db->refCount();
+    return S_OK;
 }
 
 STDMETHODIMP CDatabase::get_TrnsactionFlushWaitStatus(VARIANT_BOOL* Value)
 {
-	*Value = database::trnsactionFlushWaitStatus();
-	return S_OK;
+    *Value = database::trnsactionFlushWaitStatus();
+    return S_OK;
 }
 
 STDMETHODIMP CDatabase::put_ExecCodePage(unsigned int Value)
 {
-	database::setExecCodePage(Value);
-	return S_OK;
+    database::setExecCodePage(Value);
+    return S_OK;
 }
 
-STDMETHODIMP CDatabase::get_ExecCodePage(unsigned int* Value)	
+STDMETHODIMP CDatabase::get_ExecCodePage(unsigned int* Value)
 {
-	*Value = database::execCodePage();
-	return S_OK;
+    *Value = database::execCodePage();
+    return S_OK;
 }
 
-STDMETHODIMP CDatabase::get_MaxTables(int* Value)	
+STDMETHODIMP CDatabase::get_MaxTables(int* Value)
 {
-	*Value = database::maxtables ;
-	return S_OK;
+    *Value = database::maxtables;
+    return S_OK;
 }
 
-
-
-void __stdcall onCopyData(database *db, int recordCount, int count, bool &cancel)
+void __stdcall onCopyData(database* db, int recordCount, int count,
+                          bool& cancel)
 {
-	CDatabase* cdb = reinterpret_cast<CDatabase*>(db->optionalData());
-	IDatabase* dbPtr = dynamic_cast<IDatabase*>(cdb);
-	_ASSERTE(dbPtr);
-	VARIANT_BOOL tmp = 0;
-	cdb->Fire_OnCopyData(dbPtr, recordCount, count, &tmp);
-	if (tmp)
-		cancel = true;
+    CDatabase* cdb = reinterpret_cast<CDatabase*>(db->optionalData());
+    IDatabase* dbPtr = dynamic_cast<IDatabase*>(cdb);
+    _ASSERTE(dbPtr);
+    VARIANT_BOOL tmp = 0;
+    cdb->Fire_OnCopyData(dbPtr, recordCount, count, &tmp);
+    if (tmp)
+        cancel = true;
 }
 
-bool __stdcall onDeleteRecord(database *db, table* tb, bool inkey)
+bool __stdcall onDeleteRecord(database* db, table* tb, bool inkey)
 {
-	CDatabase* cdb = reinterpret_cast<CDatabase*>(db->optionalData());
-	IDatabase* dbPtr = dynamic_cast<IDatabase*>(cdb);
-	_ASSERTE(dbPtr);
-	
-	CTableTd* ctb = reinterpret_cast<CTableTd*>(tb->optionalData());
-	ITable* tbPtr = dynamic_cast<ITable*>(ctb);
-	_ASSERTE(tbPtr);
-	
-	VARIANT_BOOL tmp = 0;
-	cdb->Fire_OnDeleteRecord(dbPtr, tbPtr, &tmp);
-	return (tmp != 0);
+    CDatabase* cdb = reinterpret_cast<CDatabase*>(db->optionalData());
+    IDatabase* dbPtr = dynamic_cast<IDatabase*>(cdb);
+    _ASSERTE(dbPtr);
 
-}
+    CTableTd* ctb = reinterpret_cast<CTableTd*>(tb->optionalData());
+    ITable* tbPtr = dynamic_cast<ITable*>(ctb);
+    _ASSERTE(tbPtr);
 
+    VARIANT_BOOL tmp = 0;
+    cdb->Fire_OnDeleteRecord(dbPtr, tbPtr, &tmp);
+    return (tmp != 0);
+}

data/source/global/tdclatl/Database.h

@@ -13,8 +13,8 @@
    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  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #include "resource.h"
@@ -22,62 +22,71 @@
 #include <bzs/db/protocol/tdap/client/database.h>
 #include "_IDatabaseEvents_CP.H"
 
-
-
 using namespace ATL;
 
 class CDbDef;
 
+void __stdcall onCopyData(bzs::db::protocol::tdap::client::database* db,
+                          int recordCount, int count, bool& cancel);
+bool __stdcall onDeleteRecord(bzs::db::protocol::tdap::client::database* db,
+                              bzs::db::protocol::tdap::client::table* tb,
+                              bool inkey);
 
-void __stdcall onCopyData(bzs::db::protocol::tdap::client::database *db, int recordCount, int count, bool &cancel);
-bool __stdcall onDeleteRecord(bzs::db::protocol::tdap::client::database *db,
-					bzs::db::protocol::tdap::client::table* tb, bool inkey);
+class ATL_NO_VTABLE CDatabase
+    : public CComObjectRootEx<CComSingleThreadModel>,
+      public CComCoClass<CDatabase, &CLSID_Database>,
+      public IDispatchImpl<IDatabase, &IID_IDatabase, &LIBID_transactd,
+                           /* wMajor = */ 1, /* wMinor = */ 0>,
+      public IConnectionPointContainerImpl<CDatabase>,
+      public CProxy_IDatabaseEvents<CDatabase>
 
-
-class ATL_NO_VTABLE CDatabase : 
-	public CComObjectRootEx<CComSingleThreadModel>,
-    public CComCoClass<CDatabase, &CLSID_Database>,
-	public IDispatchImpl<IDatabase, &IID_IDatabase, &LIBID_transactd, /* wMajor = */ 1, /* wMinor = */ 0>,
-	public IConnectionPointContainerImpl<CDatabase>,
-	public CProxy_IDatabaseEvents<CDatabase>
-	
 {
     bzs::db::protocol::tdap::client::database* m_db;
     bool m_IsAtatchOK;
+    bool m_needRelese;
 
 public:
-    CDatabase()
+    CDatabase() : m_needRelese(true), m_IsAtatchOK(true)
     {
         m_db = bzs::db::protocol::tdap::client::database::create();
-        m_IsAtatchOK = true;
-		m_db->setOptionalData(this);
-		m_db->setOnCopyData(onCopyData);
-		m_db->setOnDeleteRecord(onDeleteRecord);		
+        m_db->setOptionalData(this);
+        m_db->setOnCopyData(onCopyData);
+        m_db->setOnDeleteRecord(onDeleteRecord);
     }
 
-	DECLARE_REGISTRY_RESOURCEID(IDR_DATABASE)
+    DECLARE_REGISTRY_RESOURCEID(IDR_DATABASE)
 
-	BEGIN_COM_MAP(CDatabase) 
-		COM_INTERFACE_ENTRY(IDatabase) 
-		COM_INTERFACE_ENTRY(IDispatch) 
-		COM_INTERFACE_ENTRY(IConnectionPointContainer)
-	END_COM_MAP()
+    BEGIN_COM_MAP(CDatabase)
+    COM_INTERFACE_ENTRY(IDatabase)
+    COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(IConnectionPointContainer)
+    END_COM_MAP()
 
-	BEGIN_CONNECTION_POINT_MAP(CDatabase)
-		CONNECTION_POINT_ENTRY(__uuidof(_IDatabaseEvents))
-	END_CONNECTION_POINT_MAP()
+    BEGIN_CONNECTION_POINT_MAP(CDatabase)
+    CONNECTION_POINT_ENTRY(__uuidof(_IDatabaseEvents))
+    END_CONNECTION_POINT_MAP()
 
-	DECLARE_PROTECT_FINAL_CONSTRUCT()
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-    HRESULT FinalConstruct() {return S_OK;}
+    HRESULT FinalConstruct() { return S_OK; }
+
+    void FinalRelease()
+    {
+        if (m_needRelese && m_db)
+            m_db->release();
+    };
 
-	void FinalRelease(){if (m_db) m_db->release();};
 public:
+    bzs::db::protocol::tdap::client::database* database() { return m_db; };
 
-    STDMETHOD(Open)(BSTR Uri, eSchemaType SchemaType, eOpenMode Mode, BSTR Dir, BSTR Ownername, VARIANT_BOOL* Param6);
+    STDMETHOD(Open)(BSTR Uri, eSchemaType SchemaType, eOpenMode Mode, BSTR Dir,
+                    BSTR Ownername, VARIANT_BOOL* Param6);
     STDMETHOD(get_DbDef)(IDbDef** Value);
-    STDMETHOD(OpenTable)(VARIANT TableID, eOpenMode Mode, VARIANT_BOOL AutoCreate, BSTR OwnerName, BSTR Uri, ITable** ret);
-    STDMETHOD(AtatchDatabase)(__int64* nativeDatabase);
+    STDMETHOD(OpenTable)(VARIANT TableID, eOpenMode Mode,
+                         VARIANT_BOOL AutoCreate, BSTR OwnerName, BSTR Uri,
+                         ITable** ret);
+    STDMETHOD(AtatchDatabase)(__int64* nativeDatabase,
+                              VARIANT_BOOL noRelease = 0);
     STDMETHOD(get_RootDir)(BSTR* Value);
     STDMETHOD(put_RootDir)(BSTR Value);
     STDMETHOD(get_Stat)(eStatus* Value);
@@ -92,7 +101,8 @@ public:
     STDMETHOD(DropTable)(BSTR TableName);
     STDMETHOD(Create)(BSTR URI, int type);
     STDMETHOD(Close)();
-    STDMETHOD(Connect)(BSTR URI, VARIANT_BOOL newConnection, VARIANT_BOOL* Value);
+    STDMETHOD(Connect)(BSTR URI, VARIANT_BOOL newConnection,
+                       VARIANT_BOOL* Value);
     STDMETHOD(Disconnect)(BSTR URI, VARIANT_BOOL* Param2);
     STDMETHOD(get_EnableTrn)(VARIANT_BOOL* Value);
     STDMETHOD(GetBtrVersion)(int index, ITdVersion** ver);
@@ -115,25 +125,26 @@ public:
     STDMETHOD(TdapErr)(OLE_HANDLE hWnd, BSTR* Value);
     STDMETHOD(Clone)(IDatabase** Value);
     STDMETHOD(AssignSchemaData)(IDbDef* Src, short* Value);
-    STDMETHOD(Continuous)(eContinusOpr Op, VARIANT_BOOL inclideRepfile, eContinusStatus* Value);
-    STDMETHOD(ConvertTable)(short TableIndex, VARIANT_BOOL Turbo, BSTR OwnerName);
-    STDMETHOD(CopyTableData)(ITable* Dest, ITable* Src, VARIANT_BOOL Turbo, int Offset, short KeyNum, int MaxSkip, short* Value);
+    STDMETHOD(Continuous)(eContinusOpr Op, VARIANT_BOOL inclideRepfile,
+                          eContinusStatus* Value);
+    STDMETHOD(ConvertTable)(short TableIndex, VARIANT_BOOL Turbo,
+                            BSTR OwnerName);
+    STDMETHOD(CopyTableData)(ITable* Dest, ITable* Src, VARIANT_BOOL Turbo,
+                             int Offset, short KeyNum, int MaxSkip,
+                             short* Value);
     STDMETHOD(CreateTable)(short FileNum, BSTR Uri, VARIANT_BOOL* Value);
     STDMETHOD(ExistsTableFile)(short TableIndex, BSTR OwnerName);
     STDMETHOD(GetTableUri)(short FileNum, BSTR* Value);
     STDMETHOD(get_IsOpened)(VARIANT_BOOL* Value);
     STDMETHOD(get_TableReadOnly)(VARIANT_BOOL* Value);
     STDMETHOD(put_TableReadOnly)(VARIANT_BOOL Value);
-    STDMETHOD(SwapTablename)(BSTR Uri1,  BSTR Uri2);
-	STDMETHOD(get_ClientID)(short* Value);
-	STDMETHOD(get_RefCount)(int* Value);
-	STDMETHOD(get_TrnsactionFlushWaitStatus)(VARIANT_BOOL* Value);
-	STDMETHOD(put_ExecCodePage)(unsigned int Value);
-    STDMETHOD(get_ExecCodePage)(unsigned int* Value);	
-    STDMETHOD(get_MaxTables)( int* Value);	
-
-	
-
+    STDMETHOD(SwapTablename)(BSTR Uri1, BSTR Uri2);
+    STDMETHOD(get_ClientID)(short* Value);
+    STDMETHOD(get_RefCount)(int* Value);
+    STDMETHOD(get_TrnsactionFlushWaitStatus)(VARIANT_BOOL* Value);
+    STDMETHOD(put_ExecCodePage)(unsigned int Value);
+    STDMETHOD(get_ExecCodePage)(unsigned int* Value);
+    STDMETHOD(get_MaxTables)(int* Value);
 };
 
 OBJECT_ENTRY_AUTO(__uuidof(Database), CDatabase)