transactd 1.1.2 → 1.2.0

data/source/global/tdclatl/QueryBase.cpp

@@ -0,0 +1,231 @@
+/*=================================================================
+   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 "QueryBase.h"
+#include "Table.h"
+
+
+
+STDMETHODIMP CQueryBase::Reset(void)
+{
+    m_qb.reset();
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::ClearSeekKeyValues(void)
+{
+    m_qb.clearSeekKeyValues();
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::ClearSelectFields(void)
+{
+    m_qb.clearSelectFields();
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::Select(BSTR Value
+						,BSTR Value1, BSTR Value2, BSTR Value3, BSTR Value4, BSTR Value5
+						,BSTR Value6, BSTR Value7, BSTR Value8, BSTR Value9, BSTR Value10
+						,IQueryBase** retVal)
+{
+    m_qb.addField(Value);
+    if (Value1 != L"")
+		m_qb.addField(Value1);
+    if (Value2 != L"")
+		m_qb.addField(Value2);
+    if (Value3 != L"")
+		m_qb.addField(Value3);
+    if (Value4 != L"")
+		m_qb.addField(Value4);
+    if (Value5 != L"")
+		m_qb.addField(Value5);
+    if (Value6 != L"")
+		m_qb.addField(Value6);
+    if (Value7 != L"")
+		m_qb.addField(Value7);
+    if (Value8 != L"")
+		m_qb.addField(Value8);
+    if (Value9 != L"")
+		m_qb.addField(Value9);
+    if (Value10 != L"")
+		m_qb.addField(Value10);
+	setResult(retVal);
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::Where(BSTR Name, BSTR Logic, VARIANT Value, IQueryBase** retVal)
+{
+    VariantChangeType( &Value, &Value, 0, VT_BSTR );
+	m_qb.addLogic(Name, Logic, Value.bstrVal);
+	setResult(retVal);
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::And(BSTR Name, BSTR Logic, VARIANT Value, IQueryBase** retVal)
+{
+    VariantChangeType( &Value, &Value, 0, VT_BSTR );
+	m_qb.addLogic(L"and", Name, Logic, Value.bstrVal);
+	setResult(retVal);
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::Or(BSTR Name, BSTR Logic, VARIANT Value, IQueryBase** retVal)
+{
+    VariantChangeType( &Value, &Value, 0, VT_BSTR );
+	m_qb.addLogic(L"or", Name, Logic, Value.bstrVal);
+	setResult(retVal);
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::AddInValue(VARIANT Value, VARIANT_BOOL Reset)
+{
+	VariantChangeType( &Value, &Value, 0, VT_BSTR );
+	m_qb.addSeekKeyValue(Value.bstrVal, (Reset==-1));
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::In(VARIANT Value
+			,VARIANT Value1, VARIANT Value2, VARIANT Value3, VARIANT Value4, VARIANT Value5
+			,VARIANT Value6, VARIANT Value7, VARIANT Value8, VARIANT Value9, VARIANT Value10
+			, IQueryBase** retVal)
+{
+	setResult(retVal);
+	VariantChangeType( &Value, &Value, 0, VT_BSTR );
+	m_qb.addSeekKeyValue(Value.bstrVal, false);
+	
+	VariantChangeType( &Value1, &Value1, 0, VT_BSTR );
+	if (Value1.bstrVal == L"") return S_OK;
+	m_qb.addSeekKeyValue(Value1.bstrVal, false);
+	VariantChangeType( &Value2, &Value2, 0, VT_BSTR );
+	if (Value2.bstrVal == L"") return S_OK;
+	m_qb.addSeekKeyValue(Value2.bstrVal, false);
+	VariantChangeType( &Value3, &Value3, 0, VT_BSTR );
+	if (Value3.bstrVal == L"") return S_OK;
+	m_qb.addSeekKeyValue(Value3.bstrVal, false);
+	VariantChangeType( &Value4, &Value4, 0, VT_BSTR );
+	if (Value4.bstrVal == L"") return S_OK;
+	m_qb.addSeekKeyValue(Value4.bstrVal, false);
+	VariantChangeType( &Value5, &Value5, 0, VT_BSTR );
+	if (Value5.bstrVal == L"") return S_OK;
+	m_qb.addSeekKeyValue(Value5.bstrVal, false);
+	VariantChangeType( &Value6, &Value6, 0, VT_BSTR );
+	if (Value6.bstrVal == L"") return S_OK;
+	m_qb.addSeekKeyValue(Value6.bstrVal, false);
+	VariantChangeType( &Value7, &Value7, 0, VT_BSTR );
+	if (Value7.bstrVal == L"") return S_OK;
+	m_qb.addSeekKeyValue(Value7.bstrVal, false);
+	VariantChangeType( &Value8, &Value8, 0, VT_BSTR );
+	if (Value8.bstrVal == L"") return S_OK;
+	m_qb.addSeekKeyValue(Value8.bstrVal, false);
+	VariantChangeType( &Value9, &Value9, 0, VT_BSTR );
+	if (Value9.bstrVal == L"") return S_OK;
+	m_qb.addSeekKeyValue(Value9.bstrVal, false);
+	VariantChangeType( &Value10, &Value10, 0, VT_BSTR );
+	if (Value10.bstrVal == L"") return S_OK;
+	m_qb.addSeekKeyValue(Value10.bstrVal, false);
+	return S_OK; 
+}
+
+void CQueryBase::setResult(IQueryBase** retVal)
+{
+	this->QueryInterface(IID_IQueryBase, (void**)retVal);
+}
+
+STDMETHODIMP CQueryBase::QueryString(BSTR Value, IQueryBase** retVal)
+{
+    m_qb.queryString(Value);
+	setResult(retVal);
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::Reject(long Value, IQueryBase** retVal)
+{
+    m_qb.reject(Value);
+	setResult(retVal);
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::Limit(long Value, IQueryBase** retVal)
+{
+    m_qb.limit(Value);
+	setResult(retVal);
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::Direction( eFindType FindType, IQueryBase** retVal)
+{
+    m_qb.direction((bzs::db::protocol::tdap::client::table::eFindType)FindType);
+	setResult(retVal);
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::All(IQueryBase** retVal)
+{
+    m_qb.all();
+	setResult(retVal);
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::ToString(BSTR* retVal)
+{
+  
+	CComBSTR ret;
+    ret = m_qb.toString();
+    *retVal = ret.Copy();
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::GetDirection(eFindType* retVal)
+{
+    *retVal = (eFindType)m_qb.getDirection();
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::GetReject(long* retVal)
+{
+    *retVal = m_qb.getReject();
+    return S_OK;
+}
+
+STDMETHODIMP CQueryBase::GetLimit(long* retVal)
+{
+    *retVal = m_qb.getLimit();
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::IsAll(VARIANT_BOOL* retVal)
+{
+    *retVal = m_qb.isAll();
+	return S_OK;
+}
+
+
+STDMETHODIMP CQueryBase::Optimize(VARIANT_BOOL v, IQueryBase** retVal)
+{
+	m_qb.optimize(v==-1);
+	setResult(retVal);
+	return S_OK;
+}
+
+STDMETHODIMP CQueryBase::IsOptimize(VARIANT_BOOL* retVal)
+{
+	*retVal = m_qb.isOptimize();
+	return S_OK;
+}

data/source/global/tdclatl/QueryBase.h

@@ -0,0 +1,96 @@
+#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/table.h>
+
+using namespace ATL;
+
+class ATL_NO_VTABLE CQueryBase :
+	public CComObjectRootEx<CComSingleThreadModel>,
+	public CComCoClass<CQueryBase, &CLSID_QueryBase>,
+	public IDispatchImpl<IQueryBase, &IID_IQueryBase, &LIBID_transactd, /*wMajor =*/ 1, /*wMinor =*/ 0>
+{
+	bzs::db::protocol::tdap::client::queryBase m_qb;
+	void setResult(IQueryBase** retVal);
+
+public:
+	CQueryBase()
+	{
+	}
+
+	DECLARE_REGISTRY_RESOURCEID(IDR_QUERYBASE)
+
+
+	BEGIN_COM_MAP(CQueryBase)
+		COM_INTERFACE_ENTRY(IQueryBase)
+		COM_INTERFACE_ENTRY(IDispatch)
+	END_COM_MAP()
+
+
+
+	DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+	HRESULT FinalConstruct()
+	{
+		return S_OK;
+	}
+
+	void FinalRelease()
+	{
+	}
+
+public:
+	bzs::db::protocol::tdap::client::queryBase& query(){return m_qb;};	
+  STDMETHOD(Reset)(void);
+  STDMETHOD(ClearSeekKeyValues)(void);
+  STDMETHOD(ClearSelectFields)(void);
+  STDMETHOD(Select)(BSTR Value
+			,BSTR Value1, BSTR Value2, BSTR Value3, BSTR Value4, BSTR Value5
+			,BSTR Value6, BSTR Value7, BSTR Value8, BSTR Value9, BSTR Value10
+			, IQueryBase** retVal);
+
+  STDMETHOD(Where)(BSTR Name, BSTR Logic, VARIANT Value, IQueryBase** retVal);
+  STDMETHOD(And)(BSTR Name, BSTR Logic, VARIANT Value, IQueryBase** retVal);
+  STDMETHOD(Or)(BSTR Name, BSTR Logic, VARIANT Value, IQueryBase** retVal);
+  STDMETHOD(AddInValue)(VARIANT Value, VARIANT_BOOL Reset);
+  STDMETHOD(In)(VARIANT Value
+			,VARIANT Value1, VARIANT Value2, VARIANT Value3, VARIANT Value4, VARIANT Value5
+			,VARIANT Value6, VARIANT Value7, VARIANT Value8, VARIANT Value9, VARIANT Value10
+			, IQueryBase** retVal);
+  STDMETHOD(QueryString)(BSTR Value, IQueryBase** retVal);
+  STDMETHOD(Reject)(long Value, IQueryBase** retVal);
+  STDMETHOD(Limit)(long Value, IQueryBase** retVal);
+  STDMETHOD(Direction)( eFindType FindType, IQueryBase** retVal);
+  STDMETHOD(All)(IQueryBase** retVal);
+  STDMETHOD(ToString)(BSTR* retVal);
+  STDMETHOD(GetDirection)(eFindType* retVal);
+  STDMETHOD(GetReject)(long* retVal);
+  STDMETHOD(GetLimit)(long* retVal);
+  STDMETHOD(IsAll)(VARIANT_BOOL* retVal);
+  STDMETHOD(Optimize)(VARIANT_BOOL Value, IQueryBase** retVal);
+  STDMETHOD(IsOptimize)(VARIANT_BOOL* retVal);
+
+ 
+
+};
+
+OBJECT_ENTRY_AUTO(__uuidof(QueryBase), CQueryBase)

