transactd 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e02c507a10f36f6c37d43e624c1bafc4416e6b67
-  data.tar.gz: 337df3d8b1c58be04d5ee5f01ba317e08963fdd8
+  metadata.gz: 0c0edf9273f89a9100b3fbc8223ebd9dba7554ad
+  data.tar.gz: 6a3193ada9a34d44721df40a26e6de4840a4115a
 SHA512:
-  metadata.gz: 4537e3aae536a5f3b5b15109614f488280ec1d1cf589f717f7de285d802320166c18f366e21d32e4cb6ac70f388cf11d27593dc6ee3058187a54c7b0e3b70237
-  data.tar.gz: 266b14eacd03941c7d270bf6659abde9fef56aea0a1c3fa31931e2c9443c22079c0d1e6924a2b078c1464d73801a5a791eea0f051ebd487a73e81b59d81a929e
+  metadata.gz: d7a69ed53774639ed5354020ab48475980dfab2083562ffdda389591e2317321dc6c01104a960cc42c0e7dd32be66f292667ea9a198c0a56da36d6d93250c00c
+  data.tar.gz: a09238a3672242d9faafd6a5034c9d8f581ad8ca08c0824e345e88392fcd1490e6eeb1382f806a94ec156ccd2f61331dedb9aac96542ca0d0f72edb13a7edc17

data/build/swig/ruby/tdclrb_wrap.cpp

@@ -22948,6 +22948,92 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Recordset_join(int argc, VALUE *argv, VALUE self) {
+  tdap::client::recordset *arg1 = 0 ;
+  tdap::client::recordset *arg2 = 0 ;
+  tdap::client::recordsetQuery *arg3 = 0 ;
+  void *argp2 = 0 ;
+  void *argp3 = 0 ;
+  int res2 = 0 ;
+  int res3 = 0 ;
+  
+  if (!check_param_count(argc, 2, 2)) return Qnil;
+  arg1 = selfPtr(self, arg1);
+
+  res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_bzs__recordset,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "tdap::client::recordset &","join", 2, argv[0] )); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "tdap::client::recordset &","join", 1, argv[0])); 
+  }
+
+  res3 = SWIG_ConvertPtr(argv[1], &argp3, SWIGTYPE_p_bzs__recordsetQuery,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "tdap::client::recordsetQuery &","join", 3, argv[1] )); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "tdap::client::recordsetQuery &","join", 2, argv[1])); 
+  }
+  
+  arg2 = reinterpret_cast< tdap::client::recordset * >(argp2);
+  arg3 = reinterpret_cast< tdap::client::recordsetQuery * >(argp3);
+  {
+    try {
+      arg1->join(*arg2, *arg3);
+    } 
+    CATCH_BZS_AND_STD()
+  }
+  return self;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_Recordset_outerJoin(int argc, VALUE *argv, VALUE self) {
+  tdap::client::recordset *arg1 = 0 ;
+  tdap::client::recordset *arg2 = 0 ;
+  tdap::client::recordsetQuery *arg3 = 0 ;
+  void *argp2 = 0 ;
+  void *argp3 = 0 ;
+  int res2 = 0 ;
+  int res3 = 0 ;
+  
+  if (!check_param_count(argc, 2, 2)) return Qnil;
+  arg1 = selfPtr(self, arg1);
+
+  res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_bzs__recordset,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "tdap::client::recordset &","outerJoin", 2, argv[0] )); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "tdap::client::recordset &","outerJoin", 1, argv[0])); 
+  }
+
+  res3 = SWIG_ConvertPtr(argv[1], &argp3, SWIGTYPE_p_bzs__recordsetQuery,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "tdap::client::recordsetQuery &","outerJoin", 3, argv[1] )); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "tdap::client::recordsetQuery &","outerJoin", 2, argv[1])); 
+  }
+  
+  arg2 = reinterpret_cast< tdap::client::recordset * >(argp2);
+  arg3 = reinterpret_cast< tdap::client::recordsetQuery * >(argp3);
+  {
+    try {
+      arg1->outerJoin(*arg2, *arg3);
+    } 
+    CATCH_BZS_AND_STD()
+  }
+  return self;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_Recordset_matchBy(int argc, VALUE *argv, VALUE self) {
   tdap::client::recordset *arg1 = (tdap::client::recordset *) 0 ;
@@ -23075,7 +23161,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_Recordset_appendField(int argc, VALUE *argv, VALUE self) {
   tdap::client::recordset *arg1 = (tdap::client::recordset *) 0 ;
+  tdap::fielddef *fd = 0 ;
   _TCHAR *arg2 = (_TCHAR *) 0 ;
+  void *argp2 ;
   int arg3 ;
   short arg4 ;
   int res2 ;
@@ -23086,27 +23174,44 @@ _wrap_Recordset_appendField(int argc, VALUE *argv, VALUE self) {
   short val4 ;
   int ecode4 = 0 ;
   
-  if (!check_param_count(argc, 3, 3)) return Qnil;
-
+  if (!check_param_count(argc, 1, 3)) return Qnil;
   arg1 = selfPtr(self, arg1);
-  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "_TCHAR const *","appendField", 2, argv[0] ));
+
+  if (TYPE(argv[0]) == T_STRING)
+  {
+    res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "_TCHAR const *","appendField", 2, argv[0] ));
+    }
+    arg2 = reinterpret_cast< _TCHAR * >(buf2);
+    ecode3 = SWIG_AsVal_int(argv[1], &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "int","appendField", 3, argv[1] ));
+    } 
+    arg3 = static_cast< int >(val3);
+    ecode4 = SWIG_AsVal_short(argv[2], &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "short","appendField", 4, argv[2] ));
+    } 
+    arg4 = static_cast< short >(val4);
+  }
+  else
+  {
+    res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_bzs__fielddef,  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "tdap::fielddef*","appendField", 2, argv[0] )); 
+    }
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "tdap::fielddef*","appendField", 2, argv[0])); 
+    }
+    fd = reinterpret_cast< tdap::fielddef * >(argp2);
   }
