transactd 2.4.5 → 3.0.0

data/source/bzs/db/engine/mysql/mysqlInternal.h

@@ -248,26 +248,27 @@ inline bool cp_has_update_default_function(Field* fd)
 inline void cp_evaluate_insert_default_function(Field* fd)
 {
 #if (MYSQL_VERSION_ID > 50600)
-    Field* ft = fd;
+	Field* ft = fd;
 #else
-    Field_timestamp* ft = (Field_timestamp*)(fd);
+	Field_timestamp* ft = (Field_timestamp*)(fd);
 #endif
-    if (ft)
-        ft->set_time();
+	if (ft)
+		ft->set_time();
 }
 
 inline void cp_evaluate_update_default_function(Field* fd)
 {
 
 #if (MYSQL_VERSION_ID > 50600)
-    Field* ft = fd;
+	Field* ft = fd;
 #else
-    Field_timestamp* ft = (Field_timestamp*)(fd);
+	Field_timestamp* ft = (Field_timestamp*)(fd);
 #endif
-    if (ft)
-        ft->set_time();
+	if (ft)
+		ft->set_time();
 }
 
+
 inline unsigned char* cp_null_ptr(Field* fd, unsigned char* /*record*/)
 {
     return (unsigned char*)fd->null_ptr;   
@@ -455,6 +456,11 @@ inline bool cp_query_command(THD* thd, char* str)
 	return dispatch_command(thd, &com_data, COM_QUERY);
 }
 
+inline void cp_lex_clear(THD* thd)
+{
+    thd->lex->reset();
+}
+
 
 #else //Not MySQL 5.7
 #define OPEN_TABLE_FLAG_TYPE MYSQL_OPEN_GET_NEW_TABLE
@@ -559,6 +565,11 @@ inline bool cp_query_command(THD* thd, char* str)
 	return dispatch_command(COM_QUERY, thd, str, (uint)strlen(str));
 }
 
+inline void cp_lex_clear(THD* thd)
+{
+    thd->lex->many_values.empty();
+}
+
 #endif
 
 /* find_files is static function in maridb. 
@@ -601,4 +612,17 @@ inline bool cp_query_command(THD* thd, char* str)
     }
 #endif
 
+
+#if (defined(MARIADDB_10_1) && MARIADDB_10_1 > 100108)
+inline void cp_setup_rpl_bitmap(TABLE* table)
+{
+    bitmap_set_all(table->write_set);
+    table->rpl_write_set = table->write_set;
+}
+#else
+
+inline void cp_setup_rpl_bitmap(TABLE* table){};
+
+#endif
+
 #endif // BZS_DB_ENGINE_MYSQL_MYSQLINTERNAL_H

data/source/bzs/db/protocol/tdap/btrDate.cpp

@@ -16,13 +16,12 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
-#include <bzs/env/compiler.h>
-#include <bzs/env/tstring.h>
 #include "btrDate.h"
 #include <bzs/rtl/datetime.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+#include <bzs/env/crosscompile.h>
 
 #ifdef LINUX
 #include <bzs/env/mbcswchrLinux.h>
@@ -209,99 +208,107 @@ const char* dateFormatString(const char*)
 {
     return "%04d/%02d/%02d";
 }
-const wchar_t* dateFormatString(const wchar_t*)
-{
-    return L"%04d/%02d/%02d";
-}
 
 const char* dateFormatString_h(const char*)
 {
     return "%04d-%02d-%02d";
 }
-const wchar_t* dateFormatString_h(const wchar_t*)
-{
-    return L"%04d-%02d-%02d";
-}
 
 const char* timeFormatString(const char*)
 {
     return "%02d:%02d:%02d";
 }
-const wchar_t* timeFormatString(const wchar_t*)
-{
-    return L"%02d:%02d:%02d";
-}
 
-const char* timeFormatString_h(const char*)
+/*const char* timeFormatString_h(const char*)
 {
     return "%02d-%02d-%02d";
-}
-const wchar_t* timeFormatString_h(const wchar_t*)
-{
-    return L"%02d-%02d-%02d";
-}
+}*/
 
 template <class T> size_t _tcslen_(const T* p);
 