data/source/global/tdclatl/Table.cpp

@@ -22,6 +22,7 @@
 #include "DbDef.h"
 #include "TableDef.h"
 #include "Field.h"
+#include "QueryBase.h"
 
 using namespace bzs::db::protocol::tdap;
 
@@ -598,3 +599,26 @@ STDMETHODIMP CTableTd::SmartUpdate(void)
     m_tb->smartUpdate();
     return S_OK;
 }
+
+STDMETHODIMP CTableTd::KeyValueDescription(BSTR* Value)
+{
+	wchar_t tmp[8192];
+	m_tb->keyValueDescription(tmp, 8192);
+	*Value = tmp;
+	return S_OK;
+}
+
+STDMETHODIMP CTableTd::SetQuery(IQueryBase* Value)
+{
+	if (Value)
+	{
+		CQueryBase* p = dynamic_cast<CQueryBase*>(Value);
+		if (p)
+		{	
+			m_tb->setQuery(&p->query());
+			return S_OK;
+		}
+	}
+	return S_FALSE;
+	
+}

data/source/global/tdclatl/Table.h

@@ -109,7 +109,6 @@ public:
     STDMETHOD(get_FilterRejectCount)(long* Value);
     STDMETHOD(put_FilterGetCount)(long Value);
     STDMETHOD(put_FilterRejectCount)(long Value);
