database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch 'connect/10.2' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2018-12-20 09:40:49 +01:00
parent cb4c2a98b5 0735423e19
commit dc2856ad60
13 changed files with 226 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/connect/global.h
View File

@@ -219,11 +219,11 @@ DllExport LPCSTR PlugSetPath(LPSTR to, LPCSTR prefix, LPCSTR name, LPCSTR dir);
DllExport BOOL PlugIsAbsolutePath(LPCSTR path); DllExport BOOL PlugIsAbsolutePath(LPCSTR path);
DllExport bool AllocSarea(PGLOBAL, uint); DllExport bool AllocSarea(PGLOBAL, uint);
DllExport void FreeSarea(PGLOBAL); DllExport void FreeSarea(PGLOBAL);
DllExport BOOL PlugSubSet(PGLOBAL, void *, uint); DllExport BOOL PlugSubSet(void *, uint);
DllExport void *PlugSubAlloc(PGLOBAL, void *, size_t);
DllExport char *PlugDup(PGLOBAL g, const char *str); DllExport char *PlugDup(PGLOBAL g, const char *str);
DllExport void *MakePtr(void *, OFFSET); DllExport void *MakePtr(void *, OFFSET);
DllExport void htrc(char const *fmt, ...); DllExport void htrc(char const *fmt, ...);
//DllExport int GetTraceValue(void);
DllExport uint GetTraceValue(void); DllExport uint GetTraceValue(void);
#if defined(__cplusplus) #if defined(__cplusplus)
@@ -233,6 +233,6 @@ DllExport uint GetTraceValue(void);
/***********************************************************************/ /***********************************************************************/
/* Non exported routine declarations. */ /* Non exported routine declarations. */
/***********************************************************************/ /***********************************************************************/
void *PlugSubAlloc(PGLOBAL, void *, size_t); // Does throw //void *PlugSubAlloc(PGLOBAL, void *, size_t); // Does throw
/*-------------------------- End of Global.H --------------------------*/ /*-------------------------- End of Global.H --------------------------*/

4
storage/connect/ha_connect.cc
View File

@@ -4191,7 +4191,7 @@ int ha_connect::rnd_pos(uchar *buf, uchar *pos)
rc= rnd_next(buf); rc= rnd_next(buf);
} else { } else {
PGLOBAL g = GetPlug((table) ? table->in_use : NULL, xp); PGLOBAL g = GetPlug((table) ? table->in_use : NULL, xp);
strcpy(g->Message, "Not supported by this table type"); // strcpy(g->Message, "Not supported by this table type");
my_message(ER_ILLEGAL_HA, g->Message, MYF(0)); my_message(ER_ILLEGAL_HA, g->Message, MYF(0));
rc= HA_ERR_INTERNAL_ERROR; rc= HA_ERR_INTERNAL_ERROR;
} // endif SetRecpos } // endif SetRecpos
@@ -7307,7 +7307,7 @@ maria_declare_plugin(connect)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
connect_init_func, /* Plugin Init */ connect_init_func, /* Plugin Init */
connect_done_func, /* Plugin Deinit */ connect_done_func, /* Plugin Deinit */
0x0107, /* version number (1.05) */ 0x0106, /* version number (1.06) */
NULL, /* status variables */ NULL, /* status variables */
connect_system_variables, /* system variables */ connect_system_variables, /* system variables */
"1.06.0008", /* string version */ "1.06.0008", /* string version */

12
storage/connect/jsonudf.cpp
View File