-  arg2 = reinterpret_cast< _TCHAR * >(buf2);
-  ecode3 = SWIG_AsVal_int(argv[1], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "int","appendField", 3, argv[1] ));
-  } 
-  arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_short(argv[2], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "short","appendField", 4, argv[2] ));
-  } 
-  arg4 = static_cast< short >(val4);
   {
     try {
-      (arg1)->appendField((_TCHAR const *)arg2,arg3,arg4);
+      if (fd)
+        (arg1)->appendField(*fd);
+      else
+        (arg1)->appendField((_TCHAR const *)arg2,arg3,arg4);
       clearFieldsCache(self);
     } 
     CATCH_BZS_AND_STD()
@@ -27765,6 +27870,8 @@ SWIGEXPORT void Init_transactd(void) {
   rb_define_method(SwigClassRecordset.klass, "top", VALUEFUNC(_wrap_Recordset_top), -1);
   rb_define_method(SwigClassRecordset.klass, "erase", VALUEFUNC(_wrap_Recordset_erase), -1);
   rb_define_method(SwigClassRecordset.klass, "removeField", VALUEFUNC(_wrap_Recordset_removeField), -1);
+  rb_define_method(SwigClassRecordset.klass, "join", VALUEFUNC(_wrap_Recordset_join), -1);
+  rb_define_method(SwigClassRecordset.klass, "outerJoin", VALUEFUNC(_wrap_Recordset_outerJoin), -1);
   rb_define_method(SwigClassRecordset.klass, "matchBy", VALUEFUNC(_wrap_Recordset_matchBy), -1);
   rb_define_method(SwigClassRecordset.klass, "groupBy", VALUEFUNC(_wrap_Recordset_groupBy), -1);
   rb_define_method(SwigClassRecordset.klass, "orderBy", VALUEFUNC(_wrap_Recordset_orderBy), -1);
@@ -27782,6 +27889,7 @@ SWIGEXPORT void Init_transactd(void) {
   rb_define_alias(SwigClassRecordset.klass, "clear_records", "clearRecords");
   rb_define_alias(SwigClassRecordset.klass, "field_defs", "fieldDefs");
   rb_define_alias(SwigClassRecordset.klass, "remove_field", "removeField");
+  rb_define_alias(SwigClassRecordset.klass, "outer_join", "outerJoin");
   rb_define_alias(SwigClassRecordset.klass, "match_by", "matchBy");
   rb_define_alias(SwigClassRecordset.klass, "group_by", "groupBy");
   rb_define_alias(SwigClassRecordset.klass, "order_by", "orderBy");

data/build/tdclc/tdclc.cbproj

@@ -62,7 +62,7 @@
         <VerInfo_Locale>1041</VerInfo_Locale>
         <BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
         <BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
-        <DllSuffix>_3_6</DllSuffix>
+        <DllSuffix>_3_7</DllSuffix>
         <DynamicRTL>false</DynamicRTL>
         <BPILibOutputDir>..\..\lib</BPILibOutputDir>
         <BCC_PCHUsage>None</BCC_PCHUsage>

data/build/tdclc/tdclc.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,1,245
- PRODUCTVERSION 3,6,1,245
+ FILEVERSION 3,7,0,248
+ PRODUCTVERSION 3,7,0,248
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C client"
-            VALUE "FileVersion", "3.6.1.245"
+            VALUE "FileVersion", "3.7.0.248"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.6.1.245"
+            VALUE "ProductVersion", "3.7.0.248"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,1,245
- PRODUCTVERSION 3,6,1,245
+ FILEVERSION 3,7,0,248
+ PRODUCTVERSION 3,7,0,248
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C++ client"
-            VALUE "FileVersion", "3.6.1.245"
+            VALUE "FileVersion", "3.7.0.248"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.6.1.245"
+            VALUE "ProductVersion", "3.7.0.248"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp_bc.cbproj

@@ -153,7 +153,7 @@
         <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
         <BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
         <TD_VER_MAJOR>3</TD_VER_MAJOR>
-        <TD_VER_MINOR>6</TD_VER_MINOR>
+        <TD_VER_MINOR>7</TD_VER_MINOR>
         <DllSuffix>$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
         <TD_CPU>32</TD_CPU>
     </PropertyGroup>

data/build/tdclrb/tdclrb.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,1,245
- PRODUCTVERSION 3,6,1,245
+ FILEVERSION 3,7,0,248
+ PRODUCTVERSION 3,7,0,248
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd Ruby client"
-            VALUE "FileVersion", "3.6.1.245"
+            VALUE "FileVersion", "3.7.0.248"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.6.1.245"
+            VALUE "ProductVersion", "3.7.0.248"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/source/bzs/db/protocol/tdap/client/field.cpp

@@ -580,6 +580,17 @@ void fielddefs::addAllFields(const tabledef* def)
     blobResize(blobCount);
 }
 
+void fielddefs::append(const fielddefs* fds)
+{
+    size_t n = fds->size();
+    m_imple->fields.reserve(n + size());
+    for (size_t i = 0; i < n; ++i)
+    {
+        const fielddef* fd = &(*fds)[(int)i];
+        push_back(fd);
+    }
+}
+
 void fielddefs::addSelectedFields(const table* tb)
 {
     int n = tb->getCurProcFieldCount();
@@ -2246,6 +2257,19 @@ int field::nullComp(const field& r, char log) const
     return 2;
 }
 
+int field::nullCompMatch(const field& r, char log) const
+{
+    if ((log == eIsNull) || (log == eIsNotNull))
+        return nullComp(log);
+
+    bool lnull = isNull();
+    if (lnull) return -1;
+
+    bool rnull = r.isNull();
+    if (lnull) return 1;
+    return 2;
+}
+
 int field::comp(const field& r, char log) const
 {
     int ret = nullComp(r, log & 0xf);

data/source/bzs/db/protocol/tdap/client/field.h

@@ -110,6 +110,7 @@ public:
     size_t size() const;
     void addAllFields(const tabledef* def);
     void addSelectedFields(const class table* tb);
+    void append(const fielddefs* fds);
     void release();
     static fielddefs* create();
 };
@@ -152,6 +153,7 @@ class DLLLIB field
     void* nullPtr() const;
     int nullComp(const field& r, char log) const;
     int nullComp(char log) const;
+    int nullCompMatch(const field& r, char log) const;
     bool isCompPartAndMakeValue();
     void offsetBlobPtr(size_t offset);