+template <class T> int _ttoi_(const T* p);
+
 template <> size_t _tcslen_(const char* p)
 {
     return strlen(p);
 }
-template <> size_t _tcslen_(const wchar_t* p)
-{
-    return wcslen(p);
-}
-
-template <class T> int _ttoi_(const T* p);
 
 template <> int _ttoi_(const char* p)
 {
     return atoi(p);
 }
-template <> int _ttoi_(const wchar_t* p)
-{
-    return _wtoi(p);
-}
 
-template <class T> T* formatDate(T* p, const btrDate& d, bool type_vb);
+template <class T> T* formatDate(T* p, const btrDate& d, bool w3_format);
 
-template <> char* formatDate(char* p, const btrDate& d, bool type_vb)
+template <> char* formatDate(char* p, const btrDate& d, bool w3_format)
 {
-    if (type_vb)
+    if (w3_format)
         sprintf_s(p, 20, dateFormatString_h(p), d.yy, d.mm, d.dd);
     else
         sprintf_s(p, 20, dateFormatString(p), d.yy, d.mm, d.dd);
     return p;
 }
 
-template <> wchar_t* formatDate(wchar_t* p, const btrDate& d, bool type_vb)
+template <class T> T* formatTime(T* p, const btrTime& t/*, bool w3_format*/);
+
+template <> char* formatTime(char* p, const btrTime& t/*, bool w3_format*/)
 {
-    if (type_vb)
-        swprintf_s(p, 20, dateFormatString_h(p), d.yy, d.mm, d.dd);
-    else
-        swprintf_s(p, 20, dateFormatString(p), d.yy, d.mm, d.dd);
+    /*if (w3_format)
+        sprintf_s(p, 20, timeFormatString_h(p), t.hh, t.nn, t.ss);
+    else*/
+        sprintf_s(p, 20, timeFormatString(p), t.hh, t.nn, t.ss);
     return p;
 }
 
-template <class T> T* formatTime(T* p, const btrTime& d, bool type_vb);
+#ifdef _WIN32
+const wchar_t* dateFormatString(const wchar_t*)
+{
+    return L"%04d/%02d/%02d";
+}
 
-template <> char* formatTime(char* p, const btrTime& t, bool type_vb)
+const wchar_t* dateFormatString_h(const wchar_t*)
 {
-    if (type_vb)
-        sprintf_s(p, 20, timeFormatString_h(p), t.hh, t.nn, t.ss);
+    return L"%04d-%02d-%02d";
+}
+
+const wchar_t* timeFormatString(const wchar_t*)
+{
+    return L"%02d:%02d:%02d";
+}
+
+/*const wchar_t* timeFormatString_h(const wchar_t*)
+{
+    return L"%02d-%02d-%02d";
+}*/
+
+template <> size_t _tcslen_(const wchar_t* p)
+{
+    return wcslen(p);
+}
+
+template <> int _ttoi_(const wchar_t* p)
+{
+    return _wtoi(p);
+}
+
+template <> wchar_t* formatDate(wchar_t* p, const btrDate& d, bool w3_format)
+{
+    if (w3_format)
+        swprintf_s(p, 20, dateFormatString_h(p), d.yy, d.mm, d.dd);
     else
-        sprintf_s(p, 20, timeFormatString(p), t.hh, t.nn, t.ss);
+        swprintf_s(p, 20, dateFormatString(p), d.yy, d.mm, d.dd);
     return p;
 }
 
-template <> wchar_t* formatTime(wchar_t* p, const btrTime& t, bool type_vb)
+template <> wchar_t* formatTime(wchar_t* p, const btrTime& t/*, bool w3_format*/)
 {
-    if (type_vb)
+    /*if (w3_format)
         swprintf_s(p, 20, timeFormatString_h(p), t.hh, t.nn, t.ss);
-    else
+    else*/
         swprintf_s(p, 20, timeFormatString(p), t.hh, t.nn, t.ss);
     return p;
 }