@@ -3055,7 +3055,7 @@ my_bool json_array_grp_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
PGLOBAL g = (PGLOBAL)initid->ptr; PGLOBAL g = (PGLOBAL)initid->ptr;
PlugSubSet(g, g->Sarea, g->Sarea_Size); PlugSubSet(g->Sarea, g->Sarea_Size);
g->Activityp = (PACTIVITY)JsonNew(g, TYPE_JAR); g->Activityp = (PACTIVITY)JsonNew(g, TYPE_JAR);
g->N = (int)n; g->N = (int)n;
return false; return false;
@@ -3098,7 +3098,7 @@ void json_array_grp_clear(UDF_INIT *initid, char*, char*)
{ {
PGLOBAL g = (PGLOBAL)initid->ptr; PGLOBAL g = (PGLOBAL)initid->ptr;
PlugSubSet(g, g->Sarea, g->Sarea_Size); PlugSubSet(g->Sarea, g->Sarea_Size);
g->Activityp = (PACTIVITY)JsonNew(g, TYPE_JAR); g->Activityp = (PACTIVITY)JsonNew(g, TYPE_JAR);
g->N = GetJsonGroupSize(); g->N = GetJsonGroupSize();
} // end of json_array_grp_clear } // end of json_array_grp_clear
@@ -3132,7 +3132,7 @@ my_bool json_object_grp_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
PGLOBAL g = (PGLOBAL)initid->ptr; PGLOBAL g = (PGLOBAL)initid->ptr;
PlugSubSet(g, g->Sarea, g->Sarea_Size); PlugSubSet(g->Sarea, g->Sarea_Size);
g->Activityp = (PACTIVITY)JsonNew(g, TYPE_JOB); g->Activityp = (PACTIVITY)JsonNew(g, TYPE_JOB);
g->N = (int)n; g->N = (int)n;
return false; return false;
@@ -3169,7 +3169,7 @@ void json_object_grp_clear(UDF_INIT *initid, char*, char*)
{ {
PGLOBAL g = (PGLOBAL)initid->ptr; PGLOBAL g = (PGLOBAL)initid->ptr;
PlugSubSet(g, g->Sarea, g->Sarea_Size); PlugSubSet(g->Sarea, g->Sarea_Size);
g->Activityp = (PACTIVITY)JsonNew(g, TYPE_JOB); g->Activityp = (PACTIVITY)JsonNew(g, TYPE_JOB);
g->N = GetJsonGroupSize(); g->N = GetJsonGroupSize();
} // end of json_object_grp_clear } // end of json_object_grp_clear
@@ -4418,7 +4418,7 @@ char *json_file(UDF_INIT *initid, UDF_ARGS *args, char *result,
} else if (initid->const_item) } else if (initid->const_item)
g->N = 1; g->N = 1;
PlugSubSet(g, g->Sarea, g->Sarea_Size); PlugSubSet(g->Sarea, g->Sarea_Size);
fn = MakePSZ(g, args, 0); fn = MakePSZ(g, args, 0);
if (args->arg_count > 1) { if (args->arg_count > 1) {
@@ -5662,7 +5662,7 @@ char *jbin_file(UDF_INIT *initid, UDF_ARGS *args, char *result,
if (bsp && !bsp->Changed) if (bsp && !bsp->Changed)
goto fin; goto fin;
PlugSubSet(g, g->Sarea, g->Sarea_Size); PlugSubSet(g->Sarea, g->Sarea_Size);
g->Xchk = NULL; g->Xchk = NULL;
fn = MakePSZ(g, args, 0); fn = MakePSZ(g, args, 0);
pretty = (args->arg_count > 2 && args->args[2]) ? (int)*(longlong*)args->args[2] : 3; pretty = (args->arg_count > 2 && args->args[2]) ? (int)*(longlong*)args->args[2] : 3;

18
storage/connect/mysql-test/connect/r/jdbc_oracle.result
View File

@@ -8,12 +8,19 @@ SELECT * FROM t2 WHERE command = 'drop table employee';
command number message command number message
drop table employee 0 Execute: java.sql.SQLSyntaxErrorException: ORA-00942: table or view does not exist drop table employee 0 Execute: java.sql.SQLSyntaxErrorException: ORA-00942: table or view does not exist
Warnings:
Warning 1105 Execute: java.sql.SQLSyntaxErrorException: ORA-00942: table or view does not exist
SELECT * FROM t2 WHERE command = 'create table employee (id int not null, name varchar(32), title char(16), salary number(8,2))'; SELECT * FROM t2 WHERE command = 'create table employee (id int not null, name varchar(32), title char(16), salary number(8,2))';
command number message command number message
create table employee (id int not null, name varchar(32), title char(16), salary number(8,2)) 0 Affected rows create table employee (id int not null, name varchar(32), title char(16), salary number(8,2)) 0 Affected rows
Warnings:
Warning 1105 Affected rows
SELECT * FROM t2 WHERE command = "insert into employee values(4567,'Johnson', 'Engineer', 12560.50)"; SELECT * FROM t2 WHERE command = "insert into employee values(4567,'Johnson', 'Engineer', 12560.50)";
command number message command number message
insert into employee values(4567,'Johnson', 'Engineer', 12560.50) 1 Affected rows insert into employee values(4567,'Johnson', 'Engineer', 12560.50) 1 Affected rows
Warnings:
Warning 1105 Affected rows
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=JDBC CATFUNC=tables CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=JDBC CATFUNC=tables
CONNECTION='jdbc:oracle:thin:@localhost:1521:xe' CONNECTION='jdbc:oracle:thin:@localhost:1521:xe'
OPTION_LIST='User=system,Password=manager'; OPTION_LIST='User=system,Password=manager';
@@ -27,8 +34,8 @@ OPTION_LIST='User=system,Password=manager';
SELECT * FROM t1; SELECT * FROM t1;
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
NULL SYSTEM EMPLOYEE ID 3 NUMBER 38 0 0 10 0 NULL NULL SYSTEM EMPLOYEE ID 3 NUMBER 38 0 0 10 0 NULL
NULL SYSTEM EMPLOYEE NAME 12 VARCHAR2 32 0 0 10 1 NULL NULL SYSTEM EMPLOYEE NAME 12 VARCHAR2 32 0 NULL 10 1 NULL
NULL SYSTEM EMPLOYEE TITLE 1 CHAR 16 0 0 10 1 NULL NULL SYSTEM EMPLOYEE TITLE 1 CHAR 16 0 NULL 10 1 NULL
NULL SYSTEM EMPLOYEE SALARY 3 NUMBER 8 0 2 10 1 NULL NULL SYSTEM EMPLOYEE SALARY 3 NUMBER 8 0 2 10 1 NULL
DROP TABLE t1; DROP TABLE t1;
CREATE SERVER 'oracle' FOREIGN DATA WRAPPER 'oracle.jdbc.driver.OracleDriver' OPTIONS ( CREATE SERVER 'oracle' FOREIGN DATA WRAPPER 'oracle.jdbc.driver.OracleDriver' OPTIONS (
@@ -52,7 +59,7 @@ Note 1105 EMPLOYEE: 1 affected rows
SELECT * FROM t1; SELECT * FROM t1;
ID NAME TITLE SALARY ID NAME TITLE SALARY
4567 Trump Engineer 12560.50 4567 Trump Engineer 12560.50
6214 Clinton Retired 0.00 6214 Clinton Retired NULL
DELETE FROM t1 WHERE id = 6214; DELETE FROM t1 WHERE id = 6214;
Warnings: Warnings:
Note 1105 EMPLOYEE: 1 affected rows Note 1105 EMPLOYEE: 1 affected rows
@@ -63,8 +70,7 @@ DROP TABLE t1;
SELECT * FROM t2 WHERE command = 'drop table employee'; SELECT * FROM t2 WHERE command = 'drop table employee';
command number message command number message
drop table employee 0 Affected rows drop table employee 0 Affected rows
Warnings:
Warning 1105 Affected rows
DROP TABLE t2; DROP TABLE t2;
DROP SERVER 'oracle'; DROP SERVER 'oracle';
SET GLOBAL connect_jvm_path=NULL;
SET GLOBAL connect_class_path=NULL;
SET GLOBAL time_zone = SYSTEM;

28
storage/connect/plugutil.cpp
View File

@@ -514,27 +514,31 @@ void FreeSarea(PGLOBAL g)
/* Here there should be some verification done such as validity of */ /* Here there should be some verification done such as validity of */
/* the address and size not larger than memory size. */ /* the address and size not larger than memory size. */
/***********************************************************************/ /***********************************************************************/
BOOL PlugSubSet(PGLOBAL g __attribute__((unused)), void *memp, uint size) BOOL PlugSubSet(void *memp, uint size)
{ {
PPOOLHEADER pph = (PPOOLHEADER)memp; PPOOLHEADER pph = (PPOOLHEADER)memp;
pph->To_Free = (OFFSET)sizeof(POOLHEADER); pph->To_Free = (OFFSET)sizeof(POOLHEADER);
pph->FreeBlk = size - pph->To_Free; pph->FreeBlk = size - pph->To_Free;
return FALSE; return FALSE;
} /* end of PlugSubSet */ } /* end of PlugSubSet */
/***********************************************************************/
/* Use it to export a function that do throwing. */
/***********************************************************************/
void *DoThrow(int n)
{
throw n;
} /* end of DoThrow */
/***********************************************************************/ /***********************************************************************/
/* Program for sub-allocating one item in a storage area. */ /* Program for sub-allocating one item in a storage area. */
/* Note: SubAlloc routines of OS/2 are no more used to increase the */ /* The simple way things are done here is based on the fact */
/* code portability and avoid problems when a grammar compiled under */ /* that no freeing of suballocated blocks is permitted in CONNECT. */
/* one version of OS/2 is used under another version. */
/* The simple way things are done here is also based on the fact */
/* that no freeing of suballocated blocks is permitted in Plug. */
/***********************************************************************/ /***********************************************************************/
void *PlugSubAlloc(PGLOBAL g, void *memp, size_t size) void *PlugSubAlloc(PGLOBAL g, void *memp, size_t size)
{ {
PPOOLHEADER pph; /* Points on area header. */ PPOOLHEADER pph; /* Points on area header. */
if (!memp) if (!memp)
/*******************************************************************/ /*******************************************************************/
@@ -559,8 +563,8 @@ void *PlugSubAlloc(PGLOBAL g, void *memp, size_t size)
if (trace(1)) if (trace(1))
htrc("PlugSubAlloc: %s\n", g->Message); htrc("PlugSubAlloc: %s\n", g->Message);
throw 1234; DoThrow(1234);
} /* endif size OS32 code */ } /* endif size OS32 code */
/*********************************************************************/ /*********************************************************************/
/* Do the suballocation the simplest way. */ /* Do the suballocation the simplest way. */
@@ -574,7 +578,7 @@ void *PlugSubAlloc(PGLOBAL g, void *memp, size_t size)
memp, pph->To_Free, pph->FreeBlk); memp, pph->To_Free, pph->FreeBlk);
return (memp); return (memp);
} /* end of PlugSubAlloc */ } /* end of PlugSubAlloc */
/***********************************************************************/ /***********************************************************************/
/* Program for sub-allocating and copying a string in a storage area. */ /* Program for sub-allocating and copying a string in a storage area. */

11
storage/connect/reldef.cpp
View File

@@ -522,8 +522,15 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g)
// Get the function returning an instance of the external DEF class // Get the function returning an instance of the external DEF class
if (!(getdef = (XGETDEF)GetProcAddress((HINSTANCE)Hdll, getname))) { if (!(getdef = (XGETDEF)GetProcAddress((HINSTANCE)Hdll, getname))) {
sprintf(g->Message, MSG(PROCADD_ERROR), GetLastError(), getname); char buf[256];
FreeLibrary((HMODULE)Hdll); DWORD rc = GetLastError();
sprintf(g->Message, MSG(PROCADD_ERROR), rc, getname);
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
(LPTSTR)buf, sizeof(buf), NULL);
strcat(strcat(g->Message, ": "), buf);
FreeLibrary((HMODULE)Hdll);
return NULL; return NULL;
} // endif getdef } // endif getdef
#else // !__WIN__ #else // !__WIN__

2
storage/connect/tabfmt.h
View File

@@ -13,7 +13,7 @@ typedef class TDBFMT *PTDBFMT;
/***********************************************************************/ /***********************************************************************/
/* Functions used externally. */ /* Functions used externally. */
/***********************************************************************/ /***********************************************************************/
PQRYRES CSVColumns(PGLOBAL g, PCSZ dp, PTOS topt, bool info); DllExport PQRYRES CSVColumns(PGLOBAL g, PCSZ dp, PTOS topt, bool info);
/***********************************************************************/ /***********************************************************************/
/* CSV table. */ /* CSV table. */

10
storage/connect/tabjson.cpp
View File

@@ -299,7 +299,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
memset(G, 0, sizeof(GLOBAL)); memset(G, 0, sizeof(GLOBAL));
G->Sarea_Size = tdp->Lrecl * 10; G->Sarea_Size = tdp->Lrecl * 10;
G->Sarea = PlugSubAlloc(g, NULL, G->Sarea_Size); G->Sarea = PlugSubAlloc(g, NULL, G->Sarea_Size);
PlugSubSet(G, G->Sarea, G->Sarea_Size); PlugSubSet(G->Sarea, G->Sarea_Size);
G->jump_level = 0; G->jump_level = 0;
tjnp->SetG(G); tjnp->SetG(G);
@@ -670,7 +670,7 @@ PTDB JSONDEF::GetTable(PGLOBAL g, MODE m)
memset(G, 0, sizeof(GLOBAL)); memset(G, 0, sizeof(GLOBAL));
G->Sarea_Size = Lrecl * 10; G->Sarea_Size = Lrecl * 10;
G->Sarea = PlugSubAlloc(g, NULL, G->Sarea_Size); G->Sarea = PlugSubAlloc(g, NULL, G->Sarea_Size);
PlugSubSet(G, G->Sarea, G->Sarea_Size); PlugSubSet(G->Sarea, G->Sarea_Size);
G->jump_level = 0; G->jump_level = 0;
((TDBJSN*)tdbp)->G = G; ((TDBJSN*)tdbp)->G = G;
} else { } else {
@@ -963,7 +963,7 @@ int TDBJSN::ReadDB(PGLOBAL g)
return rc; return rc;
// Recover the memory used for parsing // Recover the memory used for parsing
PlugSubSet(G, G->Sarea, G->Sarea_Size); PlugSubSet(G->Sarea, G->Sarea_Size);
if ((Row = ParseJson(G, To_Line, strlen(To_Line), &Pretty, &Comma))) { if ((Row = ParseJson(G, To_Line, strlen(To_Line), &Pretty, &Comma))) {
Row = FindRow(g); Row = FindRow(g);
@@ -1079,13 +1079,13 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
} // end of PrepareWriting } // end of PrepareWriting
/***********************************************************************/ /***********************************************************************/
/* WriteDB: Data Base write routine for DOS access method. */ /* WriteDB: Data Base write routine for JSON access method. */
/***********************************************************************/ /***********************************************************************/
int TDBJSN::WriteDB(PGLOBAL g) int TDBJSN::WriteDB(PGLOBAL g)
{ {
int rc = TDBDOS::WriteDB(g); int rc = TDBDOS::WriteDB(g);
PlugSubSet(G, G->Sarea, G->Sarea_Size); PlugSubSet(G->Sarea, G->Sarea_Size);
Row->Clear(); Row->Clear();
return rc; return rc;
} // end of WriteDB } // end of WriteDB

6
storage/connect/tabjson.h
View File

@@ -1,11 +1,11 @@
/*************** tabjson H Declares Source Code File (.H) **************/ /*************** tabjson H Declares Source Code File (.H) **************/
/* Name: tabjson.h Version 1.3 */ /* Name: tabjson.h Version 1.3 */
/* */ /* */
/* (C) Copyright to the author Olivier BERTRAND 2014 - 2017 */ /* (C) Copyright to the author Olivier BERTRAND 2014 - 2018 */
/* */ /* */
/* This file contains the JSON classes declares. */ /* This file contains the JSON classes declares. */
/***********************************************************************/ /***********************************************************************/
#include "osutil.h" //#include "osutil.h" // Unuseful and bad for OEM
#include "block.h" #include "block.h"
#include "colblk.h" #include "colblk.h"
#include "json.h" #include "json.h"
@@ -16,7 +16,7 @@ typedef class JSONDEF *PJDEF;
typedef class TDBJSON *PJTDB; typedef class TDBJSON *PJTDB;
typedef class JSONCOL *PJCOL; typedef class JSONCOL *PJCOL;
class TDBJSN; class TDBJSN;
PQRYRES JSONColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt, bool info); DllExport PQRYRES JSONColumns(PGLOBAL, PCSZ, PCSZ, PTOS, bool);
/***********************************************************************/ /***********************************************************************/
/* The JSON tree node. Can be an Object or an Array. */ /* The JSON tree node. Can be an Object or an Array. */

305
storage/connect/tabodbc.cpp
View File

@@ -5,7 +5,7 @@
/* */ /* */
/* COPYRIGHT: */ /* COPYRIGHT: */
/* ---------- */ /* ---------- */
/* (C) Copyright to the author Olivier BERTRAND 2000-2017 */ /* (C) Copyright to the author Olivier BERTRAND 2000-2018 */
/* */ /* */
/* WHAT THIS PROGRAM DOES: */ /* WHAT THIS PROGRAM DOES: */
/* ----------------------- */ /* ----------------------- */
@@ -95,23 +95,23 @@ bool ExactInfo(void);
/* Constructor. */ /* Constructor. */
/***********************************************************************/ /***********************************************************************/
ODBCDEF::ODBCDEF(void) ODBCDEF::ODBCDEF(void)
{ {
Connect = NULL; Connect = NULL;
Catver = 0; Catver = 0;
UseCnc = false; UseCnc = false;
} // end of ODBCDEF constructor } // end of ODBCDEF constructor
/***********************************************************************/ /***********************************************************************/
/* DefineAM: define specific AM block values from XDB file. */ /* DefineAM: define specific AM block values from XDB file. */
/***********************************************************************/ /***********************************************************************/
bool ODBCDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) bool ODBCDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
{ {
Desc = Connect = GetStringCatInfo(g, "Connect", NULL); Desc = Connect = GetStringCatInfo(g, "Connect", NULL);
if (!Connect && !Catfunc) { if (!Connect && !Catfunc) {
sprintf(g->Message, "Missing connection for ODBC table %s", Name); sprintf(g->Message, "Missing connection for ODBC table %s", Name);
return true; return true;
} // endif Connect } // endif Connect
if (EXTDEF::DefineAM(g, am, poff)) if (EXTDEF::DefineAM(g, am, poff))
return true; return true;
@@ -123,13 +123,13 @@ bool ODBCDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
Qto= GetIntCatInfo("QueryTimeout", DEFAULT_QUERY_TIMEOUT); Qto= GetIntCatInfo("QueryTimeout", DEFAULT_QUERY_TIMEOUT);
UseCnc = GetBoolCatInfo("UseDSN", false); UseCnc = GetBoolCatInfo("UseDSN", false);
return false; return false;
} // end of DefineAM } // end of DefineAM
/***********************************************************************/ /***********************************************************************/
/* GetTable: makes a new Table Description Block. */ /* GetTable: makes a new Table Description Block. */
/***********************************************************************/ /***********************************************************************/
PTDB ODBCDEF::GetTable(PGLOBAL g, MODE m) PTDB ODBCDEF::GetTable(PGLOBAL g, MODE m)
{ {
PTDB tdbp = NULL; PTDB tdbp = NULL;
/*********************************************************************/ /*********************************************************************/
@@ -158,10 +158,10 @@ PTDB ODBCDEF::GetTable(PGLOBAL g, MODE m)
tdbp = new(g) TDBMUL(tdbp); tdbp = new(g) TDBMUL(tdbp);
else if (Multiple == 2) else if (Multiple == 2)
strcpy(g->Message, MSG(NO_ODBC_MUL)); strcpy(g->Message, MSG(NO_ODBC_MUL));
} // endswitch Catfunc } // endswitch Catfunc
return tdbp; return tdbp;
} // end of GetTable } // end of GetTable
/* -------------------------- Class TDBODBC -------------------------- */ /* -------------------------- Class TDBODBC -------------------------- */
@@ -169,7 +169,7 @@ PTDB ODBCDEF::GetTable(PGLOBAL g, MODE m)
/* Implementation of the TDBODBC class. */ /* Implementation of the TDBODBC class. */
/***********************************************************************/ /***********************************************************************/
TDBODBC::TDBODBC(PODEF tdp) : TDBEXT(tdp) TDBODBC::TDBODBC(PODEF tdp) : TDBEXT(tdp)
{ {
Ocp = NULL; Ocp = NULL;
Cnp = NULL; Cnp = NULL;
@@ -191,19 +191,19 @@ TDBODBC::TDBODBC(PODEF tdp) : TDBEXT(tdp)
Ops.UseCnc = false; Ops.UseCnc = false;
} // endif tdp } // endif tdp
} // end of TDBODBC standard constructor } // end of TDBODBC standard constructor
TDBODBC::TDBODBC(PTDBODBC tdbp) : TDBEXT(tdbp) TDBODBC::TDBODBC(PTDBODBC tdbp) : TDBEXT(tdbp)
{ {
Ocp = tdbp->Ocp; // is that right ? Ocp = tdbp->Ocp; // is that right ?
Cnp = tdbp->Cnp; Cnp = tdbp->Cnp;
Connect = tdbp->Connect; Connect = tdbp->Connect;
Ops = tdbp->Ops; Ops = tdbp->Ops;
} // end of TDBODBC copy constructor } // end of TDBODBC copy constructor
// Method // Method
PTDB TDBODBC::Clone(PTABS t) PTDB TDBODBC::Clone(PTABS t)
{ {
PTDB tp; PTDB tp;
PODBCCOL cp1, cp2; PODBCCOL cp1, cp2;
PGLOBAL g = t->G; // Is this really useful ??? PGLOBAL g = t->G; // Is this really useful ???
@@ -213,18 +213,18 @@ PTDB TDBODBC::Clone(PTABS t)
for (cp1 = (PODBCCOL)Columns; cp1; cp1 = (PODBCCOL)cp1->GetNext()) { for (cp1 = (PODBCCOL)Columns; cp1; cp1 = (PODBCCOL)cp1->GetNext()) {
cp2 = new(g) ODBCCOL(cp1, tp); // Make a copy cp2 = new(g) ODBCCOL(cp1, tp); // Make a copy
NewPointer(t, cp1, cp2); NewPointer(t, cp1, cp2);
} // endfor cp1 } // endfor cp1
return tp; return tp;
} // end of CopyOne } // end of CopyOne
/***********************************************************************/ /***********************************************************************/
/* Allocate ODBC column description block. */ /* Allocate ODBC column description block. */
/***********************************************************************/ /***********************************************************************/
PCOL TDBODBC::MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) PCOL TDBODBC::MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n)
{ {
return new(g) ODBCCOL(cdp, this, cprec, n); return new(g) ODBCCOL(cdp, this, cprec, n);
} // end of MakeCol } // end of MakeCol
/***********************************************************************/ /***********************************************************************/
/* Extract the filename from connect string and return it. */ /* Extract the filename from connect string and return it. */
@@ -232,7 +232,7 @@ PCOL TDBODBC::MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n)
/* with a place holder to be used by SetFile. */ /* with a place holder to be used by SetFile. */
/***********************************************************************/ /***********************************************************************/
PCSZ TDBODBC::GetFile(PGLOBAL g) PCSZ TDBODBC::GetFile(PGLOBAL g)
{ {
if (Connect) { if (Connect) {
char *p1, *p2; char *p1, *p2;
int i; int i;
@@ -263,18 +263,18 @@ PCSZ TDBODBC::GetFile(PGLOBAL g)
memcpy(MulConn, Connect, p1 - Connect); memcpy(MulConn, Connect, p1 - Connect);
MulConn[p1 - Connect] = '\0'; MulConn[p1 - Connect] = '\0';
strcat(strcat(MulConn, "%s"), (p2) ? p2 : ";"); strcat(strcat(MulConn, "%s"), (p2) ? p2 : ";");
} // endif p1 } // endif p1
} // endif Connect } // endif Connect
return (DBQ) ? DBQ : (PSZ)"???"; return (DBQ) ? DBQ : (PSZ)"???";
} // end of GetFile } // end of GetFile
/***********************************************************************/ /***********************************************************************/
/* Set DBQ and get the new file name into the connect string. */ /* Set DBQ and get the new file name into the connect string. */
/***********************************************************************/ /***********************************************************************/
void TDBODBC::SetFile(PGLOBAL g, PCSZ fn) void TDBODBC::SetFile(PGLOBAL g, PCSZ fn)
{ {
if (MulConn) { if (MulConn) {
int n = strlen(MulConn) + strlen(fn) - 1; int n = strlen(MulConn) + strlen(fn) - 1;
@@ -283,20 +283,20 @@ void TDBODBC::SetFile(PGLOBAL g, PCSZ fn)
// of having to reallocate it is reduced. // of having to reallocate it is reduced.
BufSize = n + 6; BufSize = n + 6;
Connect = (char*)PlugSubAlloc(g, NULL, BufSize); Connect = (char*)PlugSubAlloc(g, NULL, BufSize);
} // endif n } // endif n
// Make the complete connect string // Make the complete connect string
sprintf(Connect, MulConn, fn); sprintf(Connect, MulConn, fn);
} // endif MultConn } // endif MultConn
DBQ = PlugDup(g, fn); DBQ = PlugDup(g, fn);
} // end of SetFile } // end of SetFile
/***********************************************************************/ /***********************************************************************/
/* MakeInsert: make the Insert statement used with ODBC connection. */ /* MakeInsert: make the Insert statement used with ODBC connection. */
/***********************************************************************/ /***********************************************************************/
bool TDBODBC::MakeInsert(PGLOBAL g) bool TDBODBC::MakeInsert(PGLOBAL g)
{ {
PCSZ schmp = NULL; PCSZ schmp = NULL;
char *catp = NULL, buf[NAM_LEN * 3]; char *catp = NULL, buf[NAM_LEN * 3];
int len = 0; int len = 0;
@@ -377,7 +377,7 @@ bool TDBODBC::MakeInsert(PGLOBAL g)
} else } else
Query->Append(buf); Query->Append(buf);
} // endfor colp } // endfor colp
Query->Append(") VALUES ("); Query->Append(") VALUES (");
@@ -390,32 +390,32 @@ bool TDBODBC::MakeInsert(PGLOBAL g)
Query->RepLast(')'); Query->RepLast(')');
return oom; return oom;
} // end of MakeInsert } // end of MakeInsert
/***********************************************************************/ /***********************************************************************/
/* ODBC Bind Parameter function. */ /* ODBC Bind Parameter function. */
/***********************************************************************/ /***********************************************************************/
bool TDBODBC::BindParameters(PGLOBAL g) bool TDBODBC::BindParameters(PGLOBAL g)
{ {
PODBCCOL colp; PODBCCOL colp;
for (colp = (PODBCCOL)Columns; colp; colp = (PODBCCOL)colp->Next) { for (colp = (PODBCCOL)Columns; colp; colp = (PODBCCOL)colp->Next) {
colp->AllocateBuffers(g, 0); colp->AllocateBuffers(g, 0);
if (Ocp->BindParam(colp)) if (Ocp->BindParam(colp))
return true; return true;
} // endfor colp } // endfor colp
return false; return false;
} // end of BindParameters } // end of BindParameters
#if 0 #if 0
/***********************************************************************/ /***********************************************************************/
/* MakeUpdate: make the SQL statement to send to ODBC connection. */ /* MakeUpdate: make the SQL statement to send to ODBC connection. */
/***********************************************************************/ /***********************************************************************/
char *TDBODBC::MakeUpdate(PGLOBAL g) char *TDBODBC::MakeUpdate(PGLOBAL g)
{ {
char *qc, *stmt = NULL, cmd[8], tab[96], end[1024]; char *qc, *stmt = NULL, cmd[8], tab[96], end[1024];
stmt = (char*)PlugSubAlloc(g, NULL, strlen(Qrystr) + 64); stmt = (char*)PlugSubAlloc(g, NULL, strlen(Qrystr) + 64);
@@ -440,60 +440,60 @@ char *TDBODBC::MakeUpdate(PGLOBAL g)
strcat(stmt, end); strcat(stmt, end);
return stmt; return stmt;
} // end of MakeUpdate } // end of MakeUpdate
/***********************************************************************/ /***********************************************************************/
/* MakeDelete: make the SQL statement to send to ODBC connection. */ /* MakeDelete: make the SQL statement to send to ODBC connection. */
/***********************************************************************/ /***********************************************************************/
char *TDBODBC::MakeDelete(PGLOBAL g) char *TDBODBC::MakeDelete(PGLOBAL g)
{ {
char *qc, *stmt = NULL, cmd[8], from[8], tab[96], end[512]; char *qc, *stmt = NULL, cmd[8], from[8], tab[96], end[512];
stmt = (char*)PlugSubAlloc(g, NULL, strlen(Qrystr) + 64); stmt = (char*)PlugSubAlloc(g, NULL, strlen(Qrystr) + 64);
memset(end, 0, sizeof(end)); memset(end, 0, sizeof(end));
if (sscanf(Qrystr, "%s %s `%[^`]`%511c", cmd, from, tab, end) > 2 || if (sscanf(Qrystr, "%s %s `%[^`]`%511c", cmd, from, tab, end) > 2 ||
sscanf(Qrystr, "%s %s \"%[^\"]\"%511c", cmd, from, tab, end) > 2) sscanf(Qrystr, "%s %s \"%[^\"]\"%511c", cmd, from, tab, end) > 2)
qc = Ocp->GetQuoteChar(); qc = Ocp->GetQuoteChar();
else if (sscanf(Qrystr, "%s %s %s%511c", cmd, from, tab, end) > 2) else if (sscanf(Qrystr, "%s %s %s%511c", cmd, from, tab, end) > 2)
qc = (Quoted) ? Quote : ""; qc = (Quoted) ? Quote : "";
else { else {
strcpy(g->Message, "Cannot use this DELETE command"); strcpy(g->Message, "Cannot use this DELETE command");
return NULL; return NULL;
} // endif sscanf } // endif sscanf
assert(!stricmp(cmd, "delete") && !stricmp(from, "from")); assert(!stricmp(cmd, "delete") && !stricmp(from, "from"));
strcat(strcat(strcat(strcpy(stmt, "DELETE FROM "), qc), TableName), qc); strcat(strcat(strcat(strcpy(stmt, "DELETE FROM "), qc), TableName), qc);
if (*end) { if (*end) {
for (int i = 0; end[i]; i++) for (int i = 0; end[i]; i++)
if (end[i] == '`') if (end[i] == '`')
end[i] = *qc; end[i] = *qc;
strcat(stmt, end); strcat(stmt, end);
} // endif end } // endif end
return stmt; return stmt;
} // end of MakeDelete } // end of MakeDelete
#endif // 0 #endif // 0
/***********************************************************************/ /***********************************************************************/
/* ResetSize: call by TDBMUL when calculating size estimate. */ /* ResetSize: call by TDBMUL when calculating size estimate. */
/***********************************************************************/ /***********************************************************************/
void TDBODBC::ResetSize(void) void TDBODBC::ResetSize(void)
{ {
MaxSize = -1; MaxSize = -1;
if (Ocp && Ocp->IsOpen()) if (Ocp && Ocp->IsOpen())
Ocp->Close(); Ocp->Close();
} // end of ResetSize } // end of ResetSize
/***********************************************************************/ /***********************************************************************/
/* ODBC Cardinality: returns table size in number of rows. */ /* ODBC Cardinality: returns table size in number of rows. */
/***********************************************************************/ /***********************************************************************/
int TDBODBC::Cardinality(PGLOBAL g) int TDBODBC::Cardinality(PGLOBAL g)
{ {
if (!g) if (!g)
return (Mode == MODE_ANY && !Srcdef) ? 1 : 0; return (Mode == MODE_ANY && !Srcdef) ? 1 : 0;
@@ -526,7 +526,7 @@ int TDBODBC::Cardinality(PGLOBAL g)
Cardinal = 10; // To make MySQL happy Cardinal = 10; // To make MySQL happy
return Cardinal; return Cardinal;
} // end of Cardinality } // end of Cardinality
/***********************************************************************/ /***********************************************************************/
/* ODBC Access Method opening routine. */ /* ODBC Access Method opening routine. */
@@ -535,7 +535,7 @@ int TDBODBC::Cardinality(PGLOBAL g)
/* join block of next table if it exists or else are discarted. */ /* join block of next table if it exists or else are discarted. */
/***********************************************************************/ /***********************************************************************/
bool TDBODBC::OpenDB(PGLOBAL g) bool TDBODBC::OpenDB(PGLOBAL g)
{ {
bool rc = true; bool rc = true;
if (trace(1)) if (trace(1))
@@ -571,7 +571,7 @@ bool TDBODBC::OpenDB(PGLOBAL g)
Fpos = 0; Fpos = 0;
Curpos = 1; Curpos = 1;
return false; return false;
} // endif use } // endif use
/*********************************************************************/ /*********************************************************************/
/* Open an ODBC connection for this table. */ /* Open an ODBC connection for this table. */
@@ -593,7 +593,7 @@ bool TDBODBC::OpenDB(PGLOBAL g)
Use = USE_OPEN; // Do it now in case we are recursively called Use = USE_OPEN; // Do it now in case we are recursively called
/*********************************************************************/ /*********************************************************************/
/* Make the command and allocate whatever is used for getting results. */ /* Make the command and allocate whatever is used for getting results*/
/*********************************************************************/ /*********************************************************************/
if (Mode == MODE_READ || Mode == MODE_READX) { if (Mode == MODE_READ || Mode == MODE_READX) {
if (Memory > 1 && !Srcdef) { if (Memory > 1 && !Srcdef) {
@@ -624,7 +624,7 @@ bool TDBODBC::OpenDB(PGLOBAL g)
} else } else
return true; return true;
} // endif Memory } // endif Memory
if (!(rc = MakeSQL(g, false))) { if (!(rc = MakeSQL(g, false))) {
for (PODBCCOL colp = (PODBCCOL)Columns; colp; for (PODBCCOL colp = (PODBCCOL)Columns; colp;
@@ -635,7 +635,7 @@ bool TDBODBC::OpenDB(PGLOBAL g)
rc = (Mode == MODE_READ) rc = (Mode == MODE_READ)
? ((Rows = Ocp->ExecDirectSQL(Query->GetStr(), (PODBCCOL)Columns)) < 0) ? ((Rows = Ocp->ExecDirectSQL(Query->GetStr(), (PODBCCOL)Columns)) < 0)
: false; : false;
} // endif rc } // endif rc
} else if (Mode == MODE_INSERT) { } else if (Mode == MODE_INSERT) {
if (!(rc = MakeInsert(g))) { if (!(rc = MakeInsert(g))) {
@@ -645,7 +645,7 @@ bool TDBODBC::OpenDB(PGLOBAL g)
} else } else
rc = BindParameters(g); rc = BindParameters(g);
} // endif rc } // endif rc
} else if (Mode == MODE_UPDATE || Mode == MODE_DELETE) { } else if (Mode == MODE_UPDATE || Mode == MODE_DELETE) {
rc = false; // wait for CheckCond before calling MakeCommand(g); rc = false; // wait for CheckCond before calling MakeCommand(g);
@@ -655,30 +655,30 @@ bool TDBODBC::OpenDB(PGLOBAL g)
if (rc) { if (rc) {
Ocp->Close(); Ocp->Close();
return true; return true;
} // endif rc } // endif rc
/*********************************************************************/ /*********************************************************************/
/* Reset statistics values. */ /* Reset statistics values. */
/*********************************************************************/ /*********************************************************************/
num_read = num_there = num_eq[0] = num_eq[1] = 0; num_read = num_there = num_eq[0] = num_eq[1] = 0;
return false; return false;
} // end of OpenDB } // end of OpenDB
#if 0 #if 0
/***********************************************************************/ /***********************************************************************/
/* GetRecpos: return the position of last read record. */ /* GetRecpos: return the position of last read record. */
/***********************************************************************/ /***********************************************************************/
int TDBODBC::GetRecpos(void) int TDBODBC::GetRecpos(void)
{ {
return Fpos; return Fpos;
} // end of GetRecpos } // end of GetRecpos
#endif // 0 #endif // 0
/***********************************************************************/ /***********************************************************************/
/* SetRecpos: set the position of next read record. */ /* SetRecpos: set the position of next read record. */
/***********************************************************************/ /***********************************************************************/
bool TDBODBC::SetRecpos(PGLOBAL g, int recpos) bool TDBODBC::SetRecpos(PGLOBAL g, int recpos)
{ {
if (Ocp->m_Full) { if (Ocp->m_Full) {
Fpos = 0; Fpos = 0;
CurNum = recpos - 1; CurNum = recpos - 1;
@@ -696,14 +696,15 @@ bool TDBODBC::SetRecpos(PGLOBAL g, int recpos)
} // endif recpos } // endif recpos
} else { } else {
strcpy(g->Message, "This action requires a scrollable cursor"); strcpy(g->Message,
"This action requires Memory setting or a scrollable cursor");
return true; return true;
} // endif's } // endif's
// Indicate the table position was externally set // Indicate the table position was externally set
Placed = true; Placed = true;
return false; return false;
} // end of SetRecpos } // end of SetRecpos
/***********************************************************************/ /***********************************************************************/
/* Data Base indexed read routine for ODBC access method. */ /* Data Base indexed read routine for ODBC access method. */
@@ -721,7 +722,7 @@ bool TDBODBC::ReadKey(PGLOBAL g, OPVAL op, const key_range *kr)
Rows = Ocp->ExecDirectSQL((char*)Query->GetStr(), (PODBCCOL)Columns); Rows = Ocp->ExecDirectSQL((char*)Query->GetStr(), (PODBCCOL)Columns);
Mode = MODE_READ; Mode = MODE_READ;
return (Rows < 0); return (Rows < 0);
} // endif key } // endif key
return false; return false;
} else { } else {
@@ -737,7 +738,7 @@ bool TDBODBC::ReadKey(PGLOBAL g, OPVAL op, const key_range *kr)
if ((To_CondFil = hc->CheckCond(g, To_CondFil, Cond))) if ((To_CondFil = hc->CheckCond(g, To_CondFil, Cond)))
PlugSubAlloc(g, NULL, strlen(To_CondFil->Body) + 1); PlugSubAlloc(g, NULL, strlen(To_CondFil->Body) + 1);
} // endif active_index } // endif active_index
if (To_CondFil) if (To_CondFil)
if (Query->Append(" AND ") || Query->Append(To_CondFil->Body)) { if (Query->Append(" AND ") || Query->Append(To_CondFil->Body)) {
@@ -762,7 +763,7 @@ bool TDBODBC::ReadKey(PGLOBAL g, OPVAL op, const key_range *kr)
/* VRDNDOS: Data Base read routine for odbc access method. */ /* VRDNDOS: Data Base read routine for odbc access method. */
/***********************************************************************/ /***********************************************************************/
int TDBODBC::ReadDB(PGLOBAL g) int TDBODBC::ReadDB(PGLOBAL g)
{ {
int rc; int rc;
if (trace(2)) if (trace(2))
@@ -784,7 +785,7 @@ int TDBODBC::ReadDB(PGLOBAL g)
} else } else
return RC_FX; // Error return RC_FX; // Error
} // endif Mode } // endif Mode
/*********************************************************************/ /*********************************************************************/
/* Now start the reading process. */ /* Now start the reading process. */
@@ -813,7 +814,7 @@ int TDBODBC::ReadDB(PGLOBAL g)
Qrp->Nblin++; Qrp->Nblin++;
Fpos++; // Used for memory and pos Fpos++; // Used for memory and pos
} // endif rc } // endif rc
} // endif Placed } // endif Placed
@@ -821,13 +822,13 @@ int TDBODBC::ReadDB(PGLOBAL g)
htrc(" Read: Rbuf=%d rc=%d\n", Rbuf, rc); htrc(" Read: Rbuf=%d rc=%d\n", Rbuf, rc);
return rc; return rc;
} // end of ReadDB } // end of ReadDB
/***********************************************************************/ /***********************************************************************/
/* Data Base Insert write routine for ODBC access method. */ /* Data Base Insert write routine for ODBC access method. */
/***********************************************************************/ /***********************************************************************/
int TDBODBC::WriteDB(PGLOBAL g) int TDBODBC::WriteDB(PGLOBAL g)
{ {
int n = Ocp->ExecuteSQL(); int n = Ocp->ExecuteSQL();
if (n < 0) { if (n < 0) {
@@ -837,13 +838,13 @@ int TDBODBC::WriteDB(PGLOBAL g)
AftRows += n; AftRows += n;
return RC_OK; return RC_OK;
} // end of WriteDB } // end of WriteDB
/***********************************************************************/ /***********************************************************************/
/* Data Base delete line routine for ODBC access method. */ /* Data Base delete line routine for ODBC access method. */
/***********************************************************************/ /***********************************************************************/
int TDBODBC::DeleteDB(PGLOBAL g, int irc) int TDBODBC::DeleteDB(PGLOBAL g, int irc)
{ {
if (irc == RC_FX) { if (irc == RC_FX) {
if (!Query && MakeCommand(g)) if (!Query && MakeCommand(g))
return RC_FX; return RC_FX;
@@ -863,13 +864,13 @@ int TDBODBC::DeleteDB(PGLOBAL g, int irc)
} else } else
return RC_OK; // Ignore return RC_OK; // Ignore
} // end of DeleteDB } // end of DeleteDB
/***********************************************************************/ /***********************************************************************/
/* Data Base close routine for ODBC access method. */ /* Data Base close routine for ODBC access method. */
/***********************************************************************/ /***********************************************************************/
void TDBODBC::CloseDB(PGLOBAL g) void TDBODBC::CloseDB(PGLOBAL g)
{ {
if (Ocp) if (Ocp)
Ocp->Close(); Ocp->Close();
@@ -877,7 +878,7 @@ void TDBODBC::CloseDB(PGLOBAL g)
if (trace(1)) if (trace(1))
htrc("ODBC CloseDB: closing %s\n", Name); htrc("ODBC CloseDB: closing %s\n", Name);
} // end of CloseDB } // end of CloseDB
/* --------------------------- ODBCCOL ------------------------------- */ /* --------------------------- ODBCCOL ------------------------------- */
@@ -886,33 +887,33 @@ void TDBODBC::CloseDB(PGLOBAL g)
/***********************************************************************/ /***********************************************************************/
ODBCCOL::ODBCCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am) ODBCCOL::ODBCCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am)
: EXTCOL(cdp, tdbp, cprec, i, am) : EXTCOL(cdp, tdbp, cprec, i, am)
{ {
// Set additional ODBC access method information for column. // Set additional ODBC access method information for column.
Slen = 0; Slen = 0;
StrLen = &Slen; StrLen = &Slen;
Sqlbuf = NULL; Sqlbuf = NULL;
} // end of ODBCCOL constructor } // end of ODBCCOL constructor
/***********************************************************************/ /***********************************************************************/
/* ODBCCOL private constructor. */ /* ODBCCOL private constructor. */
/***********************************************************************/ /***********************************************************************/
ODBCCOL::ODBCCOL(void) : EXTCOL() ODBCCOL::ODBCCOL(void) : EXTCOL()
{ {
Slen = 0; Slen = 0;
StrLen = &Slen; StrLen = &Slen;
Sqlbuf = NULL; Sqlbuf = NULL;
} // end of ODBCCOL constructor } // end of ODBCCOL constructor
/***********************************************************************/ /***********************************************************************/
/* ODBCCOL constructor used for copying columns. */ /* ODBCCOL constructor used for copying columns. */
/* tdbp is the pointer to the new table descriptor. */ /* tdbp is the pointer to the new table descriptor. */
/***********************************************************************/ /***********************************************************************/
ODBCCOL::ODBCCOL(ODBCCOL *col1, PTDB tdbp) : EXTCOL(col1, tdbp) ODBCCOL::ODBCCOL(ODBCCOL *col1, PTDB tdbp) : EXTCOL(col1, tdbp)
{ {
Slen = col1->Slen; Slen = col1->Slen;
StrLen = col1->StrLen; StrLen = col1->StrLen;
Sqlbuf = col1->Sqlbuf; Sqlbuf = col1->Sqlbuf;
} // end of ODBCCOL copy constructor } // end of ODBCCOL copy constructor
/***********************************************************************/ /***********************************************************************/
/* ReadColumn: when SQLFetch is used there is nothing to do as the */ /* ReadColumn: when SQLFetch is used there is nothing to do as the */
@@ -920,7 +921,7 @@ ODBCCOL::ODBCCOL(ODBCCOL *col1, PTDB tdbp) : EXTCOL(col1, tdbp)
/* when calculating MaxSize (Bufp is NULL even when Rows is not). */ /* when calculating MaxSize (Bufp is NULL even when Rows is not). */
/***********************************************************************/ /***********************************************************************/
void ODBCCOL::ReadColumn(PGLOBAL g) void ODBCCOL::ReadColumn(PGLOBAL g)
{ {
PTDBODBC tdbp = (PTDBODBC)To_Tdb; PTDBODBC tdbp = (PTDBODBC)To_Tdb;
int i = tdbp->Fpos - 1, n = tdbp->CurNum; int i = tdbp->Fpos - 1, n = tdbp->CurNum;
@@ -953,7 +954,7 @@ void ODBCCOL::ReadColumn(PGLOBAL g)
else else
Value->SetValue_pvblk(Blkp, n); Value->SetValue_pvblk(Blkp, n);
} // endif Bufp } // endif Bufp
if (Buf_Type == TYPE_DATE) { if (Buf_Type == TYPE_DATE) {
struct tm dbtime; struct tm dbtime;
@@ -980,7 +981,7 @@ void ODBCCOL::ReadColumn(PGLOBAL g)
htrc("ODBC Column %s: rows=%d buf=%p type=%d value=%s\n", htrc("ODBC Column %s: rows=%d buf=%p type=%d value=%s\n",
Name, tdbp->Rows, Bufp, Buf_Type, Value->GetCharString(buf)); Name, tdbp->Rows, Bufp, Buf_Type, Value->GetCharString(buf));
} // endif trace } // endif trace
put: put:
if (tdbp->Memory != 2) if (tdbp->Memory != 2)
@@ -997,7 +998,7 @@ void ODBCCOL::ReadColumn(PGLOBAL g)
} else } else
Crp->Kdata->SetValue(Value, i); Crp->Kdata->SetValue(Value, i);
} // end of ReadColumn } // end of ReadColumn
/***********************************************************************/ /***********************************************************************/
/* AllocateBuffers: allocate the extended buffer for SQLExtendedFetch */ /* AllocateBuffers: allocate the extended buffer for SQLExtendedFetch */
@@ -1005,7 +1006,7 @@ void ODBCCOL::ReadColumn(PGLOBAL g)
/* for the ending null character. */ /* for the ending null character. */
/***********************************************************************/ /***********************************************************************/
void ODBCCOL::AllocateBuffers(PGLOBAL g, int rows) void ODBCCOL::AllocateBuffers(PGLOBAL g, int rows)
{ {
if (Buf_Type == TYPE_DATE) if (Buf_Type == TYPE_DATE)
Sqlbuf = (TIMESTAMP_STRUCT*)PlugSubAlloc(g, NULL, Sqlbuf = (TIMESTAMP_STRUCT*)PlugSubAlloc(g, NULL,
sizeof(TIMESTAMP_STRUCT)); sizeof(TIMESTAMP_STRUCT));
@@ -1019,31 +1020,31 @@ void ODBCCOL::AllocateBuffers(PGLOBAL g, int rows)
Blkp = AllocValBlock(g, NULL, Buf_Type, rows, GetBuflen(), Blkp = AllocValBlock(g, NULL, Buf_Type, rows, GetBuflen(),
GetScale(), true, false, false); GetScale(), true, false, false);
Bufp = Blkp->GetValPointer(); Bufp = Blkp->GetValPointer();
} // endelse } // endelse
if (rows > 1) if (rows > 1)
StrLen = (SQLLEN *)PlugSubAlloc(g, NULL, rows * sizeof(SQLLEN)); StrLen = (SQLLEN *)PlugSubAlloc(g, NULL, rows * sizeof(SQLLEN));
} // end of AllocateBuffers } // end of AllocateBuffers
/***********************************************************************/ /***********************************************************************/
/* Returns the buffer to use for Fetch or Extended Fetch. */ /* Returns the buffer to use for Fetch or Extended Fetch. */
/***********************************************************************/ /***********************************************************************/
void *ODBCCOL::GetBuffer(DWORD rows) void *ODBCCOL::GetBuffer(DWORD rows)
{ {
if (rows && To_Tdb) { if (rows && To_Tdb) {
assert(rows == (DWORD)((TDBODBC*)To_Tdb)->Rows); assert(rows == (DWORD)((TDBODBC*)To_Tdb)->Rows);
return Bufp; return Bufp;
} else } else
return (Buf_Type == TYPE_DATE) ? Sqlbuf : Value->GetTo_Val(); return (Buf_Type == TYPE_DATE) ? Sqlbuf : Value->GetTo_Val();
} // end of GetBuffer } // end of GetBuffer
/***********************************************************************/ /***********************************************************************/
/* Returns the buffer length to use for Fetch or Extended Fetch. */ /* Returns the buffer length to use for Fetch or Extended Fetch. */
/***********************************************************************/ /***********************************************************************/
SWORD ODBCCOL::GetBuflen(void) SWORD ODBCCOL::GetBuflen(void)
{ {
SWORD flen; SWORD flen;
switch (Buf_Type) { switch (Buf_Type) {
@@ -1059,13 +1060,13 @@ SWORD ODBCCOL::GetBuflen(void)
} // endswitch Buf_Type } // endswitch Buf_Type
return flen; return flen;
} // end of GetBuflen } // end of GetBuflen
/***********************************************************************/ /***********************************************************************/
/* WriteColumn: make sure the bind buffer is updated. */ /* WriteColumn: make sure the bind buffer is updated. */
/***********************************************************************/ /***********************************************************************/
void ODBCCOL::WriteColumn(PGLOBAL g) void ODBCCOL::WriteColumn(PGLOBAL g)
{ {
/*********************************************************************/ /*********************************************************************/
/* Do convert the column value if necessary. */ /* Do convert the column value if necessary. */
/*********************************************************************/ /*********************************************************************/
@@ -1095,7 +1096,7 @@ void ODBCCOL::WriteColumn(PGLOBAL g)
*StrLen = (Value->IsNull()) ? SQL_NULL_DATA : *StrLen = (Value->IsNull()) ? SQL_NULL_DATA :
(IsTypeChar(Buf_Type)) ? SQL_NTS : 0; (IsTypeChar(Buf_Type)) ? SQL_NTS : 0;
} // end of WriteColumn } // end of WriteColumn
/* -------------------------- Class TDBXDBC -------------------------- */ /* -------------------------- Class TDBXDBC -------------------------- */
@@ -1119,7 +1120,7 @@ TDBXDBC::TDBXDBC(PTDBXDBC tdbp) : TDBODBC(tdbp)
} // end of TDBXDBC copy constructor } // end of TDBXDBC copy constructor
PTDB TDBXDBC::Clone(PTABS t) PTDB TDBXDBC::Clone(PTABS t)
{ {
PTDB tp; PTDB tp;
PXSRCCOL cp1, cp2; PXSRCCOL cp1, cp2;
PGLOBAL g = t->G; // Is this really useful ??? PGLOBAL g = t->G; // Is this really useful ???
@@ -1129,29 +1130,29 @@ PTDB TDBXDBC::Clone(PTABS t)
for (cp1 = (PXSRCCOL)Columns; cp1; cp1 = (PXSRCCOL)cp1->GetNext()) { for (cp1 = (PXSRCCOL)Columns; cp1; cp1 = (PXSRCCOL)cp1->GetNext()) {
cp2 = new(g) XSRCCOL(cp1, tp); // Make a copy cp2 = new(g) XSRCCOL(cp1, tp); // Make a copy
NewPointer(t, cp1, cp2); NewPointer(t, cp1, cp2);
} // endfor cp1 } // endfor cp1
return tp; return tp;
} // end of CopyOne } // end of CopyOne
/***********************************************************************/ /***********************************************************************/
/* Allocate XSRC column description block. */ /* Allocate XSRC column description block. */
/***********************************************************************/ /***********************************************************************/
PCOL TDBXDBC::MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) PCOL TDBXDBC::MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n)
{ {
PXSRCCOL colp = new(g) XSRCCOL(cdp, this, cprec, n); PXSRCCOL colp = new(g) XSRCCOL(cdp, this, cprec, n);
if (!colp->Flag) if (!colp->Flag)
Cmdcol = colp->GetName(); Cmdcol = colp->GetName();
return colp; return colp;
} // end of MakeCol } // end of MakeCol
/***********************************************************************/ /***********************************************************************/
/* MakeCMD: make the SQL statement to send to ODBC connection. */ /* MakeCMD: make the SQL statement to send to ODBC connection. */
/***********************************************************************/ /***********************************************************************/
PCMD TDBXDBC::MakeCMD(PGLOBAL g) PCMD TDBXDBC::MakeCMD(PGLOBAL g)
{ {
PCMD xcmd = NULL; PCMD xcmd = NULL;
if (To_CondFil) { if (To_CondFil) {
@@ -1171,14 +1172,14 @@ PCMD TDBXDBC::MakeCMD(PGLOBAL g)
xcmd = new(g) CMD(g, Srcdef); xcmd = new(g) CMD(g, Srcdef);
return xcmd; return xcmd;
} // end of MakeCMD } // end of MakeCMD
#if 0 #if 0
/***********************************************************************/ /***********************************************************************/
/* ODBC Bind Parameter function. */ /* ODBC Bind Parameter function. */
/***********************************************************************/ /***********************************************************************/
bool TDBXDBC::BindParameters(PGLOBAL g) bool TDBXDBC::BindParameters(PGLOBAL g)
{ {
PODBCCOL colp; PODBCCOL colp;
for (colp = (PODBCCOL)Columns; colp; colp = (PODBCCOL)colp->Next) { for (colp = (PODBCCOL)Columns; colp; colp = (PODBCCOL)colp->Next) {
@@ -1190,19 +1191,19 @@ bool TDBXDBC::BindParameters(PGLOBAL g)
} // endfor colp } // endfor colp
return false; return false;
} // end of BindParameters } // end of BindParameters
#endif // 0 #endif // 0
/***********************************************************************/ /***********************************************************************/
/* XDBC GetMaxSize: returns table size (not always one row). */ /* XDBC GetMaxSize: returns table size (not always one row). */
/***********************************************************************/ /***********************************************************************/
int TDBXDBC::GetMaxSize(PGLOBAL g) int TDBXDBC::GetMaxSize(PGLOBAL g)
{ {
if (MaxSize < 0) if (MaxSize < 0)
MaxSize = 10; // Just a guess MaxSize = 10; // Just a guess
return MaxSize; return MaxSize;
} // end of GetMaxSize } // end of GetMaxSize
/***********************************************************************/ /***********************************************************************/
/* ODBC Access Method opening routine. */ /* ODBC Access Method opening routine. */
@@ -1211,7 +1212,7 @@ int TDBXDBC::GetMaxSize(PGLOBAL g)
/* join block of next table if it exists or else are discarted. */ /* join block of next table if it exists or else are discarted. */
/***********************************************************************/ /***********************************************************************/
bool TDBXDBC::OpenDB(PGLOBAL g) bool TDBXDBC::OpenDB(PGLOBAL g)
{ {
bool rc = false; bool rc = false;
if (trace(1)) if (trace(1))
@@ -1221,7 +1222,7 @@ bool TDBXDBC::OpenDB(PGLOBAL g)
if (Use == USE_OPEN) { if (Use == USE_OPEN) {
strcpy(g->Message, "Multiple execution is not allowed"); strcpy(g->Message, "Multiple execution is not allowed");
return true; return true;
} // endif use } // endif use
/*********************************************************************/ /*********************************************************************/
/* Open an ODBC connection for this table. */ /* Open an ODBC connection for this table. */
@@ -1243,7 +1244,7 @@ bool TDBXDBC::OpenDB(PGLOBAL g)
if (Mode != MODE_READ && Mode != MODE_READX) { if (Mode != MODE_READ && Mode != MODE_READX) {
strcpy(g->Message, "No INSERT/DELETE/UPDATE of XDBC tables"); strcpy(g->Message, "No INSERT/DELETE/UPDATE of XDBC tables");
return true; return true;
} // endif Mode } // endif Mode
/*********************************************************************/ /*********************************************************************/
/* Get the command to execute. */ /* Get the command to execute. */
@@ -1256,13 +1257,13 @@ bool TDBXDBC::OpenDB(PGLOBAL g)
Rows = 1; Rows = 1;
return false; return false;
} // end of OpenDB } // end of OpenDB
/***********************************************************************/ /***********************************************************************/
/* ReadDB: Data Base read routine for xdbc access method. */ /* ReadDB: Data Base read routine for xdbc access method. */
/***********************************************************************/ /***********************************************************************/
int TDBXDBC::ReadDB(PGLOBAL g) int TDBXDBC::ReadDB(PGLOBAL g)
{ {
if (Cmdlist) { if (Cmdlist) {
if (!Query) if (!Query)
Query = new(g)STRING(g, 0, Cmdlist->Cmd); Query = new(g)STRING(g, 0, Cmdlist->Cmd);
@@ -1280,25 +1281,25 @@ int TDBXDBC::ReadDB(PGLOBAL g)
return RC_EF; return RC_EF;
} // endif Cmdlist } // endif Cmdlist
} // end of ReadDB } // end of ReadDB
/***********************************************************************/ /***********************************************************************/
/* Data Base delete line routine for ODBC access method. */ /* Data Base write line routine for XDBC access method. */
/***********************************************************************/ /***********************************************************************/
int TDBXDBC::WriteDB(PGLOBAL g) int TDBXDBC::WriteDB(PGLOBAL g)
{ {
strcpy(g->Message, "Execsrc tables are read only"); strcpy(g->Message, "Execsrc tables are read only");
return RC_FX; return RC_FX;
} // end of DeleteDB } // end of DeleteDB
/***********************************************************************/ /***********************************************************************/
/* Data Base delete line routine for ODBC access method. */ /* Data Base delete line routine for XDBC access method. */
/***********************************************************************/ /***********************************************************************/
int TDBXDBC::DeleteDB(PGLOBAL g, int irc) int TDBXDBC::DeleteDB(PGLOBAL g, int irc)
{ {
strcpy(g->Message, MSG(NO_ODBC_DELETE)); strcpy(g->Message, MSG(NO_ODBC_DELETE));
return RC_FX; return RC_FX;
} // end of DeleteDB } // end of DeleteDB
/* --------------------------- XSRCCOL ------------------------------- */ /* --------------------------- XSRCCOL ------------------------------- */
@@ -1307,25 +1308,25 @@ int TDBXDBC::DeleteDB(PGLOBAL g, int irc)
/***********************************************************************/ /***********************************************************************/
XSRCCOL::XSRCCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am) XSRCCOL::XSRCCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am)
: ODBCCOL(cdp, tdbp, cprec, i, am) : ODBCCOL(cdp, tdbp, cprec, i, am)
{ {
// Set additional ODBC access method information for column. // Set additional ODBC access method information for column.
Flag = cdp->GetOffset(); Flag = cdp->GetOffset();
} // end of XSRCCOL constructor } // end of XSRCCOL constructor
/***********************************************************************/ /***********************************************************************/
/* XSRCCOL constructor used for copying columns. */ /* XSRCCOL constructor used for copying columns. */
/* tdbp is the pointer to the new table descriptor. */ /* tdbp is the pointer to the new table descriptor. */
/***********************************************************************/ /***********************************************************************/
XSRCCOL::XSRCCOL(XSRCCOL *col1, PTDB tdbp) : ODBCCOL(col1, tdbp) XSRCCOL::XSRCCOL(XSRCCOL *col1, PTDB tdbp) : ODBCCOL(col1, tdbp)
{ {
Flag = col1->Flag; Flag = col1->Flag;
} // end of XSRCCOL copy constructor } // end of XSRCCOL copy constructor
/***********************************************************************/ /***********************************************************************/
/* ReadColumn: set column value according to Flag. */ /* ReadColumn: set column value according to Flag. */
/***********************************************************************/ /***********************************************************************/
void XSRCCOL::ReadColumn(PGLOBAL g) void XSRCCOL::ReadColumn(PGLOBAL g)
{ {
PTDBXDBC tdbp = (PTDBXDBC)To_Tdb; PTDBXDBC tdbp = (PTDBXDBC)To_Tdb;
switch (Flag) { switch (Flag) {
@@ -1335,15 +1336,15 @@ void XSRCCOL::ReadColumn(PGLOBAL g)
default: Value->SetValue_psz("Invalid Flag"); break; default: Value->SetValue_psz("Invalid Flag"); break;
} // endswitch Flag } // endswitch Flag
} // end of ReadColumn } // end of ReadColumn
/***********************************************************************/ /***********************************************************************/
/* WriteColumn: Should never be called. */ /* WriteColumn: Should never be called. */
/***********************************************************************/ /***********************************************************************/
void XSRCCOL::WriteColumn(PGLOBAL g) void XSRCCOL::WriteColumn(PGLOBAL g)
{ {
// Should never be called // Should never be called
} // end of WriteColumn } // end of WriteColumn
/* ---------------------------TDBDRV class --------------------------- */ /* ---------------------------TDBDRV class --------------------------- */
@@ -1351,9 +1352,9 @@ void XSRCCOL::WriteColumn(PGLOBAL g)
/* GetResult: Get the list of ODBC drivers. */ /* GetResult: Get the list of ODBC drivers. */
/***********************************************************************/ /***********************************************************************/
PQRYRES TDBDRV::GetResult(PGLOBAL g) PQRYRES TDBDRV::GetResult(PGLOBAL g)
{ {
return ODBCDrivers(g, Maxres, false); return ODBCDrivers(g, Maxres, false);
} // end of GetResult } // end of GetResult
/* ---------------------------TDBSRC class --------------------------- */ /* ---------------------------TDBSRC class --------------------------- */
@@ -1361,9 +1362,9 @@ PQRYRES TDBDRV::GetResult(PGLOBAL g)
/* GetResult: Get the list of ODBC data sources. */ /* GetResult: Get the list of ODBC data sources. */
/***********************************************************************/ /***********************************************************************/
PQRYRES TDBSRC::GetResult(PGLOBAL g) PQRYRES TDBSRC::GetResult(PGLOBAL g)
{ {
return ODBCDataSources(g, Maxres, false); return ODBCDataSources(g, Maxres, false);
} // end of GetResult } // end of GetResult
/* ---------------------------TDBOTB class --------------------------- */ /* ---------------------------TDBOTB class --------------------------- */
@@ -1371,7 +1372,7 @@ PQRYRES TDBSRC::GetResult(PGLOBAL g)
/* TDBOTB class constructor. */ /* TDBOTB class constructor. */
/***********************************************************************/ /***********************************************************************/
TDBOTB::TDBOTB(PODEF tdp) : TDBDRV(tdp) TDBOTB::TDBOTB(PODEF tdp) : TDBDRV(tdp)
{ {
Dsn = tdp->GetConnect(); Dsn = tdp->GetConnect();
Schema = tdp->GetTabschema(); Schema = tdp->GetTabschema();
Tab = tdp->GetTabname(); Tab = tdp->GetTabname();
@@ -1381,15 +1382,15 @@ TDBOTB::TDBOTB(PODEF tdp) : TDBDRV(tdp)
Ops.Cto = tdp->Cto; Ops.Cto = tdp->Cto;
Ops.Qto = tdp->Qto; Ops.Qto = tdp->Qto;
Ops.UseCnc = tdp->UseCnc; Ops.UseCnc = tdp->UseCnc;
} // end of TDBOTB constructor } // end of TDBOTB constructor
/***********************************************************************/ /***********************************************************************/
/* GetResult: Get the list of ODBC tables. */ /* GetResult: Get the list of ODBC tables. */
/***********************************************************************/ /***********************************************************************/
PQRYRES TDBOTB::GetResult(PGLOBAL g) PQRYRES TDBOTB::GetResult(PGLOBAL g)
{ {
return ODBCTables(g, Dsn, Schema, Tab, Tabtyp, Maxres, false, &Ops); return ODBCTables(g, Dsn, Schema, Tab, Tabtyp, Maxres, false, &Ops);
} // end of GetResult } // end of GetResult
/* ---------------------------TDBOCL class --------------------------- */ /* ---------------------------TDBOCL class --------------------------- */
@@ -1405,8 +1406,8 @@ TDBOCL::TDBOCL(PODEF tdp) : TDBOTB(tdp)
/* GetResult: Get the list of ODBC table columns. */ /* GetResult: Get the list of ODBC table columns. */
/***********************************************************************/ /***********************************************************************/
PQRYRES TDBOCL::GetResult(PGLOBAL g) PQRYRES TDBOCL::GetResult(PGLOBAL g)
{ {
return ODBCColumns(g, Dsn, Schema, Tab, Colpat, Maxres, false, &Ops); return ODBCColumns(g, Dsn, Schema, Tab, Colpat, Maxres, false, &Ops);
} // end of GetResult } // end of GetResult
/* ------------------------ End of Tabodbc --------------------------- */ /* ------------------------ End of Tabodbc --------------------------- */

13
storage/connect/tabxml.cpp
View File

@@ -681,6 +681,14 @@ PTDB TDBXML::Clone(PTABS t)
return tp; return tp;
} // end of Clone } // end of Clone
/***********************************************************************/
/* Must not be in tabxml.h because of OEM tables */
/***********************************************************************/
const CHARSET_INFO *TDBXML::data_charset()
{
return &my_charset_utf8_general_ci;
} // end of data_charset
/***********************************************************************/ /***********************************************************************/
/* Allocate XML column description block. */ /* Allocate XML column description block. */
/***********************************************************************/ /***********************************************************************/
@@ -2209,8 +2217,9 @@ void XPOSCOL::WriteColumn(PGLOBAL g)
TDBXCT::TDBXCT(PXMLDEF tdp) : TDBCAT(tdp) TDBXCT::TDBXCT(PXMLDEF tdp) : TDBCAT(tdp)
{ {
Topt = tdp->GetTopt(); Topt = tdp->GetTopt();
Db = (char*)tdp->GetDB(); //Db = (char*)tdp->GetDB();
Tabn = tdp->Tabname; Db = (char*)tdp->Schema;
Tabn = tdp->Tabname;
} // end of TDBXCT constructor } // end of TDBXCT constructor
/***********************************************************************/ /***********************************************************************/

5
storage/connect/tabxml.h
View File

@@ -9,6 +9,8 @@ typedef class XMLDEF *PXMLDEF;
typedef class TDBXML *PTDBXML; typedef class TDBXML *PTDBXML;
typedef class XMLCOL *PXMLCOL; typedef class XMLCOL *PXMLCOL;
DllExport PQRYRES XMLColumns(PGLOBAL, char *, char *, PTOS, bool);
/* --------------------------- XML classes --------------------------- */ /* --------------------------- XML classes --------------------------- */
/***********************************************************************/ /***********************************************************************/
@@ -100,8 +102,7 @@ class DllExport TDBXML : public TDBASE {
virtual int DeleteDB(PGLOBAL g, int irc); virtual int DeleteDB(PGLOBAL g, int irc);
virtual void CloseDB(PGLOBAL g); virtual void CloseDB(PGLOBAL g);
virtual int CheckWrite(PGLOBAL g) {Checked = true; return 0;} virtual int CheckWrite(PGLOBAL g) {Checked = true; return 0;}
virtual const CHARSET_INFO *data_charset() virtual const CHARSET_INFO *data_charset();
{return &my_charset_utf8_general_ci;}
protected: protected:
// Members // Members

4
storage/connect/user_connect.cc
View File

@@ -107,7 +107,7 @@ bool user_connect::user_init()
g= PlugInit(NULL, worksize); g= PlugInit(NULL, worksize);
// Check whether the initialization is complete // Check whether the initialization is complete
if (!g || !g->Sarea || PlugSubSet(g, g->Sarea, g->Sarea_Size) if (!g || !g->Sarea || PlugSubSet(g->Sarea, g->Sarea_Size)
|| !(dup= PlgMakeUser(g))) { || !(dup= PlgMakeUser(g))) {
if (g) if (g)
printf("%s\n", g->Message); printf("%s\n", g->Message);
@@ -172,7 +172,7 @@ bool user_connect::CheckCleanup(bool force)
} // endif worksize } // endif worksize
PlugSubSet(g, g->Sarea, g->Sarea_Size); PlugSubSet(g->Sarea, g->Sarea_Size);
g->Xchk = NULL; g->Xchk = NULL;
g->Createas = 0; g->Createas = 0;
g->Alchecked = 0; g->Alchecked = 0;