transactd 2.4.5 → 3.0.0

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

@@ -0,0 +1,137 @@
+#ifndef BZS_TEST_TRDCLENGN_TESTBASE_H
+#define BZS_TEST_TRDCLENGN_TESTBASE_H
+/* =================================================================
+ Copyright (C) 2015 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 <boost/test/test_tools.hpp>
+
+#if defined(__BCPLUSPLUS__)
+#pragma warn -8012
+#pragma warn -8022
+#endif
+#include <boost/test/included/unit_test.hpp>
+#ifndef BOOST_TEST_MESSAGE
+#define BOOST_TEST_MESSAGE BOOST_MESSAGE
+#endif
+#if defined(__BCPLUSPLUS__)
+#pragma warn .8012
+#pragma warn .8022
+#endif
+
+#include <bzs/db/protocol/tdap/client/database.h>
+#include <bzs/db/protocol/tdap/client/table.h>
+#include <bzs/db/protocol/tdap/client/dbDef.h>
+#include <bzs/db/protocol/tdap/mysql/characterset.h>
+#include <bzs/db/protocol/tdap/tdapcapi.h>
+#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/myDateTime.h>
+
+using namespace bzs::db::protocol::tdap::client;
+using namespace bzs::db::protocol::tdap;
+using namespace std;
+
+#define TDAP
+#ifdef TDAP
+#define PROTOCOL _T("tdap")
+#else
+#define PROTOCOL _T("btrv")
+#endif
+static _TCHAR HOSTNAME[MAX_PATH] = { _T("127.0.0.1") };
+#define DBNAME _T("test")
+#define BDFNAME _T("test")
+#define ISOLATION_READ_COMMITTED
+
+static _TCHAR g_uri[MAX_PATH];
+static _TCHAR g_userName[MYSQL_USERNAME_MAX + 1]={0x00};
+static _TCHAR g_password[MAX_PATH]={0x00};
+
+const _TCHAR* makeUri(const _TCHAR* protocol, const _TCHAR* host,
+                      const _TCHAR* dbname, const _TCHAR* dbfile=_T(""))
+{
+    connectParams cp(protocol, host, dbname, dbfile, g_userName, g_password);
+    _tcscpy_s(g_uri, 260, cp.uri());
+    return g_uri;
+}
+
+static bool use_nullfield = false;
+static bool use_mysqlNullMode = true;
+
+boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]);
+
+boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[])
+{
+    for (int i = 1; i < argc; ++i)
+    {
+        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);
+#else
+            strcpy_s(HOSTNAME, MAX_PATH, argv[i] + 7);
+#endif
+        }
+        if (strstr(argv[i], "--user=") == argv[i])
+        {
+#ifdef _UNICODE
+            MultiByteToWideChar(CP_ACP,
+                                (CP_ACP == CP_UTF8) ? 0 : MB_PRECOMPOSED,
+                                argv[i] + 7, -1, g_userName, MYSQL_USERNAME_MAX+1);
+#else
+            strcpy_s(g_userName, MYSQL_USERNAME_MAX+1, argv[i] + 7);
+#endif        
+        }
+        
+        if (strstr(argv[i], "--pwd=") == argv[i])
+        {
+#ifdef _UNICODE
+            MultiByteToWideChar(CP_ACP,
+                                (CP_ACP == CP_UTF8) ? 0 : MB_PRECOMPOSED,
+                                argv[i] + 6, -1, g_password, MAX_PATH);
+#else
+            strcpy_s(g_password, MAX_PATH, argv[i] + 6);
+#endif        
+        }
+        if (strstr(argv[i], "--nullfield=") == argv[i])
+            use_nullfield = atol(argv[i] + 12) != 0;  
+        if (strstr(argv[i], "--mysqlnull=") == argv[i])
+            use_mysqlNullMode = atol(argv[i] + 12) != 0; 
+    }
+    printf("Transactd test ... \nMay look like progress is stopped, \n"
+            "but it is such as record lock test, please wait.\n");
+    if (!use_mysqlNullMode)
+        database::setCompatibleMode(database::CMP_MODE_OLD_NULL);
+    return 0;
+}
+
+#ifdef _WIN32
+    #ifdef _UNICODE
+        static const uchar_td g_td_charsetIndex = CHARSET_UTF8;
+    #else
+        static const uchar_td g_td_charsetIndex = CHARSET_CP932;
+    #endif
+#else
+    static const uchar_td g_td_charsetIndex = CHARSET_UTF8;
+#endif
+
+#endif // BZS_TEST_TRDCLENGN_TESTBASE_H

data/source/global/ormsrcgen/srcgen.cpp

@@ -144,7 +144,7 @@ int cppSrcGen::typeNum(int type)
         t = 1;
     else if (t == ft_logical)
         t = 1;
-    else if (t == ft_uinteger)
+    else if (t == ft_uinteger || t == ft_myyear)
         t = 1;
     else if (t == ft_currency)
         t = 1;
@@ -161,7 +161,7 @@ int cppSrcGen::typeNum(int type)
         t = 4;
     else if ((t == ft_datetime) || (t == ft_mydatetime))
         t = 30;
-    else if ((t == ft_lvar) || (t == ft_blob) || (t == ft_myblob))
+    else if ((t == ft_lvar) || (t == ft_blob) || (t == ft_myblob)|| (t == ft_mygeometry) || (t == ft_myjson))
         t = ft_lvar;
     return t;
 }
@@ -225,10 +225,8 @@ const char* cppSrcGen::typeString(int type, int size)
             return "double";
         THROW_BZS_ERROR_WITH_MSG(_T("Invalid float size"));
     case ft_date:
-    case ft_mydate:
         return "td::btrDate";
     case ft_time:
-    case ft_mytime:
         return "td::btrTime";
     case ft_datetime:
     case ft_timestamp:
@@ -247,6 +245,9 @@ const char* cppSrcGen::typeString(int type, int size)
         return "_tstring";
     case ft_uinteger:
     case ft_autoIncUnsigned:
+    case ft_bit:
+    case ft_set:
+    case ft_enum:
         if (size == 1)
             return "unsigned char";
         else if (size == 2)
@@ -256,14 +257,24 @@ const char* cppSrcGen::typeString(int type, int size)
         else if (size == 8)
             return "unsigned __int64";
         THROW_BZS_ERROR_WITH_MSG(_T("Invalid uint size"));
+    case ft_myyear:
+        return "unsigned short";
     case ft_lvar:
     case ft_myblob:
+    case ft_mygeometry:
+    case ft_myjson:
         return "void*";
+    case ft_mydate:
+        return "td::myDate";
+    case ft_mytime:
+        return "td::myTime";
+    case ft_mydatetime:
+        return "td::myDateTime";
+    case ft_mytimestamp:
+        return "td::myTimeStamp";
     case ft_numericsts:
     case ft_numericsa:
     case ft_decimal:
-    case ft_mydatetime:
-    case ft_mytimestamp:
         THROW_BZS_ERROR_WITH_MSG(_T("non support type"));
     default:
         THROW_BZS_ERROR_WITH_MSG(_T("invalid field type"));
@@ -297,9 +308,9 @@ string cppSrcGen::makeDataMembaInitString()
                     retVal += LF "\t\t";
             }
         }
-        if ((t == ft_time) || (t == ft_date))
+        if ((t == ft_time) || (t == ft_date) || (t == ft_mydate))
             retVal2 = retVal2 + "\t\t" + name + ".i = 0;" LF;
-        else if (t == ft_datetime)
+        else if ((t == ft_datetime) || (t == ft_mytime) || (t == ft_mydatetime)|| (t == ft_mytimestamp))
             retVal2 = retVal2 + "\t\t" + name + ".i64 = 0;" LF;
     }
     removeEndchar(retVal);
@@ -507,9 +518,9 @@ string cppSrcGen::makeMapWriteStringLine(int index)
     int t = typeNum(fd->type);
 
     string s = "\tfds[m_fdi." + name + "] = m." + membaNameGet(name) + "()";
-    if ((t == ft_time) || (t == ft_date))
+    if ((t == ft_time) || (t == ft_date) || (t == ft_mydate))
         s += string(".i");
-    else if (t == ft_datetime)
+    else if ((t == ft_datetime) || (t == ft_mytime) || (t == ft_mydatetime)|| (t == ft_mytimestamp))
         s += string(".i64");
     else if (t == ft_lvar)
     {
@@ -556,9 +567,9 @@ string cppSrcGen::makeMapKeyCompString()
                 tostr = "";
                 tostrend = "";
             }
-            if ((t == ft_time) || (t == ft_date))
+            if ((t == ft_time) || (t == ft_date) || (t == ft_mydate))
                 s += string(".i");
-            else if (t == ft_datetime)
+            else if ((t == ft_datetime) || (t == ft_mytime) || (t == ft_mydatetime)|| (t == ft_mytimestamp))
                 s += string(".i64");
             string tmp;
             size_t size = 0;

data/source/global/ormsrcgen/template/ormDataClass_template.h

@@ -5,6 +5,8 @@
 #include <boost/shared_ptr.hpp>
 #include <vector>
 #include <bzs/db/protocol/tdap/btrDate.h>
+#include <bzs/db/protocol/tdap/myDateTime.h>
+
 namespace td = bzs::db::protocol::tdap;
 
 % nameSpaceBegin %

data/source/global/querystmts/querystmts.cpp

@@ -71,8 +71,7 @@ bool readInputValues(const char* filename,
     FILE* fp = fopen(filename, "rt");
     if (!fp)
     {
-        _ftprintf(stderr, _T("Error ! Can not open the input file (%s)\n"),
-                  filename);
+        fprintf(stderr, "Error ! Can not open the input file (%s)\n", filename);
         return false;
     }
     char tmp[5];
@@ -215,7 +214,7 @@ int _tmain(int argc, _TCHAR* argv[])
         if (pm.print)
             printResult(rs);
         char tmp[120];
-        sprintf_s(tmp, 120, "OK, %lu record(s) :", rs.size());
+        sprintf_s(tmp, 120, "OK, %lu record(s) :", (unsigned long)rs.size());
         bzs::rtl::benchmark::showTimes(t, tmp);
 
         fflush(stdout);

data/source/global/tdclatl/Bitset.cpp

@@ -0,0 +1,38 @@
+// Bitset.cpp : CBitset �̎���
+
+#include "stdafx.h"
+#include "Bitset.h"
+
+
+// CBitset
+
+STDMETHODIMP CBitset::get_Bit(short Index, VARIANT_BOOL* Value)
+{
+    *Value = m_bitset.get(Index);
+    return S_OK;
+}
+
+STDMETHODIMP CBitset::put_Bit(short Index, VARIANT_BOOL Value)
+{
+    m_bitset.set(Index, (Value != 0));
+    return S_OK;
+}
+
+STDMETHODIMP CBitset::Equals(IBitset* bitset, VARIANT_BOOL* retVal)
+{
+    CBitset* b = dynamic_cast<CBitset*>(bitset);
+    if (!b) return Error("Invalid param.", IID_IBitset);
+    *retVal = (m_bitset ==  b->m_bitset);   
+    return S_OK;
+}
+
+STDMETHODIMP CBitset::Contains(IBitset* bitset, VARIANT_BOOL all, VARIANT_BOOL* retVal)
+{
+    CBitset* b = dynamic_cast<CBitset*>(bitset);
+    if (!b) return Error("Invalid param bitset.", IID_IBitset);
+    *retVal = m_bitset.contains(b->m_bitset, (all != 0));   
+    return S_OK;
+}
+
+
+    

data/source/global/tdclatl/Bitset.h

@@ -0,0 +1,63 @@
+// Bitset.h : CBitset �̐錾
+
+#pragma once
+#include "resource.h"       // ���C�� �V���{��
+
+
+
+#include "tdclatl_i.h"
+#include <bzs/db/protocol/tdap/client/table.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 CBitset :
+	public CComObjectRootEx<CComSingleThreadModel>,
+	public CComCoClass<CBitset, &CLSID_Bitset>,
+	public IDispatchImpl<IBitset, &IID_IBitset, &LIBID_transactd, /*wMajor =*/ 1, /*wMinor =*/ 0>
+{
+
+public:
+    bzs::db::protocol::tdap::bitset m_bitset;
+
+	CBitset()
+	{
+	}
+
+DECLARE_REGISTRY_RESOURCEID(IDR_BITSET)
+
+
+BEGIN_COM_MAP(CBitset)
+	COM_INTERFACE_ENTRY(IBitset)
+	COM_INTERFACE_ENTRY(IDispatch)
+END_COM_MAP()
+
+
+
+	DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+	HRESULT FinalConstruct()
+	{
+		return S_OK;
+	}
+
+	void FinalRelease()
+	{
+	}
+
+public:
+
+    STDMETHOD(get_Bit)(short Index, VARIANT_BOOL* retVal);
+    STDMETHOD(put_Bit)(short Index, VARIANT_BOOL Value);
+    STDMETHOD(Equals)(IBitset* bitset, VARIANT_BOOL* retVal);
+    STDMETHOD(Contains)(IBitset* bitset, VARIANT_BOOL Value, VARIANT_BOOL* retVal);
+};
+
+OBJECT_ENTRY_AUTO(__uuidof(Bitset), CBitset)