+#endif
 
 template <class T> btrDate atobtrd(const T* date)
 {
@@ -318,20 +325,20 @@ template <class T> btrDate atobtrd(const T* date)
     return bt;
 }
 
-template <class T> const T* btrdtoa(const btrDate& d, T* retbuf, bool type_vb)
+template <class T> const T* btrdtoa(const btrDate& d, T* retbuf, bool w3_format)
 {
     T* p = retbuf;
     if (p == NULL)
         p = (T*)databuf();
-    return formatDate(p, d, type_vb);
+    return formatDate(p, d, w3_format);
 }
 
-template <class T> const T* btrttoa(const btrTime& t, T* retbuf, bool type_vb)
+template <class T> const T* btrttoa(const btrTime& t, T* retbuf/*, bool w3_format*/)
 {
     T* p = retbuf;
     if (p == NULL)
         p = (T*)databuf();
-    return formatTime(p, t, type_vb);
+    return formatTime(p, t/*, w3_format*/);
 }
 
 template <class T> btrTime atobtrt(const T* p)
@@ -354,14 +361,29 @@ btrDate atobtrd(const char* p)
     return atobtrd<char>(p);
 }
 
-const char* btrdtoa(const btrDate& d, char* retbuf, bool type_vb)
+const char* btrdtoa(const btrDate& d, char* retbuf, bool w3_format)
+{
+    return btrdtoa<char>(d, retbuf, w3_format);
+}
+
+const char* btrttoa(const btrTime& t, char* retbuf/*, bool w3_format*/)
 {
-    return btrdtoa<char>(d, retbuf, type_vb);
+    return btrttoa<char>(t, retbuf/*, w3_format*/);
 }
 
-const char* btrttoa(const btrTime& t, char* retbuf, bool type_vb)
+const char* btrstoa(const btrDateTime& s, char* retbuf, bool w3_format)
 {
-    return btrttoa<char>(t, retbuf, type_vb);
+    char* p = retbuf;
+    const btrDate& d = s.date;
+    const btrTime& t = s.time;
+    if (p == NULL) p = (char*)databuf();
+    if (w3_format)
+        sprintf_s(p, 21, ("%04d-%02d-%02dT%02d:%02d:%02d"), d.yy, d.mm,
+                    d.dd, t.hh, t.nn, t.ss);
+    else
+        sprintf_s(p, 21, ("%04d/%02d/%02d %02d:%02d:%02d"), d.yy, d.mm,
+                    d.dd, t.hh, t.nn, t.ss);
+    return p;
 }
 
 btrTime atobtrt(const char* p)
@@ -370,14 +392,29 @@ btrTime atobtrt(const char* p)
 }
 
 #ifdef _WIN32
-const wchar_t* btrdtoa(const btrDate& d, wchar_t* retbuf, bool type_vb)
+const wchar_t* btrdtoa(const btrDate& d, wchar_t* retbuf, bool w3_format)
 {
-    return btrdtoa<wchar_t>(d, retbuf, type_vb);
+    return btrdtoa<wchar_t>(d, retbuf, w3_format);
 }
 
-const wchar_t* btrttoa(const btrTime& t, wchar_t* retbuf, bool type_vb)
+const wchar_t* btrttoa(const btrTime& t, wchar_t* retbuf/*, bool w3_format*/)
 {
-    return btrttoa<wchar_t>(t, retbuf, type_vb);
+    return btrttoa<wchar_t>(t, retbuf/*, w3_format*/);
+}
+
+const wchar_t* btrstoa(const btrDateTime& s, wchar_t* retbuf, bool w3_format)
+{
+    wchar_t* p = retbuf;
+    const btrDate& d = s.date;
+    const btrTime& t = s.time;
+    if (p == NULL) p = (wchar_t*)databuf();
+    if (w3_format)
+        swprintf_s(p, 21, L"%04d-%02d-%02dT%02d:%02d:%02d", d.yy, d.mm,
+                    d.dd, t.hh, t.nn, t.ss);
+    else
+        swprintf_s(p, 21, L"%04d/%02d/%02d %02d:%02d:%02d", d.yy, d.mm,
+                    d.dd, t.hh, t.nn, t.ss);
+    return p;
 }
 
 btrDate atobtrd(const wchar_t* p)