-
     STDMETHOD(Field)(VARIANT Index, IField** Value);
     STDMETHOD(get_IsOpen)(VARIANT_BOOL* Value);
     STDMETHOD(get_CanDelete)(VARIANT_BOOL* Value);
@@ -140,5 +139,7 @@ public:
     STDMETHOD(get_MyDateTimeValueByBtrv)(VARIANT_BOOL* Value);
     STDMETHOD(get_ValiableFormatType)(VARIANT_BOOL* Value);
     STDMETHOD(SmartUpdate)(void);
+	STDMETHOD(KeyValueDescription)(BSTR* Value);
+	STDMETHOD(SetQuery)(IQueryBase* Value);
 
 };

data/source/global/tdclatl/tdclatl.idl

@@ -31,7 +31,7 @@ interface IFlags;
 interface IKeySegment;
 interface IField;
 interface ITdVersion;
-
+interface IQueryBase;
 
 typedef
 [
@@ -636,7 +636,10 @@ interface ITable : IDispatch
   HRESULT _stdcall ValiableFormatType([out, retval] VARIANT_BOOL* Value);
   [id(0x000000F9)]
   HRESULT _stdcall SmartUpdate(void);
-
+  [id(0x000000FA)]
+  HRESULT _stdcall KeyValueDescription([out, retval] BSTR* Value);
+  [id(0x000000FB)]
+  HRESULT _stdcall SetQuery([in] IQueryBase* Value);
 
 };
 [
@@ -919,6 +922,82 @@ interface ITdVersion : IDispatch
 
 };
 
