transactd 2.0.1 → 2.1.0

data/source/global/ormsrcgen/main.cpp

@@ -24,7 +24,9 @@
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
 #include <bzs/db/protocol/tdap/client/trdboostapi.h>
+#ifndef TRDCL_AUTOLINK
 #define TRDCL_AUTOLINK
+#endif
 #include <bzs/db/protocol/tdap/client/trdclcppautolink.h>
 #include "confParam.h"
 #include "srcgen.h"

data/source/global/tdclatl/Database.cpp

@@ -162,9 +162,9 @@ STDMETHODIMP CDatabase::get_NativeDatabase(__int64** Value)
     return S_OK;
 }
 
-STDMETHODIMP CDatabase::BeginSnapshot()
+STDMETHODIMP CDatabase::BeginSnapshot(eStLockType bias)
 {
-    m_db->beginSnapshot();
+    m_db->beginSnapshot(bias);
     return S_OK;
 }
 

data/source/global/tdclatl/Database.h

@@ -93,7 +93,7 @@ public:
     STDMETHOD(AbortTrn)();
     STDMETHOD(BeginTrn)(eLockType bias);
     STDMETHOD(EndTrn)();
-    STDMETHOD(BeginSnapshot)();
+    STDMETHOD(BeginSnapshot)(eStLockType bias);
     STDMETHOD(EndSnapshot)();
     STDMETHOD(get_NativeDatabase)(__int64** Value);
 

data/source/global/tdclatl/FieldDefs.cpp

@@ -22,8 +22,6 @@
 
 void CFieldDefs::FinalRelease()
 {
-    if (m_fieldDefObj)
-        m_fieldDefObj->AddRef();
 }
 
 short CFieldDefs::GetFieldNum(VARIANT* Index)
@@ -50,7 +48,6 @@ STDMETHODIMP CFieldDefs::get_FieldDef(VARIANT Name, IFieldDef** retVal)
         if (m_fieldDefObj == NULL)
         {
             CComObject<CFieldDef>::CreateInstance(&m_fieldDefObj);
-            m_fieldDefObj->AddRef();
         }
         if (m_fieldDefObj)
         {

data/source/global/tdclatl/PooledDbManager.cpp

@@ -88,9 +88,9 @@ STDMETHODIMP CPooledDbManager::AbortTrn(void)
     return S_OK;
 }
 
-STDMETHODIMP CPooledDbManager::BeginSnapshot(void)
+STDMETHODIMP CPooledDbManager::BeginSnapshot(eStLockType bias)
 {
-    m_mgr.beginSnapshot();
+    m_mgr.beginSnapshot(bias);
     return S_OK;
 }
 

data/source/global/tdclatl/PooledDbManager.h

@@ -58,7 +58,7 @@ public:
     STDMETHOD(BeginTrn)(eLockType Bias);
     STDMETHOD(EndTrn)(void);
     STDMETHOD(AbortTrn)(void);
-    STDMETHOD(BeginSnapshot)(void);
+    STDMETHOD(BeginSnapshot)(eStLockType bias);
     STDMETHOD(EndSnapshot)(void);
     STDMETHOD(Use)(VARIANT Uri);
     STDMETHOD(Unuse)();

data/source/global/tdclatl/PreparedQuery.cpp