@@ -392,35 +429,33 @@ btrTime atobtrt(const wchar_t* p)
 
 #endif
 
-const _TCHAR* btrstoa(const btrDateTime& s, _TCHAR* retbuf, bool type_vb)
+btrDateTime atobtrs(const char* p)
 {
-    _TCHAR* p = retbuf;
-    const btrDate& d = s.date;
-    const btrTime& t = s.time;
-    if (p == NULL)
-        p = databuf();
-    ;
-    if (type_vb)
-        _stprintf_s(p, 21, _T("%04d-%02d-%02dT%02d:%02d:%02d"), d.yy, d.mm,
-                    d.dd, t.hh, t.nn, t.ss);
-    else
-        _stprintf_s(p, 21, _T("%04d/%02d/%02d %02d:%02d:%02d"), d.yy, d.mm,
-                    d.dd, t.hh, t.nn, t.ss);
-    return p;
+    btrDateTime s;
+    s.i64 = 0;
+    s.date = atobtrd(p);
+    const char* tmp = strstr(p, "T");
+    if (tmp)
+        s.time = atobtrt(tmp + 1);
+    else if ((tmp = strstr(p, " ")) != NULL)
+        s.time = atobtrt(tmp + 1);
+    return s;
 }
 
-btrDateTime atobtrs(const _TCHAR* p)
+#ifdef _WIN32
+btrDateTime atobtrs(const wchar_t* p)
 {
     btrDateTime s;
     s.i64 = 0;
     s.date = atobtrd(p);
-    const _TCHAR* tmp = _tcsstr(p, _T("T"));
+    const wchar_t* tmp = wcsstr(p, L"T");
     if (tmp)
         s.time = atobtrt(tmp + 1);
-    else if ((tmp = _tcsstr(p, _T(" "))) != NULL)
+    else if ((tmp = wcsstr(p, L" ")) != NULL)
         s.time = atobtrt(tmp + 1);
     return s;
 }
+#endif
 
 int getNowDate()
 {

data/source/bzs/db/protocol/tdap/btrDate.h

@@ -18,9 +18,10 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.
  ================================================================= */
-
+#include <tchar.h>
+#include <cstddef>
 #include <bzs/env/compiler.h>
-#include <bzs/env/crosscompile.h>
+
 
 namespace bzs
 {
@@ -151,58 +152,82 @@ public:
 PACKAGE btrDate atobtrd(const char* date);
 
 PACKAGE const char* btrdtoa(const btrDate& d, char* retbuf,
-                            bool type_vb = false);
+                            bool w3_format = false);
 
-PACKAGE const char* btrttoa(const btrTime& t, char* retbuf,
-                            bool type_vb = false);
+PACKAGE const char* btrttoa(const btrTime& t, char* retbuf/*,
+                            bool w3_format = false*/);
 
 PACKAGE btrTime atobtrt(const char* p);
 
-inline const char* btrdtoa(int date, char* retbuf, bool type_vb = false)
+PACKAGE btrDateTime atobtrs(const char* p);
+
+PACKAGE const char* btrstoa(const btrDateTime& d, char* retbuf,
+                              bool w3_format = false);
+
+inline const char* btrdtoa(int date, char* retbuf, bool w3_format = false)
 {
     btrDate d;
     d.i = date;
-    return btrdtoa(d, retbuf, type_vb);
+    return btrdtoa(d, retbuf, w3_format);
 }
 
-inline const char* btrttoa(int time, char* retbuf, bool type_vb = false)
+inline const char* btrttoa(int time, char* retbuf/*, bool w3_format = false*/)
 {
     btrTime t;
     t.i = time;
-    return btrttoa(t, retbuf, type_vb);
+    return btrttoa(t, retbuf/*, w3_format*/);
+}
+
+inline const char* btrstoa(__int64 datetime, char* retbuf, bool w3_format = false)
+{
+    btrDateTime t;
+    t.i64 = datetime;
+    return btrstoa(t, retbuf, w3_format);
 }
 
+#ifndef SWIG
 #ifdef _WIN32
 PACKAGE btrDate atobtrd(const wchar_t* date);
 
 PACKAGE const wchar_t* btrdtoa(const btrDate& d, wchar_t* retbuf,
-                               bool type_vb = false);
+                               bool w3_format = false);
 
