transactd 3.5.0 → 3.6.0

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

@@ -64,6 +64,7 @@ namespace client {class table;}
 #define P_MASK_PB_BOOKMARK 512  // posblk bookmark writen
 #define P_MASK_PB_ERASE_BM 1024 // posblk bookmark erase command
 #define P_MASK_PB_LOCKED   2048 // posblk row locked
+#define P_MASK_DB_AINC_VAL 4096 // databuf autoinc value, packed_pos 2, size 2 value
 
 
 #define P_MASK_ALL                                                             \
@@ -132,6 +133,16 @@ struct clientID
     ushort_td id;
 };
 
+
+struct autoIncPackInfo
+{
+    unsigned short pos;
+    unsigned short len;
+    __int64 value;
+
+    autoIncPackInfo() : pos(0), len(0), value(0){}
+};
+
 #pragma pack(pop)
 pragma_pop;
 

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

@@ -24,11 +24,32 @@
 #include <bzs/db/protocol/tdap/mysql/characterset.h>
 #ifdef _WIN32
 #include <windows.h>
-#endif
+size_t mbcconv(const char* from, size_t fsize, char* to, size_t tsize, int fromCodePage, int toCodePage)
+{
+    assert(tsize < 511);
+    size_t size = 0;
+    WCHAR ws[512]={NULL};
+    size = MultiByteToWideChar(fromCodePage, (fromCodePage == CP_UTF8) ? 0 : MB_PRECOMPOSED,
+        from, -1, ws, (int)511);
+    to[tsize - 1] = 0x00;
+    size = WideCharToMultiByte(toCodePage, (toCodePage == CP_UTF8) ? 0 : WC_COMPOSITECHECK,
+        ws, -1, to, (int)tsize, NULL, NULL);
+    if (size == 0)
+        size = tsize - (to[tsize - 1] ? 0 : 1);
+    return size;
+}
+#endif //_WIN32
 
 #ifdef LINUX
 #include <bzs/env/mbcswchrLinux.h>
 using namespace bzs::env;
+inline size_t mbcconv(const char* from, size_t fsize, char* to, size_t tsize, int fromCodePage, int toCodePage)
+{
+    if (fromCodePage == CP_UTF8)
+        return bzs::env::u8tombc(from, fsize, to, tsize);
+    else
+        return bzs::env::mbctou8(from, fsize, to, tsize);
+}
 #endif
 #pragma package(smart_init)
 
@@ -181,39 +202,39 @@ void tabledef::setTableName(const wchar_t* s)
 
 const char* fielddef::name() const
 {
-#ifdef LINUX
+/*#ifndef _UNICODE
     if (m_schemaCodePage != CP_UTF8)
     {
         char* p = namebufA();
-        mbctou8(m_name, strlen(m_name), p, MYSQL_FDNAME_SIZE);
+        mbcconv(m_name, strlen(m_name), p, MYSQL_FDNAME_SIZE, m_schemaCodePage, CP_UTF8); //mbctou8(m_name, strlen(m_name), p, MYSQL_FDNAME_SIZE);
         return p;
     }
-#endif
+#endif*/
     return m_name;
 }
 
 const char* fielddef::name(char* buf) const
 {
-#ifdef LINUX
+/*#ifndef _UNICODE
     if (m_schemaCodePage != CP_UTF8)
     {
-        mbctou8(m_name, strlen(m_name), buf, MYSQL_FDNAME_SIZE);
+        mbcconv(m_name, strlen(m_name), buf, MYSQL_FDNAME_SIZE, m_schemaCodePage, CP_UTF8); //mbctou8(m_name, strlen(m_name), buf, MYSQL_FDNAME_SIZE);
         return buf;
     }
-#endif
+#endif*/
     return m_name;
 }
 
 const char* fielddef::chainChar() const
 {
-#ifdef LINUX
+/*#ifndef _UNICODE
     if (m_schemaCodePage != CP_UTF8)
     {
         char* p = namebufA();
-        mbctou8(m_chainChar, strlen(m_chainChar), p, 2);
+        mbcconv(m_chainChar, strlen(m_chainChar), p, 2, m_schemaCodePage, CP_UTF8); //mbctou8(m_chainChar, strlen(m_chainChar), p, 2);
         return p;
     }
-#endif
+#endif*/
     return m_chainChar;
 }
 