data/source/global/tdclatl/Database.cpp

@@ -78,15 +78,17 @@ STDMETHODIMP CDatabase::OpenTable(VARIANT TableID, eOpenMode Mode,
     *ret = NULL;
     table* tb = NULL;
     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.bstrVal, Mode, (bool)AutoCreate, OwnerName, Uri);
+    else if (TableID.vt == VT_I2)
+        tb = m_db->openTable(TableID.iVal, Mode, (bool)AutoCreate, OwnerName, Uri);
+    else if (TableID.vt == VT_I4)
+        tb = m_db->openTable((short)TableID.lVal, Mode, (bool)AutoCreate, OwnerName, Uri);
+    else
+        return Error("Invalid param 1 OpenTable ", IID_IDatabase);
 
     if (m_db->stat() != 0)
         return S_OK;
-        //return Error("Invalid tableid", IID_IDatabase);
+ 
 
     CComObject<CTableTd>* ptb;
     CComObject<CTableTd>::CreateInstance(&ptb);
@@ -418,8 +420,7 @@ STDMETHODIMP CDatabase::ConvertTable(short TableIndex, VARIANT_BOOL Turbo,
 }
 
 STDMETHODIMP CDatabase::CopyTableData(ITable* Dest, ITable* Src,
-                                      VARIANT_BOOL Turbo, int Offset,
-                                      short KeyNum, int MaxSkip, short* Value)
+                                      VARIANT_BOOL Turbo, short KeyNum, int MaxSkip, short* Value)
 {
     CTableTd* dest = dynamic_cast<CTableTd*>(Dest);
     CTableTd* src = dynamic_cast<CTableTd*>(Src);
@@ -432,10 +433,20 @@ STDMETHODIMP CDatabase::CopyTableData(ITable* Dest, ITable* Src,
     return S_OK;
 }
 
-STDMETHODIMP CDatabase::CreateTable(short FileNum, BSTR Uri,
+STDMETHODIMP CDatabase::CreateTable(VARIANT FileNumOrSql, BSTR Uri,
                                     VARIANT_BOOL* Value)
 {
-    *Value = m_db->createTable(FileNum, Uri);
+    if (FileNumOrSql.vt == VT_BSTR && Uri[0]==0x00)
+    {
+        
+        int size = WideCharToMultiByte(CP_UTF8, 0, FileNumOrSql.bstrVal, -1, NULL, 0, NULL, NULL);
+        char* p = new char[size + 1];
+        WideCharToMultiByte(CP_UTF8, 0, FileNumOrSql.bstrVal, -1, p, size + 1, NULL, NULL);
+        *Value = m_db->createTable(p);
+        delete [] p;
+    }
+    else
+        *Value = m_db->createTable(FileNumOrSql.iVal, Uri);
     return S_OK;
 }
 
@@ -445,14 +456,6 @@ STDMETHODIMP CDatabase::ExistsTableFile(short TableIndex, BSTR OwnerName)
     return S_OK;
 }
 
-STDMETHODIMP CDatabase::GetTableUri(short FileNum, BSTR* Value)
-{
-    wchar_t tmp[MAX_PATH] = { NULL };
-    m_db->getTableUri(tmp, FileNum);
-    *Value = ::SysAllocString(tmp);
-    return S_OK;
-}
-
 STDMETHODIMP CDatabase::get_IsOpened(VARIANT_BOOL* Value)
 {
     *Value = m_db->isOpened();
@@ -531,6 +534,42 @@ STDMETHODIMP CDatabase::get_TrxLockWaitTimeoutServer(int* Value)
     return S_OK;
 }
 
+STDMETHODIMP CDatabase::put_AutoSchemaUseNullkey(VARIANT_BOOL Value)
+{
+    m_db->setAutoSchemaUseNullkey(Value);
+    return S_OK;
+}
+
+STDMETHODIMP CDatabase::get_AutoSchemaUseNullkey(VARIANT_BOOL* Value)
+{
+    *Value = m_db->autoSchemaUseNullkey();
+    return S_OK;
+}
+
+STDMETHODIMP CDatabase::put_CompatibleMode(int Value)
+{
+    database::setCompatibleMode(Value);
+    return S_OK;
+}
+
+STDMETHODIMP CDatabase::get_CompatibleMode(int* Value)
+{
+    *Value = database::compatibleMode();
+    return S_OK;
+}
+
+STDMETHODIMP CDatabase::GetSqlStringForCreateTable(BSTR tableName, BSTR* retVal)
+{
+    uint_td size = 65000;
+    char* tmp = new char[size];
+    CComBSTR ret;
+
+    ret = m_db->getSqlStringForCreateTable(tableName, tmp, &size);
+    *retVal = ret.Copy();
+    delete [] tmp;
+    return S_OK;
+}
+
 void __stdcall onCopyData(database* db, int recordCount, int count,
                           bool& cancel)
 {
@@ -557,3 +596,5 @@ bool __stdcall onDeleteRecord(database* db, table* tb, bool inkey)
     cdb->Fire_OnDeleteRecord(dbPtr, tbPtr, &tmp);
     return (tmp != 0);
 }
+
+

data/source/global/tdclatl/Database.h

@@ -139,11 +139,10 @@ public:
     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 KeyNum, int MaxSkip,
                              short* Value);