-PACKAGE const wchar_t* btrttoa(const btrTime& t, wchar_t* retbuf,
-                               bool type_vb = false);
+PACKAGE const wchar_t* btrttoa(const btrTime& t, wchar_t* retbuf/*,
+                               bool w3_format = false*/);
 
 PACKAGE btrTime atobtrt(const wchar_t* p);
 
-inline const wchar_t* btrdtoa(int date, wchar_t* retbuf, bool type_vb = false)
+PACKAGE btrDateTime atobtrs(const wchar_t* p);
+
+PACKAGE const wchar_t* btrstoa(const btrDateTime& d, wchar_t* retbuf,
+                              bool w3_format = false);
+
+inline const wchar_t* btrdtoa(int date, wchar_t* retbuf, bool w3_format = false)
 {
     btrDate d;
     d.i = date;
-    return btrdtoa(d, retbuf, type_vb);
+    return btrdtoa(d, retbuf, w3_format);
 }
 
-inline const wchar_t* btrttoa(int time, wchar_t* retbuf, bool type_vb = false)
+inline const wchar_t* btrttoa(int time, wchar_t* retbuf/*, bool w3_format = false*/)
 {
     btrTime t;
     t.i = time;
-    return btrttoa(t, retbuf, type_vb);
+    return btrttoa(t, retbuf/*, w3_format*/);
 }
 
+inline const wchar_t* btrstoa(__int64 datetime, wchar_t* retbuf, bool w3_format = false)
+{
+    btrDateTime t;
+    t.i64 = datetime;
+    return btrstoa(t, retbuf, w3_format);
+}
+
+#endif
 #endif
 
-PACKAGE const _TCHAR* btrstoa(const btrDateTime& d, _TCHAR* retbuf = NULL,
-                              bool type_vb = false);
 
-PACKAGE btrDateTime atobtrs(const _TCHAR* p);
+
 
 inline const _TCHAR* c_str(const btrDate& d)
 {
@@ -214,9 +239,9 @@ inline const _TCHAR* c_str(const btrTime& d)
     return btrttoa(d, (_TCHAR*)NULL);
 }
 
-inline const _TCHAR* c_str(const btrDateTime& d, bool type_vb = false)
+inline const _TCHAR* c_str(const btrDateTime& d, bool w3_format = false)
 {
-    return btrstoa(d, (_TCHAR*)NULL, type_vb);
+    return btrstoa(d, (_TCHAR*)NULL, w3_format);
 }
 
 PACKAGE int getNowDate();

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

@@ -100,7 +100,7 @@ writableRecord& activeTable::getWritableRecord()
     return m_imple->getWritableRecord();
 }
 