@@ -225,79 +246,80 @@ const char* fielddef::defaultValue_str() const
 
 void fielddef::setName(const char* s)
 {
-#ifdef LINUX
+/*#ifndef _UNICODE
     if (m_schemaCodePage != CP_UTF8)
-        u8tombc(s, strlen(s), m_name, FIELD_NAME_SIZE);
+        mbcconv(s, strlen(s), m_name, FIELD_NAME_SIZE, CP_UTF8, m_schemaCodePage); //u8tombc(s, strlen(s), m_name, FIELD_NAME_SIZE);
     else
-#endif
+#endif*/
         strncpy_s(m_name, FIELD_NAME_SIZE, s, sizeof(m_name) - 1);
 }
 
 void fielddef::setChainChar(const char* s)
 {
-#ifdef LINUX
+/*#ifndef _UNICODE
     if (m_schemaCodePage != CP_UTF8)
-        u8tombc(s, strlen(s), m_chainChar, 2);
+        mbcconv(s, strlen(s), m_chainChar, 2, CP_UTF8, m_schemaCodePage); //u8tombc(s, strlen(s), m_chainChar, 2);
     else
-#endif
+#endif*/
         strncpy_s(m_chainChar, 2, s, sizeof(m_chainChar) - 1);
 }
 
 const char* tabledef::fileName() const
 {
-#ifdef LINUX
+/*#ifndef _UNICODE
     if (schemaCodePage != CP_UTF8)
     {
         char* p = namebufA();
-        mbctou8(m_fileName, strlen(m_fileName), p, FILE_NAME_SIZE);
+        mbcconv(m_fileName, strlen(m_fileName), p, FILE_NAME_SIZE, schemaCodePage, CP_UTF8); //mbctou8(m_fileName, strlen(m_fileName), p, FILE_NAME_SIZE);
         return p;
     }
-#endif
+#endif*/
     return m_fileName;
 }
 
 const char* tabledef::tableName() const
 {
-#ifdef LINUX
+/*#ifndef _UNICODE
     if (schemaCodePage != CP_UTF8)
     {
         char* p = namebufA();
-        mbctou8(m_tableName, strlen(m_tableName), p, TABLE_NAME_SIZE);
+        mbcconv(m_tableName, strlen(m_tableName), p, TABLE_NAME_SIZE, schemaCodePage, CP_UTF8); //mbctou8(m_tableName, strlen(m_tableName), p, TABLE_NAME_SIZE);
         return p;
     }
-#endif
+#endif*/
     return m_tableName;
 }
 
 void tabledef::setFileName(const char* s)
 {
-#ifdef LINUX
+/*#ifndef _UNICODE
     if (schemaCodePage != CP_UTF8)
-        u8tombc(s, strlen(s), m_fileName, FILE_NAME_SIZE);
+        mbcconv(s, strlen(s), m_fileName, FILE_NAME_SIZE, CP_UTF8, schemaCodePage); //u8tombc(s, strlen(s), m_fileName, FILE_NAME_SIZE);
     else
-#endif
+#endif*/
         setFileNameA(s);
 }
 
 void tabledef::setTableName(const char* s)
 {
-#ifdef LINUX
+/*#ifndef _UNICODE
     if (schemaCodePage != CP_UTF8)
-        u8tombc(s, strlen(s), m_tableName, TABLE_NAME_SIZE);
+        mbcconv(s, strlen(s), m_tableName, TABLE_NAME_SIZE, CP_UTF8, schemaCodePage); //u8tombc(s, strlen(s), m_tableName, TABLE_NAME_SIZE);
     else
-#endif
+#endif*/
         setTableNameA(s);
 }
 
 const char* tabledef::toChar(char* buf, const char* s, int size) const
 {
-#ifdef LINUX
+/*#ifndef _UNICODE
     if (schemaCodePage != CP_UTF8)
     {
-        u8tombc(s, strlen(s), buf, size);
+        //u8tombc(s, strlen(s), buf, size);
+        mbcconv(s, strlen(s), buf, size, CP_UTF8, schemaCodePage);
         return buf;
     }
-#endif
+#endif*/
     strncpy_s(buf, size, s, size - 1);
     return buf;
 }