-    STDMETHOD(CreateTable)(short FileNum, BSTR Uri, VARIANT_BOOL* Value);
+    STDMETHOD(CreateTable)(VARIANT FileNumOrSql, 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);
@@ -157,7 +156,11 @@ public:
     STDMETHOD(get_MaxTables)(int* Value);
     STDMETHOD(get_TrxIsolationServer)(eSrvIsorationType* Value);
     STDMETHOD(get_TrxLockWaitTimeoutServer)(int* Value);
-
+    STDMETHOD(put_AutoSchemaUseNullkey)(VARIANT_BOOL Value);
+    STDMETHOD(get_AutoSchemaUseNullkey)(VARIANT_BOOL* Value);
+    STDMETHOD(put_CompatibleMode)(int Value);
+    STDMETHOD(get_CompatibleMode)(int* Value);
+    STDMETHOD(GetSqlStringForCreateTable)(BSTR tableName, BSTR* retValue);
 };
 
 OBJECT_ENTRY_AUTO(__uuidof(Database), CDatabase)

data/source/global/tdclatl/DbDef.cpp

@@ -175,12 +175,6 @@ STDMETHODIMP CDbDef::FindKeynumByFieldNum(short TableIndex, short Index,
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::GetRecordLen(short TableIndex, unsigned short* Value)
-{
-    *Value = m_dbDef->getRecordLen(TableIndex);
-    return S_OK;
-}
-
 STDMETHODIMP CDbDef::get_OpenMode(eOpenMode* Value)
 {
     *Value = (eOpenMode)m_dbDef->openMode();
@@ -254,3 +248,9 @@ STDMETHODIMP CDbDef::ValidateTableDef(short TableIndex, short* Value)
     *Value = m_dbDef->validateTableDef(TableIndex);
     return S_OK;
 }
+
+STDMETHODIMP CDbDef::SynchronizeSeverSchema(short TableIndex)
+{
+    m_dbDef->synchronizeSeverSchema(TableIndex);
+    return S_OK;
+}

data/source/global/tdclatl/DbDef.h

@@ -66,7 +66,6 @@ public:
                                 unsigned int* Value);
     STDMETHOD(FindKeynumByFieldNum)(short TableIndex, short Index,
                                     unsigned short* Value);