-activeTable& activeTable::join(recordset& rs, queryBase& q, const _TCHAR* name1,
+recordset& activeTable::join(recordset& rs, queryBase& q, const _TCHAR* name1,
                                const _TCHAR* name2, const _TCHAR* name3,
                                const _TCHAR* name4, const _TCHAR* name5,
                                const _TCHAR* name6, const _TCHAR* name7,
@@ -108,10 +108,10 @@ activeTable& activeTable::join(recordset& rs, queryBase& q, const _TCHAR* name1,
 {
     m_imple->join(*rs.m_imple, q, name1, name2, name3, name4, name5, name6,
                   name7, name8);
-    return *this;
+    return rs;
 }
 
-activeTable& activeTable::outerJoin(recordset& rs, queryBase& q,
+recordset& activeTable::outerJoin(recordset& rs, queryBase& q,
                                     const _TCHAR* name1, const _TCHAR* name2,
                                     const _TCHAR* name3, const _TCHAR* name4,
                                     const _TCHAR* name5, const _TCHAR* name6,
@@ -119,10 +119,10 @@ activeTable& activeTable::outerJoin(recordset& rs, queryBase& q,
 {
     m_imple->outerJoin(*rs.m_imple, q, name1, name2, name3, name4, name5, name6,
                        name7, name8);
-    return *this;
+    return rs;
 }
 
-activeTable& activeTable::join(recordset& rs, pq_handle& q, const _TCHAR* name1,
+recordset& activeTable::join(recordset& rs, pq_handle& q, const _TCHAR* name1,
                                const _TCHAR* name2, const _TCHAR* name3,
                                const _TCHAR* name4, const _TCHAR* name5,
                                const _TCHAR* name6, const _TCHAR* name7,
@@ -130,10 +130,10 @@ activeTable& activeTable::join(recordset& rs, pq_handle& q, const _TCHAR* name1,
 {
     m_imple->join(*rs.m_imple, q, name1, name2, name3, name4, name5, name6,
                   name7, name8);
-    return *this;
+    return rs;
 }
 
-activeTable& activeTable::outerJoin(recordset& rs, pq_handle& q,
+recordset& activeTable::outerJoin(recordset& rs, pq_handle& q,
                                     const _TCHAR* name1, const _TCHAR* name2,
                                     const _TCHAR* name3, const _TCHAR* name4,
                                     const _TCHAR* name5, const _TCHAR* name6,
@@ -141,7 +141,7 @@ activeTable& activeTable::outerJoin(recordset& rs, pq_handle& q,
 {
     m_imple->outerJoin(*rs.m_imple, q, name1, name2, name3, name4, name5, name6,
                        name7, name8);
-    return *this;
+    return rs;
 }
 
 activeTable& activeTable::index(int v)
@@ -161,39 +161,39 @@ pq_handle activeTable::prepare(queryBase& q, bool serverPrepare)
     return m_imple->prepare(q, serverPrepare);
 }
 
-activeTable& activeTable::readMore(recordset& rs)
+recordset& activeTable::readMore(recordset& rs)
 {
     rs.clear();
     m_imple->readMore(*rs.m_imple);
-    return *this;
+    return rs;
 }
 
-activeTable& activeTable::read(recordset& rs, queryBase& q)
+recordset& activeTable::read(recordset& rs, queryBase& q)
 {
     rs.clear();
     m_imple->read(*rs.m_imple, q);
-    return *this;
+    return rs;
 }
 
-activeTable& activeTable::read(recordset& rs, queryBase& q, validationFunc func)
+recordset& activeTable::read(recordset& rs, queryBase& q, validationFunc func)
 {
     rs.clear();
     m_imple->read(*rs.m_imple, q, func);
-    return *this;
+    return rs;
 }
 
-activeTable& activeTable::read(recordset& rs, pq_handle& q)
+recordset& activeTable::read(recordset& rs, pq_handle& q)
 {
     rs.clear();
     m_imple->read(*rs.m_imple, q);
-    return *this;
+    return rs;
 }
 
-activeTable& activeTable::read(recordset& rs, pq_handle& q, validationFunc func)
+recordset& activeTable::read(recordset& rs, pq_handle& q, validationFunc func)
 {
     rs.clear();
     m_imple->read(*rs.m_imple, q, func);
-    return *this;
+    return rs;
 }
 
 activeTable* activeTable::create(idatabaseManager* mgr, const _TCHAR* tableName)