@@ -651,7 +673,7 @@ bool isCompatibleType(uchar_td l, uchar_td r, ushort_td rlen, uchar_td rchar)
 }
 
 short fielddef::synchronize(const fielddef* fd)
-{
+{   // this is server. fd is current
     viewNum = fd->viewNum;
     viewWidth = fd->viewWidth;
     max = fd->max;
@@ -669,15 +691,16 @@ short fielddef::synchronize(const fielddef* fd)
     lookDBNum = fd->lookDBNum;
     uchar_td nullable = m_options & FIELD_OPTION_NULLABLE;
     m_options = fd->m_options;
+    m_options &= ~FIELD_OPTION_NULLABLE;
     m_options |= nullable;
     bool defaultNull = enableFlags.bitF;
-    enableFlags = fd->enableFlags;
+    enableFlags.all = fd->enableFlags.all;
     enableFlags.bitF = defaultNull;
     if (type == ft_mychar || type == ft_string || type == ft_mywchar || type == ft_wstring)
         m_padCharOptions = fd->m_padCharOptions;
     if (fd->type == ft_myfixedbinary && len - 2 == fd->len)
     {
-        len = fd->len ;
+        len = fd->len;
         type = fd->type;
     }
     if (len == fd->len && isCompatibleType(type, fd->type, fd->len, fd->m_charsetIndex))
@@ -784,6 +807,7 @@ bool tabledef::operator==(const tabledef& r) const
             (keyCount == r.keyCount) &&
             (version == r.version) &&
             (charsetIndex == r.charsetIndex) &&
+            (m_utimeFieldNum == r.m_utimeFieldNum) &&
             (flags.all == r.flags.all) &&
             (primaryKeyNum == r.primaryKeyNum) &&
             (parentKeyNum == r.parentKeyNum) &&
@@ -918,6 +942,9 @@ void tabledef::calcReclordlen(bool force)
             else if (defaultValue && fd.isBlob())
                 fd.setDefaultValue(0.0f);
 
+            if (m_utimeFieldNum == 0xffff && fd.isTimeStampOnUpdate())
+                m_utimeFieldNum = i;
+
             if (m_srvMajorVer)
             {
                 if (isLegacyTimeFormat(fd))
@@ -1107,6 +1134,7 @@ short tabledef::synchronize(const tabledef* td)
     version = td->version;
     m_inUse = td->m_inUse;
     m_mysqlNullMode = td->m_mysqlNullMode;
+    m_utimeFieldNum = td->m_utimeFieldNum;
     parentKeyNum = td->parentKeyNum;
     replicaKeyNum = td->replicaKeyNum;
     optionFlags = td->optionFlags;
@@ -1135,6 +1163,27 @@ short tabledef::synchronize(const tabledef* td)
     return 0;
 }
 
+void tabledef::convertToUtf8Schema()
+{
+    if (schemaCodePage != CP_UTF8)
+    {
+        char* p = namebufA();
+        mbcconv(m_tableName, strlen(m_tableName), p, TABLE_NAME_SIZE, schemaCodePage, CP_UTF8);
+        strcpy_s(m_tableName, TABLE_NAME_SIZE, p);
+        mbcconv(m_fileName, strlen(m_fileName), p, FILE_NAME_SIZE, schemaCodePage, CP_UTF8);
+        strcpy_s(m_fileName, FILE_NAME_SIZE, p);
+        for (int i = 0;i < fieldCount; ++i)
+        {
+            fielddef* fd = &fieldDefs[i];
+            mbcconv(fd->m_name, strlen(fd->m_name), p, FIELD_NAME_SIZE, schemaCodePage, CP_UTF8);
+            strcpy_s(fd->m_name, FIELD_NAME_SIZE, p);
+            mbcconv(fd->m_chainChar, strlen(fd->m_chainChar), p, 2, schemaCodePage, CP_UTF8);
+            strcpy_s(fd->m_chainChar, 2, p);
+        }
+        schemaCodePage = CP_UTF8;
+    }
+}
+
 ushort_td lenByCharnum(uchar_td type, uchar_td charsetIndex, ushort_td charnum)
 {
     ushort_td len = charnum;

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

@@ -1069,6 +1069,7 @@ struct PACKAGE tabledef
     {
         memset(this, 0, sizeof(tabledef));
         formatVersion = FORMAT_VERSON_CURRENT;
+        m_utimeFieldNum = -1;
         primaryKeyNum = -1;
         parentKeyNum = -1;
         replicaKeyNum = -1;
@@ -1084,6 +1085,7 @@ struct PACKAGE tabledef
     const wchar_t* tableName() const; // table name
     void setFileName(const wchar_t* s);
     void setTableName(const wchar_t* s);
+    void convertToUtf8Schema();
 private:
     const char* toChar(char* buf, const wchar_t* s, int size) const;
 #else
@@ -1107,6 +1109,7 @@ private:
     const char* tableName() const;
     void setFileName(const char* s);
     void setTableName(const char* s);
+    void convertToUtf8Schema();
 private:
     const char* toChar(char* buf, const char* s, int size) const;
 #endif // MYSQL_DYNAMIC_PLUGIN
@@ -1229,7 +1232,8 @@ private:
     bool m_useInMariadb  ;    // use in mariadb
     uchar_td m_srvMajorVer;   // server major version;
     uchar_td m_srvMinorVer;   // server minor version;
-    uchar_td m_filler0[10];   // reserved
+    ushort_td m_utimeFieldNum; // uodate timestamp field number
+    uchar_td m_filler0[8];    // reserved
 public:
     FLAGS flags; // file flags
     uchar_td primaryKeyNum; // Primary key number. -1 is no primary.

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

@@ -187,8 +187,10 @@ typedef void  (__STDCALL* REGISTER_RESOLVER_PTR)(HANAME_RESOLVER_PTR func);
 
 /** TD_GET_SCHEMA  sub operations
  */
+#define SC_SUBOP_TABLEDEF                0
 #define SC_SUBOP_BY_SQL                 -1
 #define SC_SUBOP_VIEW_BY_SQL            -2
+#define SC_SUBOP_TABLEDEF_BIN_STR       -3
 
 /** TD_GET_STASTISTICS sub operations
  */
@@ -387,12 +389,14 @@ enum combineType
 #define TD_OPEN_MASK_MYSQL_NULL         -16
 #define TD_OPEN_MASK_GETSHCHEMA         -32
 #define TD_OPEN_MASK_GETDEFAULTIMAGE    -64
+#define TD_OPEN_MASK_BIN_STR           -128
 
 #define IS_MODE_READONLY(mode)  (((0 - mode) & 2) != 0)
 #define IS_MODE_EXCLUSIVE(mode)  (((0 - mode) & 4) != 0)
 #define IS_MODE_MYSQL_NULL(mode)  (((0 - mode) & 16) != 0)
 #define IS_MODE_GETSCHEMA(mode)  (((0 - mode) & 32) != 0)
 #define IS_MODE_GETDEFAULTIMAGE(mode)  (((0 - mode) & 64) != 0)
+#define IS_MODE_BIN_STR(mode)  (((0 - mode) & 128) != 0)
 /** @endcond */
 
 /** field algin
@@ -665,7 +669,7 @@ struct handshale_t
  If you change this version then you need change The ($TargetName) project options too.
  */
 #define C_INTERFACE_VER_MAJOR "3"//##1 Build marker! Don't remove
-#define C_INTERFACE_VER_MINOR "5"//##2 Build marker! Don't remove
+#define C_INTERFACE_VER_MINOR "6"//##2 Build marker! Don't remove
 #define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
@@ -729,7 +733,7 @@ struct handshale_t
  */
 
 #define CPP_INTERFACE_VER_MAJOR "3"//##4 Build marker! Don't remove
-#define CPP_INTERFACE_VER_MINOR "5"//##5 Build marker! Don't remove
+#define CPP_INTERFACE_VER_MINOR "6"//##5 Build marker! Don't remove
 #define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
@@ -766,7 +770,7 @@ struct handshale_t
 
 
 #define TRANSACTD_VER_MAJOR 3//##7 Build marker! Don't remove
-#define TRANSACTD_VER_MINOR 5//##8 Build marker! Don't remove
+#define TRANSACTD_VER_MINOR 6//##8 Build marker! Don't remove
 #define TRANSACTD_VER_RELEASE 0//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

data/source/bzs/example/ormap_c.cpp

@@ -1,5 +1,5 @@
 /*=================================================================
-   Copyright (C) 2014 BizStation Corp All rights reserved.
+   Copyright (C) 2014,2016 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
@@ -522,7 +522,7 @@ void readUsers(databaseManager& db, std::vector<user_ptr>& users)
     users_orm users_hdr(m);
     ut.readMap(users_hdr, q);
 
-    /* Using clrient filter exsample.
+    /* Using client filter exsample.
        Set a client filter function or function object to read method.
     */
     ut.index(keynum_group).keyValue(find_group_id).read(users, q, isMatch);

data/source/bzs/netsvc/server/serverPipe.cpp

@@ -29,6 +29,9 @@
 #include <boost/enable_shared_from_this.hpp>
 #include "IAppModule.h"
 #include <bzs/rtl/exception.h>
+#include <windows.h>
+#include <stdio.h>
+
 
 using namespace boost;
 using namespace boost::asio;
@@ -166,10 +169,41 @@ class exitCheckHnadler : public IExitCheckHandler
     bool m_cancel;
     IAppModule* m_module;
 
+    /*
+       Enable Privilege of SE_DEBUG_NAME for system process. ex IIS 
+    */
+    BOOL setPrivilege()
+    {
+        HANDLE hProc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId());
+        HANDLE hToken;
+        OpenProcessToken(hProc, TOKEN_ADJUST_PRIVILEGES, &hToken);
+        CloseHandle(hProc);
+        TOKEN_PRIVILEGES tp;
+        LUID luid;
+
+        if (!LookupPrivilegeValue(NULL, SE_DEBUG_NAME, &luid))
+        {
+            CloseHandle(hToken);
+            return FALSE; 
+        }
+        tp.PrivilegeCount = 1;
+        tp.Privileges[0].Luid = luid;
+        tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+
+        BOOL ret = AdjustTokenPrivileges(hToken, FALSE, &tp,  sizeof(TOKEN_PRIVILEGES), 
+              (PTOKEN_PRIVILEGES) NULL, (PDWORD) NULL); 
+        CloseHandle(hToken);
+        if (!ret) return FALSE;
+        return (GetLastError() != ERROR_NOT_ALL_ASSIGNED);
+    }
+
 public:
     exitCheckHnadler(DWORD procId) : m_cancel(false), m_module(NULL)
     {
+        setPrivilege();
         m_procHandle = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, procId);
+        if (!m_procHandle)
+            server::erh->printError("Pipe client process handle access denied");
     }
 
     ~exitCheckHnadler()
@@ -188,7 +222,7 @@ public:
         if (m_procHandle && GetExitCodeProcess(m_procHandle, &ExitCode))
         {
             if (STILL_ACTIVE != ExitCode)
-                return true;
+                return true;   
         }
         if (m_module && m_module->isShutDown())
             return true;

data/source/bzs/test/tdclatl/test_v3.js

@@ -197,6 +197,7 @@ var joinWhereFields = 2;
 
 var CMP_MODE_MYSQL_NULL = 1;
 var CMP_MODE_OLD_NULL = 0;
+var CMP_MODE_BINFD_DEFAULT_STR = 2;
 
 var clearNull = 0;
 var defaultNull = 1;
@@ -864,6 +865,47 @@ function testConnMgr(uri)
 }
 
 
+function testUTCC(db)
+{
+	var tb = db.OpenTable("user", OPEN_NORMAL);
+	checkEqual(db.Stat, 0, "OpenTable user"); 
+
+	var tb2 = db.OpenTable("user", OPEN_NORMAL);
+	checkEqual(db.Stat, 0, "OpenTable user"); 
+
+	db.beginTrn();
+	tb.seekFirst();
+	checkEqual(tb.Stat, 0, "seekFirst"); 
+
+	tb2.seekFirst();
+	checkEqual(tb2.Stat, 0, "seekFirst2"); 
+
+	tb2.SetFV(1, "ABC");
+	tb2.Update();
+	checkEqual(tb2.Stat, 0, "seekFirst2"); 
+	
+	checkEqual(tb.updateConflictCheck, false, "updateConflictCheck");
+	var ret = tb.SetUpdateConflictCheck(true);
+	checkEqual(ret, true, "SetUpdateConflictCheck");
+	checkEqual(tb.updateConflictCheck, true, "updateConflictCheck");
+	
+	tb.SetFV(1, "EFG");
+	tb.Update();
+	checkEqual(tb.Stat, STATUS_CHANGE_CONFLICT, "Update UTCC"); 
+	db.abortTrn();
+}
+
+
+function tesAlias(db)
+{
+	var tb = db.OpenTable("user", OPEN_NORMAL);
+	checkEqual(db.Stat, 0, "OpenTable user"); 
+	tb.setAlias("���O", "name");
+	tb.SetFV("name", "EFG");
+	checkEqual(tb.Stat, 0, "Alias");
+	tb.close();
+}
+
 /*--------------------------------------------------------------------------------*/
 function test(atu, ate, db)
 {
@@ -953,7 +995,7 @@ function test(atu, ate, db)
 	// getSqlStringForCreateTable
 	var sql = db.GetSqlStringForCreateTable("extention");
 	checkEqual(db.Stat, 0, "GetSqlStringForCreateTable");
-	checkEqual(sql, 'CREATE TABLE `extention` (`id` INT NOT NULL ,`comment` VARCHAR(60) binary NULL DEFAULT NULL,`bits` BIGINT NOT NULL , UNIQUE key0(`id`)) ENGINE=InnoDB default charset=cp932',
+	checkEqual(sql, 'CREATE TABLE `extention` (`id` INT NOT NULL ,`comment` VARCHAR(60) binary NULL DEFAULT NULL,`bits` BIGINT NOT NULL , PRIMARY KEY(`id`)) ENGINE=InnoDB default charset=cp932',
 		 "GetSqlStringForCreateTable");
 
 	// setValidationTarget(bool isMariadb, uchar_td srvMinorVersion)
@@ -1171,6 +1213,11 @@ function test(atu, ate, db)
 	// connMgr
 	testConnMgr(db.uri);
 	
+	// UTCC
+	testUTCC(db);
+	
+	//Alias
+	tesAlias(db);
 	//WScript.Echo(" -- End Test -- ");
 }
 /*--------------------------------------------------------------------------------*/