@@ -0,0 +1,53 @@
+/*=================================================================
+   Copyright (C) 2014 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 "PreparedQuery.h"
+
+STDMETHODIMP CPreparedQuery::SupplyValue(int Index, VARIANT Value, VARIANT_BOOL* retVal)
+{
+    if (Value.vt != VT_BSTR)
+        VariantChangeType(&Value, &Value, 0, VT_BSTR);
+
+    if (Value.bstrVal && Value.bstrVal[0])
+    {
+        *retVal = m_pq->supplyValue(Index, Value.bstrVal);
+        return S_OK;
+    }
+    return Error(_T("Invalid PreparedQuery::SupplyValue param 2."), IID_IPreparedQuery);
+}
+
+STDMETHODIMP CPreparedQuery::AddValue(VARIANT Value, VARIANT_BOOL* retVal)
+{
+    if (Value.vt != VT_BSTR)
+        VariantChangeType(&Value, &Value, 0, VT_BSTR);
+
+    if (Value.bstrVal && Value.bstrVal[0])
+    {
+        *retVal = m_pq->addValue(Value.bstrVal);
+        return S_OK;
+    }
+    return Error(_T("Invalid PreparedQuery::AddValue param 1."), IID_IPreparedQuery);
+}
+
+STDMETHODIMP CPreparedQuery::ResetAddIndex()
+{
+    m_pq->resetAddIndex();
+    return S_OK;
+}
+

data/source/global/tdclatl/PreparedQuery.h

@@ -0,0 +1,61 @@
+#pragma once
+/*=================================================================
+   Copyright (C) 2014 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 "resource.h"
+
+#include "tdclatl_i.h"
+#include <bzs/db/protocol/tdap/client/activeTable.h>
+
+using namespace ATL;
+class ATL_NO_VTABLE CPreparedQuery
+    : public CComObjectRootEx<CComSingleThreadModel>,
+      public CComCoClass<CPreparedQuery, &CLSID_PreparedQuery>,
+      public IDispatchImpl<IPreparedQuery, &IID_IPreparedQuery, &LIBID_transactd,
+                           /* wMajor = */ 1, /* wMinor = */ 0>
+{
+    bzs::db::protocol::tdap::client::preparedQuery* m_pq;
+public:
+
+    CPreparedQuery():m_pq(NULL){}
+    void setPqHandle(bzs::db::protocol::tdap::client::pq_handle& stmt)
+    {
+        if (m_pq)
+            delete m_pq;
+         m_pq = new bzs::db::protocol::tdap::client::preparedQuery(stmt);
+    }
+    bzs::db::protocol::tdap::client::pq_handle& getFilter() {return m_pq->getFilter();}
+
+    BEGIN_COM_MAP(CPreparedQuery)
+    COM_INTERFACE_ENTRY(IPreparedQuery)
+    COM_INTERFACE_ENTRY(IDispatch)
+    END_COM_MAP()
+
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    HRESULT FinalConstruct() { return S_OK; }
+
+    void FinalRelease(){delete m_pq;};
+
+public:
+    STDMETHOD(SupplyValue)(int Index, VARIANT Value, VARIANT_BOOL* retVal);
+    STDMETHOD(AddValue)(VARIANT Value, VARIANT_BOOL* retVal);
+    STDMETHOD(ResetAddIndex)();
+    void addValue(BSTR v) {m_pq->addValue(v);}
+};
+

data/source/global/tdclatl/QueryBase.cpp

@@ -20,9 +20,10 @@
 #include "QueryBase.h"
 #include "Table.h"
 
-STDMETHODIMP CQueryBase::Reset(void)
+STDMETHODIMP CQueryBase::Reset(IQueryBase** retVal)
 {
     m_qb.reset();
+    setResult(retVal);
     return S_OK;
 }
 

data/source/global/tdclatl/QueryBase.h

@@ -53,7 +53,7 @@ public:
 
 public:
     bzs::db::protocol::tdap::client::queryBase& query() { return m_qb; };