+[
+	object,
+	uuid(828B3682-4B3F-465C-8168-D36BF62ECA8E),
+	dual,
+	nonextensible,
+	pointer_default(unique)
+]
+
+interface IQueryBase : IDispatch
+{
+  [id(0x0000001)]
+  HRESULT _stdcall Reset(void);
+  [id(0x0000002)]
+  HRESULT _stdcall ClearSeekKeyValues(void);
+  [id(0x0000003)]
+  HRESULT _stdcall ClearSelectFields(void);
+  [id(0x0000004)]
+  HRESULT _stdcall Select([in] BSTR Value
+			,[in, defaultvalue("")] BSTR Value1
+			,[in, defaultvalue("")] BSTR Value2
+			,[in, defaultvalue("")] BSTR Value3
+			,[in, defaultvalue("")] BSTR Value4
+			,[in, defaultvalue("")] BSTR Value5
+			,[in, defaultvalue("")] BSTR Value6
+			,[in, defaultvalue("")] BSTR Value7
+			,[in, defaultvalue("")] BSTR Value8
+			,[in, defaultvalue("")] BSTR Value9
+			,[in, defaultvalue("")] BSTR Value10
+			, [out, retval] IQueryBase** retVal);
+  [id(0x0000005)]
+  HRESULT _stdcall Where([in] BSTR Name, [in] BSTR Logic, [in] VARIANT Value, [out, retval] IQueryBase** retVal);
+  [id(0x0000006)]
+  HRESULT _stdcall And([in] BSTR Name, [in] BSTR Logic, [in] VARIANT Value, [out, retval] IQueryBase** retVal);
+  [id(0x0000007)]
+  HRESULT _stdcall Or([in] BSTR Name, [in] BSTR Logic, [in] VARIANT Value, [out, retval] IQueryBase** retVal);
+  [id(0x0000008)]
+  HRESULT _stdcall AddInValue([in] VARIANT Value, [in] VARIANT_BOOL Reset);
+  [id(0x0000009)]
+  HRESULT _stdcall In([in] VARIANT Value
+			,[in, defaultvalue("")] VARIANT Value1
+			,[in, defaultvalue("")] VARIANT Value2
+			,[in, defaultvalue("")] VARIANT Value3
+			,[in, defaultvalue("")] VARIANT Value4
+			,[in, defaultvalue("")] VARIANT Value5
+			,[in, defaultvalue("")] VARIANT Value6
+			,[in, defaultvalue("")] VARIANT Value7
+			,[in, defaultvalue("")] VARIANT Value8
+			,[in, defaultvalue("")] VARIANT Value9
+			,[in, defaultvalue("")] VARIANT Value10
+			, [out, retval] IQueryBase** retVal);
+  [id(0x000000A)]
+  HRESULT _stdcall QueryString([in] BSTR Value, [out, retval] IQueryBase** retVal);
+  [id(0x000000B)]
+  HRESULT _stdcall Reject([in, defaultvalue(1)] long Value, [out, retval] IQueryBase** retVal);
+  [id(0x000000C)]
+  HRESULT _stdcall Limit([in, defaultvalue(0)] long Value, [out, retval] IQueryBase** retVal);
+  [id(0x000000D)]
+  HRESULT _stdcall Direction([in] eFindType FindType, [out, retval] IQueryBase** retVal);
+  [id(0x000000E)]
+  HRESULT _stdcall All([out, retval] IQueryBase** retVal);
+  [id(0x000000F)]
+  HRESULT _stdcall ToString([out, retval] BSTR* retVal);
+  [id(0x0000010)]
+  HRESULT _stdcall GetDirection([out, retval] eFindType* retVal);
+  [id(0x0000011)]
+  HRESULT _stdcall GetReject([out, retval] long* retVal);
+  [id(0x0000012)]
+  HRESULT _stdcall GetLimit([out, retval] long* retVal);
+  [id(0x0000013)]
+  HRESULT _stdcall IsAll([out, retval] VARIANT_BOOL* retVal);
+  [id(0x0000014)]
+  HRESULT _stdcall Optimize([in] VARIANT_BOOL Value, [out, retval] IQueryBase** retVal);
+  [id(0x0000015)]
+  HRESULT _stdcall IsOptimize([out, retval] VARIANT_BOOL* retVal);
+
+};
 [
 	uuid(3B712514-E2EF-4040-8A3C-BCACB839EB3E),
 	version(1.0),
@@ -1030,6 +1109,13 @@ library transactd
   
  
 
+	[
+		uuid(CA076B05-541B-48EF-AC55-33323FB052F3)		
+	]
+	coclass QueryBase
+	{
+		[default] interface IQueryBase;
+	};
 };
 
 import "shobjidl.idl";

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - BizStation Corp.
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - CMakeLists.txt
 - build/tdclrb/bldgem/extconf.rb