-    STDMETHOD(GetRecordLen)(short TableIndex, unsigned short* Value);
     STDMETHOD(get_OpenMode)(eOpenMode* Value);
     STDMETHOD(PopBackup)(short TableIndex);
     STDMETHOD(PushBackup)(short TableIndex);
@@ -78,4 +77,6 @@ public:
     STDMETHOD(TdapErr)(OLE_HANDLE hWnd, BSTR* Value);
     STDMETHOD(StatMsg)(BSTR* Value);
     STDMETHOD(ValidateTableDef)(short TableIndex, short* Value);
+    STDMETHOD(SynchronizeSeverSchema)(short TableIndex);
+
 };

data/source/global/tdclatl/Field.cpp

@@ -18,6 +18,7 @@
 =================================================================*/
 #include "stdafx.h"
 #include "Field.h"
+#include "Bitset.h"
 
 STDMETHODIMP CField::get_Text(BSTR* Value)
 {
@@ -85,3 +86,114 @@ STDMETHODIMP CField::put_Vdbl(double Value)
     m_fd.operator=(Value);
     return S_OK;
 }
+
+STDMETHODIMP CField::IsNull(VARIANT_BOOL* Value)
+{
+    *Value = m_fd.isNull();
+    return S_OK;
+}
+
+STDMETHODIMP CField::SetNull(VARIANT_BOOL Value)
+{
+    m_fd.setNull(Value != 0);
+    return S_OK;
+}
+
+STDMETHODIMP CField::SetValue(VARIANT Value)
+{
+    if (Value.vt == VT_BSTR)
+        m_fd = Value.bstrVal;
+    else if (Value.vt == VT_R4)
+        m_fd = Value.fltVal;
+    else if (Value.vt == VT_R8)
+        m_fd = Value.dblVal;
+    else if (Value.vt == VT_I2)
+        m_fd = Value.iVal;
+    else if (Value.vt == VT_I4 || Value.vt == VT_INT)
+        m_fd = Value.lVal;
+    else if (Value.vt == VT_I8)
+        m_fd = Value.llVal;
+    else if(Value.vt == VT_NULL)
+        m_fd = (wchar_t*)NULL;
+    else if ((Value.vt == VT_DISPATCH) && Value.pdispVal)
+    {
+        CBitset* b = dynamic_cast<CBitset*>(Value.pdispVal);
+        if (b)
+            m_fd = b->m_bitset.internalValue();
+        else
+            return Error("Field SetValue param", IID_IField);
+    }
+    else
+    {
+        VariantChangeType( &Value, &Value, 0, VT_BSTR );
+        m_fd = Value.bstrVal;
+    }
+    return S_OK;
+}
+
+STDMETHODIMP CField::I(int* Value)
+{
+    *Value = m_fd.i();
+    return S_OK;
+}
+
+STDMETHODIMP CField::I64(__int64* Value)
+{
+    *Value = m_fd.i64();
+    return S_OK;
+}
+
+STDMETHODIMP CField::D(double* Value)
+{
+    *Value = m_fd.d();
+    return S_OK;
+}
+
+STDMETHODIMP CField::Bin(BSTR* Value)
+{
+    uint_td size;
+    void* p = m_fd.getFVbin(size);
+    *Value = ::SysAllocStringByteLen((char*)p, size);
+    return S_OK;
+}
+
+STDMETHODIMP CField::SetBin(BSTR Value)
+{
+    int len = ::SysStringByteLen(Value);
+    m_fd.setBin(Value, len);
+    return S_OK;
+}
+
+STDMETHODIMP CField::Str(BSTR* Value)
+{
+    *Value = ::SysAllocString(m_fd.getFVstr());
+    return S_OK;
+}
+
+STDMETHODIMP CField::get_Type(short* Value)
+{
+    *Value = m_fd.type();
+    return S_OK;
+}
+
+STDMETHODIMP CField::get_Len(short* Value)
+{
+    *Value = m_fd.len();
+    return S_OK;
+}
+
+STDMETHODIMP CField::GetBits(IBitset** Value)
+{
+    CComObject<CBitset>* b;
+    CComObject<CBitset>::CreateInstance(&b);
+    if (!b)
+        return Error("CreateInstance Bitset", IID_ITable);
+    b->m_bitset = bzs::db::protocol::tdap::bitset(m_fd.i64());
+    CBitset* bi;
+    b->QueryInterface(IID_IBitset, (void**)&bi);
+    _ASSERTE(bi);
+    *Value = bi;
+    return S_OK;
+}
+
+