-    STDMETHOD(Reset)(void);
+    STDMETHOD(Reset)(IQueryBase** retVal);
     STDMETHOD(ClearSeekKeyValues)(void);
     STDMETHOD(ClearSelectFields)(void);
     STDMETHOD(Select)(BSTR Value, BSTR Value1, BSTR Value2, BSTR Value3,

data/source/global/tdclatl/Record.cpp

@@ -23,8 +23,6 @@
 
 void CRecord::FinalRelease()
 {
-    if (m_fieldObj)
-        m_fieldObj->Release();
 }
 short CRecord::GetFieldNum(VARIANT* Index)
 {
@@ -49,10 +47,8 @@ STDMETHODIMP CRecord::get_Field(VARIANT Index, IField** retVal)
         return Error("Invalid index", IID_ITable);
 
     if (m_fieldObj == NULL)
-    {
         CComObject<CField>::CreateInstance(&m_fieldObj);
-        m_fieldObj->AddRef();
-    }
+
     if (m_fieldObj)
     {
         m_fieldObj->m_fd = (*m_rec)[index];
@@ -72,10 +68,6 @@ STDMETHODIMP CRecord::get_IsInvalidRecord(VARIANT_BOOL* retVal)
 
 void CWritableRecord::FinalRelease()
 {
-    if (m_fieldObj)
-        m_fieldObj->Release();
-    if (m_fieldDefsObj)
-        m_fieldDefsObj->Release();
 }
 
 short CWritableRecord::GetFieldNum(VARIANT* Index)
@@ -107,10 +99,8 @@ STDMETHODIMP CWritableRecord::get_Field(VARIANT Index, IField** retVal)
         return Error("Invalid index", IID_IWritableRecord);
 
     if (m_fieldObj == NULL)
-    {
         CComObject<CField>::CreateInstance(&m_fieldObj);
-        m_fieldObj->AddRef();
-    }
+
     if (m_fieldObj)
     {
         m_fieldObj->m_fd = (*m_rec)[index];
@@ -191,10 +181,8 @@ STDMETHODIMP CWritableRecord::Read(VARIANT_BOOL KeysetAlrady,
 STDMETHODIMP CWritableRecord::get_FieldDefs(IFieldDefs** retVal)
 {
     if (m_fieldDefsObj == NULL)
-    {
         CComObject<CFieldDefs>::CreateInstance(&m_fieldDefsObj);
-        m_fieldDefsObj->AddRef();
-    }
+
     if (m_fieldDefsObj)
     {
         m_fieldDefsObj->m_fds = m_rec->fieldDefs();

data/source/global/tdclatl/Recordset.cpp

@@ -34,10 +34,6 @@ CARecordset::CARecordset()
 CARecordset::~CARecordset()
 {
 
-    if (m_recObj)
-        m_recObj->Release();
-    if (m_fieldDefsObj)
-        m_fieldDefsObj->Release();
 }
 
 void CARecordset::setResult(IRecordset** retVal)
@@ -50,10 +46,8 @@ STDMETHODIMP CARecordset::Record(unsigned long Index, IRecord** retVal)
     if (Index >= 0 && Index < m_rs->size())
     {
         if (m_recObj == NULL)
-        {
             CComObject<CRecord>::CreateInstance(&m_recObj);
-            m_recObj->AddRef();
-        }
+
         if (m_recObj)
         {
             m_recObj->m_rec = &((*m_rs)[Index]);
@@ -261,10 +255,7 @@ STDMETHODIMP CARecordset::Reverse(IRecordset** retVal)
 STDMETHODIMP CARecordset::get_FieldDefs(IFieldDefs** retVal)
 {
     if (m_fieldDefsObj == NULL)
-    {
         CComObject<CFieldDefs>::CreateInstance(&m_fieldDefsObj);
-        m_fieldDefsObj->AddRef();
-    }
     if (m_fieldDefsObj)
     {
         m_fieldDefsObj->m_fds = m_rs->fieldDefs();
@@ -276,3 +267,17 @@ STDMETHODIMP CARecordset::get_FieldDefs(IFieldDefs** retVal)
     }
     return S_OK;
 }
+
+
+STDMETHODIMP CARecordset::Clear()
+{
+    m_rs->clear();
+    return S_OK;
+}
+
+STDMETHODIMP CARecordset::ClearRecords()
+{
+    m_rs->clearRecords();
+    return S_OK;
+}
+

data/source/global/tdclatl/Recordset.h

@@ -80,4 +80,7 @@ public:
     STDMETHOD(Reverse)(IRecordset** retVal);
     STDMETHOD(get_FieldDefs)(IFieldDefs** retVal);
     STDMETHOD(Clone)(IRecordset** retVal);
+    STDMETHOD(Clear)();
+    STDMETHOD(ClearRecords)();
+
 };

data/source/global/tdclatl/Table.cpp

@@ -22,6 +22,7 @@
 #include "DbDef.h"
 #include "TableDef.h"
 #include "QueryBase.h"
+#include "PreparedQuery.h"
 #include <bzs/db/protocol/tdap/client/fields.h>
 
 using namespace bzs::db::protocol::tdap;
@@ -390,11 +391,8 @@ STDMETHODIMP CTableTd::Field(VARIANT Index, IField** retVal)
         return Error("Invalid index", IID_ITable);
 
     if (m_fieldObj == NULL)
-    {
         CComObject<CField>::CreateInstance(&m_fieldObj);
-        if (m_fieldObj)
-            m_fieldObj->AddRef();
-    }
+
     if (m_fieldObj)
     {
         client::fields fds(*m_tb);
@@ -600,20 +598,57 @@ STDMETHODIMP CTableTd::KeyValueDescription(BSTR* Value)
     return S_OK;
 }
 
-STDMETHODIMP CTableTd::SetQuery(IQueryBase* Value)
+STDMETHODIMP CTableTd::SetQuery(IQueryBase* Value, VARIANT_BOOL ServerPrepare, IPreparedQuery** retVal)
 {
     if (Value)
     {
         CQueryBase* p = dynamic_cast<CQueryBase*>(Value);
         if (p)
         {
-            m_tb->setQuery(&p->query());
-            return S_OK;
+            CComObject<CPreparedQuery>* rsObj;
+            CComObject<CPreparedQuery>::CreateInstance(&rsObj);
+
+            if (!rsObj)
+                return Error(_T("Can not create preparedQuery"), IID_ITable);
+            client::pq_handle pq = m_tb->setQuery(&p->query(), (bool)ServerPrepare);
+            if (pq)
+            {
+                rsObj->setPqHandle(pq);
+                IPreparedQuery* pd;
+                rsObj->QueryInterface(IID_IPreparedQuery, (void**)&pd);
+                _ASSERTE(pd);
+                *retVal = pd;
+                return S_OK;
+            }else
+            {
+                _TCHAR buf[1024];
+                client::table::tdapErr(NULL, m_tb->stat(), m_tb->tableDef()->tableName(), buf);
+                return Error(buf, IID_ITable);
+            }
         }
     }
     return S_FALSE;
 }
 
+STDMETHODIMP CTableTd::Prepare(IQueryBase* Value, VARIANT_BOOL ServerPrepare, IPreparedQuery** retVal)
+{
+    return SetQuery(Value, ServerPrepare, retVal);
+}
+
+STDMETHODIMP CTableTd::SetPrepare(IPreparedQuery* Value)
+{
+    if (Value)
+    {
+        CPreparedQuery* p = dynamic_cast<CPreparedQuery*>(Value);
+        if (p)
+        {
+            m_tb->setPrepare(p->getFilter());
+            return S_OK;
+        }
+    }
+    return Error(_T("PreparedQuery is NULL"), IID_ITable);
+}
+
 STDMETHODIMP CTableTd::FieldNumByName(BSTR Name, short* Value)
 {
     *Value = m_tb->fieldNumByName(Name);

data/source/global/tdclatl/Table.h

@@ -143,6 +143,8 @@ public:
     STDMETHOD(get_ValiableFormatType)(VARIANT_BOOL* Value);
     STDMETHOD(SmartUpdate)(void);
     STDMETHOD(KeyValueDescription)(BSTR* Value);
-    STDMETHOD(SetQuery)(IQueryBase* Value);
+    STDMETHOD(SetQuery)(IQueryBase* Value, VARIANT_BOOL ServerPrepare, IPreparedQuery** retVal);
+    STDMETHOD(Prepare)(IQueryBase* Value, VARIANT_BOOL ServerPrepare, IPreparedQuery** retVal);
+    STDMETHOD(SetPrepare)(IPreparedQuery* Value);
     STDMETHOD(FieldNumByName)(BSTR Name, short* Value);
 };

data/source/global/tdclatl/activeTable.cpp

@@ -24,6 +24,8 @@
 #include "Record.h"
 #include "TableDef.h"
 #include "PooledDbManager.h"
+#include "PreparedQuery.h"
+#include "Table.h"
 
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
@@ -35,8 +37,6 @@ void CActiveTable::setResult(IActiveTable** retVal)
 
 void CActiveTable::FinalRelease()
 {
-    if (m_recObj)
-        m_recObj->Release();
     delete m_at;
 }
 
@@ -45,7 +45,11 @@ STDMETHODIMP CActiveTable::SetDatabase(VARIANT Value, BSTR tableName)
     try
     {
         if (Value.vt != VT_DISPATCH)
-            return Error(_T("SetDatabase Type error"), IID_IActiveTable);
+        {
+            _TCHAR tmp[256];
+            wsprintf(tmp, _T("SetDatabase Type error type = %d"), Value.vt);
+            return Error(tmp, IID_IActiveTable);
+        }
         CPooledDbManager* pm = dynamic_cast<CPooledDbManager*>(Value.pdispVal);
         if (pm)
         {
@@ -164,41 +168,103 @@ STDMETHODIMP CActiveTable::Option(int Value, IActiveTable** retVal)
     return S_OK;
 }
 
-STDMETHODIMP CActiveTable::Read(VARIANT /*IQueryBase**/ query,
+STDMETHODIMP CActiveTable::Read(VARIANT query,
+                                    VARIANT Value0, VARIANT Value1,
+                                    VARIANT Value2, VARIANT Value3,
+                                    VARIANT Value4, VARIANT Value5,
+                                    VARIANT Value6, VARIANT Value7,
                                 IRecordset** retVal)
 {
 
     CComObject<CARecordset>* rsObj;
     CComObject<CARecordset>::CreateInstance(&rsObj);
 
-    if (rsObj)
-    {
-        IRecordset* rs;
-        rsObj->QueryInterface(IID_IRecordset, (void**)&rs);
-        _ASSERTE(rs);
-        *retVal = rs;
-    }
-    else
-    {
-        *retVal = 0;
-        return S_OK;
-    }
+    if (!rsObj)
+        return Error(_T("Can not create recordset"), IID_IActiveTable);
+    IRecordset* rs;
+    rsObj->QueryInterface(IID_IRecordset, (void**)&rs);
+    _ASSERTE(rs);
+    *retVal = rs;
+        
     try
     {
-        if (query.vt != VT_ERROR)
+        if (query.vt == VT_DISPATCH)
         {
             CQueryBase* p = dynamic_cast<CQueryBase*>(query.pdispVal);
             if (p)
+            {
+                if (Value0.vt != VT_ERROR)
+                    return Error(_T("Invalid ActiveTable::Read param 2"), IID_IActiveTable);
                 m_at->read(*rsObj->m_rs, p->query());
+                return S_OK;
+            }
+            else
+            {
+                CPreparedQuery* pq = dynamic_cast<CPreparedQuery*>(query.pdispVal);
+                if (pq)
+                {
+                    pq->ResetAddIndex();
+                    if (Value0.vt != VT_ERROR)
+                    {
+                        if (Value0.vt != VT_BSTR)
+                            VariantChangeType(&Value0, &Value0, 0, VT_BSTR);
+                        pq->addValue(Value0.bstrVal);
+                    }
+                    if (Value1.vt != VT_ERROR)
+                    {
+                        if (Value1.vt != VT_BSTR)
+                            VariantChangeType(&Value1, &Value1, 0, VT_BSTR);
+                        pq->addValue(Value1.bstrVal);
+                    }
+                    if (Value2.vt != VT_ERROR)
+                    {
+                        if (Value2.vt != VT_BSTR)
+                            VariantChangeType(&Value2, &Value2, 0, VT_BSTR);
+                        pq->addValue(Value2.bstrVal);
+                    }
+                    if (Value3.vt != VT_ERROR)
+                    {
+                        if (Value3.vt != VT_BSTR)
+                            VariantChangeType(&Value3, &Value3, 0, VT_BSTR);
+                        pq->addValue(Value3.bstrVal);
+                    }
+                    if (Value4.vt != VT_ERROR)
+                    {
+                        if (Value4.vt != VT_BSTR)
+                            VariantChangeType(&Value4, &Value4, 0, VT_BSTR);
+                        pq->addValue(Value4.bstrVal);
+                    }
+                    if (Value5.vt != VT_ERROR)
+                    {
+                        if (Value5.vt != VT_BSTR)
+                            VariantChangeType(&Value5, &Value5, 0, VT_BSTR);
+                        pq->addValue(Value5.bstrVal);
+                    }
+                    if (Value6.vt != VT_ERROR)
+                    {
+                        if (Value6.vt != VT_BSTR)
+                            VariantChangeType(&Value6, &Value6, 0, VT_BSTR);
+                        pq->addValue(Value6.bstrVal);
+                    }
+                    if (Value7.vt != VT_ERROR)
+                    {
+                        if (Value7.vt != VT_BSTR)
+                            VariantChangeType(&Value7, &Value7, 0, VT_BSTR);
+                        pq->addValue(Value7.bstrVal);
+                    }
+                    m_at->read(*rsObj->m_rs, pq->getFilter());
+                    return S_OK; 
+                }
+            }
         }
         else
         {
             queryBase q;
             q.reject(1).limit(1);
             m_at->read(*rsObj->m_rs, q);
+            return S_OK;
         }
-
-        return S_OK;
+        return Error(_T("Invalid ActiveTable::Read param 1"), IID_IActiveTable);
     }
     catch (bzs::rtl::exception& e)
     {
@@ -220,45 +286,80 @@ STDMETHODIMP CActiveTable::ResetAlias(IActiveTable** retVal)
     return S_OK;
 }
 
-STDMETHODIMP CActiveTable::Join(IRecordset* rs, IQueryBase* query, BSTR Name0,
+STDMETHODIMP CActiveTable::Join(IRecordset* rs, VARIANT query, BSTR Name0,
                                 BSTR Name1, BSTR Name2, BSTR Name3, BSTR Name4,
                                 BSTR Name5, BSTR Name6, BSTR Name7,
                                 IRecordset** retVal)
 {
     try
     {
-        if (query)
+        if ((query.vt == VT_DISPATCH) && query.pdispVal)
         {
             CARecordset* p = dynamic_cast<CARecordset*>(rs);
-            p->AddRef();
-            p->QueryInterface(IID_IRecordset, (void**)retVal);
-            CQueryBase* qb = dynamic_cast<CQueryBase*>(query);
-            queryBase* q = &qb->query();
-            if (p && q)
+            CQueryBase* qb = dynamic_cast<CQueryBase*>(query.pdispVal);
+            CPreparedQuery* pq = dynamic_cast<CPreparedQuery*>(query.pdispVal);
+            if (p)
             {
-                if (!Name1 || !Name1[0])
-                    m_at->join(*p->m_rs, *q, Name0);
-                else if (!Name2 || !Name2[0])
-                    m_at->join(*p->m_rs, *q, Name0, Name1);
-                else if (!Name3 || !Name3[0])
-                    m_at->join(*p->m_rs, *q, Name0, Name1, Name2);
-                else if (!Name4 || !Name4[0])
-                    m_at->join(*p->m_rs, *q, Name0, Name1, Name2, Name3);
-                else if (!Name5 || !Name5[0])
-                    m_at->join(*p->m_rs, *q, Name0, Name1, Name2, Name3, Name4);
-                else if (!Name6 || !Name6[0])
-                    m_at->join(*p->m_rs, *q, Name0, Name1, Name2, Name3, Name4,
-                               Name5);
-                else if (!Name7 || !Name7[0])
-                    m_at->join(*p->m_rs, *q, Name0, Name1, Name2, Name3, Name4,
-                               Name5, Name6);
-                else
-                    m_at->join(*p->m_rs, *q, Name0, Name1, Name2, Name3, Name4,
-                               Name5, Name6, Name7);
+                if (qb)
+                {
+                    queryBase* q = &qb->query();
+                    if (q)
+                    {
+                        if (!Name1 || !Name1[0])
+                            m_at->join(*p->m_rs, *q, Name0);
+                        else if (!Name2 || !Name2[0])
+                            m_at->join(*p->m_rs, *q, Name0, Name1);
+                        else if (!Name3 || !Name3[0])
+                            m_at->join(*p->m_rs, *q, Name0, Name1, Name2);
+                        else if (!Name4 || !Name4[0])
+                            m_at->join(*p->m_rs, *q, Name0, Name1, Name2, Name3);
+                        else if (!Name5 || !Name5[0])
+                            m_at->join(*p->m_rs, *q, Name0, Name1, Name2, Name3, Name4);
+                        else if (!Name6 || !Name6[0])
+                            m_at->join(*p->m_rs, *q, Name0, Name1, Name2, Name3, Name4,
+                                       Name5);
+                        else if (!Name7 || !Name7[0])
+                            m_at->join(*p->m_rs, *q, Name0, Name1, Name2, Name3, Name4,
+                                       Name5, Name6);
+                        else
+                            m_at->join(*p->m_rs, *q, Name0, Name1, Name2, Name3, Name4,
+                                       Name5, Name6, Name7);
+                        
+                        p->QueryInterface(IID_IRecordset, (void**)retVal);
+                        return S_OK;
+                    }
+                }
+                else if (pq)
+                {
+                    bzs::db::protocol::tdap::client::pq_handle& stmt = pq->getFilter();
+                    if (stmt)
+                    {
+                        if (!Name1 || !Name1[0])
+                            m_at->join(*p->m_rs, stmt, Name0);
+                        else if (!Name2 || !Name2[0])
+                            m_at->join(*p->m_rs, stmt, Name0, Name1);
+                        else if (!Name3 || !Name3[0])
+                            m_at->join(*p->m_rs, stmt, Name0, Name1, Name2);
+                        else if (!Name4 || !Name4[0])
+                            m_at->join(*p->m_rs, stmt, Name0, Name1, Name2, Name3);
+                        else if (!Name5 || !Name5[0])
+                            m_at->join(*p->m_rs, stmt, Name0, Name1, Name2, Name3, Name4);
+                        else if (!Name6 || !Name6[0])
+                            m_at->join(*p->m_rs, stmt, Name0, Name1, Name2, Name3, Name4,
+                                       Name5);
+                        else if (!Name7 || !Name7[0])
+                            m_at->join(*p->m_rs, stmt, Name0, Name1, Name2, Name3, Name4,
+                                       Name5, Name6);
+                        else
+                            m_at->join(*p->m_rs, stmt, Name0, Name1, Name2, Name3, Name4,
+                                       Name5, Name6, Name7);
+                        p->QueryInterface(IID_IRecordset, (void**)retVal);
+                        return S_OK;
+                    }
+                }
             }
-            p->Release();
         }
-        return S_OK;
+        return Error(_T("Invalid ActiveTable::Join param 2"), IID_IActiveTable);
     }
     catch (bzs::rtl::exception& e)
     {
@@ -266,7 +367,7 @@ STDMETHODIMP CActiveTable::Join(IRecordset* rs, IQueryBase* query, BSTR Name0,
     }
 }
 
-STDMETHODIMP CActiveTable::OuterJoin(IRecordset* rs, IQueryBase* query,
+STDMETHODIMP CActiveTable::OuterJoin(IRecordset* rs, VARIANT query,
                                      BSTR Name0, BSTR Name1, BSTR Name2,
                                      BSTR Name3, BSTR Name4, BSTR Name5,
                                      BSTR Name6, BSTR Name7,
@@ -274,52 +375,112 @@ STDMETHODIMP CActiveTable::OuterJoin(IRecordset* rs, IQueryBase* query,
 {
     try
     {
-        if (query)
+        if ((query.vt == VT_DISPATCH) && query.pdispVal)
         {
             CARecordset* p = dynamic_cast<CARecordset*>(rs);
-            p->QueryInterface(IID_IRecordset, (void**)retVal);
-            CQueryBase* qb = dynamic_cast<CQueryBase*>(query);
-            queryBase* q = &qb->query();
-            if (p && q)
+            CQueryBase* qb = dynamic_cast<CQueryBase*>(query.pdispVal);
+            CPreparedQuery* pq = dynamic_cast<CPreparedQuery*>(query.pdispVal);
+            if (p)
             {
-                if (!Name1 || !Name1[0])
-                    m_at->outerJoin(*p->m_rs, *q, Name0);
-                else if (!Name2 || !Name2[0])
-                    m_at->outerJoin(*p->m_rs, *q, Name0, Name1);
-                else if (!Name3 || !Name3[0])
-                    m_at->outerJoin(*p->m_rs, *q, Name0, Name1, Name2);
-                else if (!Name4 || !Name4[0])
-                    m_at->outerJoin(*p->m_rs, *q, Name0, Name1, Name2, Name3);
-                else if (!Name5 || !Name5[0])
-                    m_at->outerJoin(*p->m_rs, *q, Name0, Name1, Name2, Name3,
-                                    Name4);
-                else if (!Name6 || !Name6[0])
-                    m_at->outerJoin(*p->m_rs, *q, Name0, Name1, Name2, Name3,
-                                    Name4, Name5);
-                else if (!Name7 || !Name7[0])
-                    m_at->outerJoin(*p->m_rs, *q, Name0, Name1, Name2, Name3,
-                                    Name4, Name5, Name6);
-                else
-                    m_at->outerJoin(*p->m_rs, *q, Name0, Name1, Name2, Name3,
-                                    Name4, Name5, Name6, Name7);
+                if (qb)
+                {
+                    queryBase* q = &qb->query();
+                    if (q)
+                    {
+                        if (!Name1 || !Name1[0])
+                            m_at->outerJoin(*p->m_rs, *q, Name0);
+                        else if (!Name2 || !Name2[0])
+                            m_at->outerJoin(*p->m_rs, *q, Name0, Name1);
+                        else if (!Name3 || !Name3[0])
+                            m_at->outerJoin(*p->m_rs, *q, Name0, Name1, Name2);
+                        else if (!Name4 || !Name4[0])
+                            m_at->outerJoin(*p->m_rs, *q, Name0, Name1, Name2, Name3);
+                        else if (!Name5 || !Name5[0])
+                            m_at->outerJoin(*p->m_rs, *q, Name0, Name1, Name2, Name3, Name4);
+                        else if (!Name6 || !Name6[0])
+                            m_at->outerJoin(*p->m_rs, *q, Name0, Name1, Name2, Name3, Name4,
+                                       Name5);
+                        else if (!Name7 || !Name7[0])
+                            m_at->outerJoin(*p->m_rs, *q, Name0, Name1, Name2, Name3, Name4,
+                                       Name5, Name6);
+                        else
+                            m_at->outerJoin(*p->m_rs, *q, Name0, Name1, Name2, Name3, Name4,
+                                       Name5, Name6, Name7);
+                        
+                        p->QueryInterface(IID_IRecordset, (void**)retVal);
+                        return S_OK;
+                    }
+                }
+                else if (pq)
+                {
+                    bzs::db::protocol::tdap::client::pq_handle& stmt = pq->getFilter();
+                    if (stmt)
+                    {
+                        if (!Name1 || !Name1[0])
+                            m_at->outerJoin(*p->m_rs, stmt, Name0);
+                        else if (!Name2 || !Name2[0])
+                            m_at->outerJoin(*p->m_rs, stmt, Name0, Name1);
+                        else if (!Name3 || !Name3[0])
+                            m_at->outerJoin(*p->m_rs, stmt, Name0, Name1, Name2);
+                        else if (!Name4 || !Name4[0])
+                            m_at->outerJoin(*p->m_rs, stmt, Name0, Name1, Name2, Name3);
+                        else if (!Name5 || !Name5[0])
+                            m_at->outerJoin(*p->m_rs, stmt, Name0, Name1, Name2, Name3, Name4);
+                        else if (!Name6 || !Name6[0])
+                            m_at->outerJoin(*p->m_rs, stmt, Name0, Name1, Name2, Name3, Name4,
+                                       Name5);
+                        else if (!Name7 || !Name7[0])
+                            m_at->outerJoin(*p->m_rs, stmt, Name0, Name1, Name2, Name3, Name4,
+                                       Name5, Name6);
+                        else
+                            m_at->outerJoin(*p->m_rs, stmt, Name0, Name1, Name2, Name3, Name4,
+                                       Name5, Name6, Name7);
+                        p->QueryInterface(IID_IRecordset, (void**)retVal);
+                        return S_OK;
+                    }
+                }
             }
         }
-        *retVal = rs;
-        return S_OK;
+        return Error(_T("Invalid ActiveTable::OuterJoin param 2"), IID_IActiveTable);
     }
     catch (bzs::rtl::exception& e)
     {
         return Error((*bzs::rtl::getMsg(e)).c_str(), IID_IActiveTable);
     }
+
+}
+
+STDMETHODIMP CActiveTable::Prepare(IQueryBase* Value, VARIANT_BOOL ServerPrepare, IPreparedQuery** retVal)
+{
+    if (Value)
+    {
+        CQueryBase* p = dynamic_cast<CQueryBase*>(Value);
+        if (p)
+        {
+            CComObject<CPreparedQuery>* rsObj;
+            CComObject<CPreparedQuery>::CreateInstance(&rsObj);
+
+            if (!rsObj)
+                return Error(_T("Can not create preparedQuery"), IID_ITable);
+
+            rsObj->setPqHandle(m_at->prepare(p->query(), (bool)ServerPrepare));
+            IPreparedQuery* pd;
+            rsObj->QueryInterface(IID_IPreparedQuery, (void**)&pd);
+            _ASSERTE(pd);
+            *retVal = pd;
+            return S_OK;
+        }
+    }
+    return Error(_T("Invalid ActiveTable::Prepare param 1"), IID_IActiveTable);
 }
 
+
 STDMETHODIMP CActiveTable::GetWritableRecord(IWritableRecord** retVal)
 {
 
     if (m_recObj == NULL)
     {
         CComObject<CWritableRecord>::CreateInstance(&m_recObj);
-        m_recObj->AddRef();
         m_recObj->m_rec = &m_at->getWritableRecord();
     }
     if (m_recObj)
@@ -353,3 +514,30 @@ STDMETHODIMP CActiveTable::get_TableDef(ITableDef** Value)
         *Value = 0;
     return S_OK;
 }
+
+STDMETHODIMP CActiveTable::Table(ITable** retVal)
+{
+    try
+    {
+        CComObject<CTableTd>* ptb;
+        CComObject<CTableTd>::CreateInstance(&ptb);
+
+        if (ptb)
+        {
+            ptb->m_tb = m_at->table();
+            ptb->m_tb->setOptionalData((void*)NULL);
+            ITable* itb;
+            ptb->QueryInterface(IID_ITable, (void**)&itb);
+            _ASSERTE(itb);
+            *retVal = itb;
+        }
+        else
+            *retVal = NULL;
+        return S_OK;
+    }
+
+    catch (bzs::rtl::exception& e)
+    {
+        return Error((*bzs::rtl::getMsg(e)).c_str(), IID_IActiveTable);
+    }
+}