-- bin/common/tdclc_32_1_1.dll
-- bin/common/tdclc_64_1_1.dll
+- bin/common/tdclc_32_1_2.dll
+- bin/common/tdclc_64_1_2.dll
 - source/bzs/db/blobBuffer.h
 - source/bzs/db/blobStructs.h
 - source/bzs/db/engine/mysql/bookmark.h
@@ -80,6 +80,7 @@ files:
 - source/bzs/db/protocol/tdap/client/trdboostapi.h
 - source/bzs/db/protocol/tdap/client/trdboostapiInternal.h
 - source/bzs/db/protocol/tdap/client/trdclcppautolink.h
+- source/bzs/db/protocol/tdap/client/trdormapi.h
 - source/bzs/db/protocol/tdap/client/trnsctcl.def
 - source/bzs/db/protocol/tdap/myDateTime.cpp
 - source/bzs/db/protocol/tdap/mysql/characterset.cpp
@@ -127,6 +128,7 @@ files:
 - source/bzs/example/updateRecords_c.cpp
 - source/bzs/example/update_with_transaction.cpp
 - source/bzs/example/update_with_transaction_c.cpp
+- source/bzs/example/useORM.cpp
 - source/bzs/netsvc/client/tcpClient.cpp
 - source/bzs/netsvc/client/tcpClient.h
 - source/bzs/netsvc/server/IAppModule.h
@@ -151,13 +153,19 @@ files:
 - source/bzs/rtl/strtrim.cpp
 - source/bzs/rtl/strtrim.h
 - source/bzs/test/tdclatl/bench_tdclatl.js
+- source/bzs/test/tdclphp/transactd_blob_Test.php
+- source/bzs/test/tdclphp/transactd_datetime_Test.php
+- source/bzs/test/tdclphp/transactd_kanjischema_Test.php
+- source/bzs/test/tdclphp/transactd_Test.php
 - source/bzs/test/tdclrb/bench_tdclcpp.rb
 - source/bzs/test/tdclrb/prepare.rb
+- source/bzs/test/tdclrb/transactd_blob_spec.rb
 - source/bzs/test/tdclrb/transactd_datetime_spec.rb
 - source/bzs/test/tdclrb/transactd_kanjischema_spec.rb
 - source/bzs/test/tdclrb/transactd_spec.rb
 - source/bzs/test/transactdBench/transactdBench.cpp
 - source/bzs/test/transactdBench/transactdBench2.cpp
+- source/bzs/test/trdclengn/test_blob.cpp
 - source/bzs/test/trdclengn/test_trdclengn.cpp
 - source/global/tdclatl/Database.cpp
 - source/global/tdclatl/Database.h
@@ -175,6 +183,8 @@ files:
 - source/global/tdclatl/KeyDef.h
 - source/global/tdclatl/KeySegment.cpp
 - source/global/tdclatl/keySegment.h
+- source/global/tdclatl/QueryBase.cpp
+- source/global/tdclatl/QueryBase.h
 - source/global/tdclatl/resource.h
 - source/global/tdclatl/stdafx.cpp
 - source/global/tdclatl/stdafx.h
@@ -205,6 +215,9 @@ files:
 - build/common/transactd_cl_output.cmake
 - build/common/transactd_common.cmake
 - build/common/transactd_required.cmake
+- build/swig/php/generate.cmake.in
+- build/swig/php/generate.cmd.in
+- build/swig/php/php.swg
 - build/swig/ruby/generate.cmake.in
 - build/swig/ruby/generate.cmd.in
 - build/swig/ruby/ruby.swg