mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
1c88b9a8d3
When null and the column is NOT NULL the value was not reset. modified: storage/connect/tabjson.cpp Fix converting bstr_t string to set error message modified: storage/connect/domdoc.cpp Fix MDEV-12768: -Wformat-overflow compile warnings modified: storage/connect/global.h modified: storage/connect/jsonudf.cpp modified: storage/connect/plugutil.cpp modified: storage/connect/tabvct.cpp Typo (in external_lock) modified: storage/connect/ha_connect.cc Remove some warnings modified: storage/connect/odbconn.cpp modified: storage/connect/tabmysql.cpp Add MEM_RESERVE flag to virtualAlloc modified: storage/connect/plgdbutl.cpp Fix MDEV-12573: Accept=1 may show incorrect value for NULL column in CONNECT TBL modified: storage/connect/tabutil.cpp Fix wrong setting of key size when greater than 2G modified: storage/connect/xindex.cpp Fixing MDEV-12149: compile errors on Windows with /Zc:strictStrings Introduce typedef PCSZ and replace PSZ by it where it matters All done on CONNECT but compile still fails because of an included system file modified: storage/connect/array.cpp modified: storage/connect/catalog.h modified: storage/connect/colblk.cpp modified: storage/connect/colblk.h modified: storage/connect/connect.cc modified: storage/connect/domdoc.cpp modified: storage/connect/domdoc.h modified: storage/connect/filamdbf.cpp modified: storage/connect/filamdbf.h modified: storage/connect/filamfix.cpp modified: storage/connect/filamgz.cpp modified: storage/connect/filamtxt.h modified: storage/connect/filamvct.cpp modified: storage/connect/filamvct.h modified: storage/connect/filamzip.cpp modified: storage/connect/filamzip.h modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h modified: storage/connect/jdbccat.h modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/json.cpp modified: storage/connect/json.h modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h modified: storage/connect/libdoc.cpp modified: storage/connect/macutil.cpp modified: storage/connect/myconn.cpp modified: storage/connect/myutil.cpp modified: storage/connect/myutil.h modified: storage/connect/odbccat.h modified: storage/connect/odbconn.cpp modified: storage/connect/odbconn.h modified: storage/connect/os.h modified: storage/connect/plgdbsem.h modified: storage/connect/plgdbutl.cpp modified: storage/connect/plgxml.cpp modified: storage/connect/plgxml.h modified: storage/connect/plugutil.cpp modified: storage/connect/preparse.h modified: storage/connect/reldef.cpp modified: storage/connect/reldef.h modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h modified: storage/connect/tabext.cpp modified: storage/connect/tabext.h modified: storage/connect/tabfix.cpp modified: storage/connect/tabfix.h modified: storage/connect/tabfmt.cpp modified: storage/connect/tabfmt.h modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjdbc.h modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h modified: storage/connect/table.cpp modified: storage/connect/tabmac.cpp modified: storage/connect/tabmul.cpp modified: storage/connect/tabmul.h modified: storage/connect/tabmysql.cpp modified: storage/connect/tabmysql.h modified: storage/connect/tabodbc.cpp modified: storage/connect/tabodbc.h modified: storage/connect/tabpivot.cpp modified: storage/connect/tabpivot.h modified: storage/connect/tabsys.cpp modified: storage/connect/tabsys.h modified: storage/connect/tabutil.cpp modified: storage/connect/tabutil.h modified: storage/connect/tabvir.cpp modified: storage/connect/tabvir.h modified: storage/connect/tabwmi.cpp modified: storage/connect/tabwmi.h modified: storage/connect/tabxml.cpp modified: storage/connect/tabxml.h modified: storage/connect/tabzip.cpp modified: storage/connect/tabzip.h modified: storage/connect/valblk.cpp modified: storage/connect/valblk.h modified: storage/connect/value.cpp modified: storage/connect/value.h modified: storage/connect/xindex.cpp modified: storage/connect/xobject.cpp modified: storage/connect/xobject.h modified: storage/connect/xtable.h Fix MDEV-12603 Insert replaces values in ZIP file modified: storage/connect/filamzip.cpp modified: storage/connect/filamzip.h Fix MDEV-12686 Handle null in json Fix MDEV-12688 Insert does not handle type TINYINT modified: storage/connect/json.cpp modified: storage/connect/tabjson.cpp Fix MDEV-12653 Cannot add index for ZIP CONNECT table modified: storage/connect/filamzip.cpp modified: storage/connect/ha_connect.cc modified: storage/connect/tabdos.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/xindex.cpp
154 lines
5.2 KiB
C++
154 lines
5.2 KiB
C++
// TABUTIL.H Olivier Bertrand 2013
|
|
// Defines the TAB catalog tables
|
|
|
|
#ifndef TABUTIL
|
|
#define TABUTIL 1
|
|
|
|
//#include "tabtbl.h"
|
|
|
|
typedef class PRXDEF *PPRXDEF;
|
|
typedef class TDBPRX *PTDBPRX;
|
|
typedef class XXLCOL *PXXLCOL;
|
|
typedef class PRXCOL *PPRXCOL;
|
|
typedef class TBCDEF *PTBCDEF;
|
|
typedef class TDBTBC *PTDBTBC;
|
|
|
|
TABLE_SHARE *GetTableShare(PGLOBAL g, THD *thd, const char *db,
|
|
const char *name, bool& mysql);
|
|
PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
|
|
const char *name, bool& info);
|
|
|
|
void Remove_tshp(PCATLG cat);
|
|
|
|
/* -------------------------- PROXY classes -------------------------- */
|
|
|
|
/***********************************************************************/
|
|
/* PROXY: table based on another table. Can be used to have a */
|
|
/* different view on an existing table. */
|
|
/* However, its real use is to be the base of TBL and PRX tables. */
|
|
/***********************************************************************/
|
|
|
|
/***********************************************************************/
|
|
/* PRX table. */
|
|
/***********************************************************************/
|
|
class DllExport PRXDEF : public TABDEF { /* Logical table description */
|
|
friend class TDBPRX;
|
|
friend class TDBTBC;
|
|
public:
|
|
// Constructor
|
|
PRXDEF(void);
|
|
|
|
// Implementation
|
|
virtual const char *GetType(void) {return "PRX";}
|
|
|
|
// Methods
|
|
virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
|
|
virtual PTDB GetTable(PGLOBAL g, MODE mode);
|
|
|
|
protected:
|
|
// Members
|
|
PTABLE Tablep; /* The object table */
|
|
}; // end of PRXDEF
|
|
|
|
/***********************************************************************/
|
|
/* This is the class declaration for the XCSV table. */
|
|
/***********************************************************************/
|
|
class DllExport TDBPRX : public TDBASE {
|
|
friend class PRXDEF;
|
|
friend class PRXCOL;
|
|
public:
|
|
// Constructors
|
|
TDBPRX(PPRXDEF tdp);
|
|
TDBPRX(PTDBPRX tdbp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_PRX;}
|
|
virtual PTDB Duplicate(PGLOBAL g)
|
|
{return (PTDB)new(g) TDBPRX(this);}
|
|
|
|
// Methods
|
|
virtual PTDB Clone(PTABS t);
|
|
virtual int GetRecpos(void) {return Tdbp->GetRecpos();}
|
|
virtual void ResetDB(void) {Tdbp->ResetDB();}
|
|
virtual int RowNumber(PGLOBAL g, bool b = FALSE);
|
|
virtual PCSZ GetServer(void) {return (Tdbp) ? Tdbp->GetServer() : (PSZ)"?";}
|
|
|
|
// Database routines
|
|
virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
|
|
virtual bool InitTable(PGLOBAL g);
|
|
virtual int Cardinality(PGLOBAL g);
|
|
virtual int GetMaxSize(PGLOBAL g);
|
|
virtual bool OpenDB(PGLOBAL g);
|
|
virtual int ReadDB(PGLOBAL g);
|
|
virtual int WriteDB(PGLOBAL g);
|
|
virtual int DeleteDB(PGLOBAL g, int irc);
|
|
virtual void CloseDB(PGLOBAL g) {if (Tdbp) Tdbp->CloseDB(g);}
|
|
PTDB GetSubTable(PGLOBAL g, PTABLE tabp, bool b = false);
|
|
void RemoveNext(PTABLE tp);
|
|
|
|
protected:
|
|
// Members
|
|
PTDB Tdbp; // The object table
|
|
}; // end of class TDBPRX
|
|
|
|
/***********************************************************************/
|
|
/* Class PRXCOL: PRX access method column descriptor. */
|
|
/* This A.M. is used for PRX tables. */
|
|
/***********************************************************************/
|
|
class DllExport PRXCOL : public COLBLK {
|
|
friend class TDBPRX;
|
|
friend class TDBTBL;
|
|
friend class TDBOCCUR;
|
|
public:
|
|
// Constructors
|
|
PRXCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am = "PRX");
|
|
PRXCOL(PRXCOL *colp, PTDB tdbp); // Constructor used in copy process
|
|
|
|
// Implementation
|
|
virtual int GetAmType(void) {return TYPE_AM_PRX;}
|
|
|
|
// Methods
|
|
using COLBLK::Init;
|
|
virtual void Reset(void);
|
|
virtual bool IsSpecial(void) {return Pseudo;}
|
|
virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check)
|
|
{return false;}
|
|
virtual void ReadColumn(PGLOBAL g);
|
|
virtual void WriteColumn(PGLOBAL g);
|
|
virtual bool Init(PGLOBAL g, PTDB tp);
|
|
|
|
protected:
|
|
char *Decode(PGLOBAL g, const char *cnm);
|
|
|
|
// Default constructor not to be used
|
|
PRXCOL(void) {}
|
|
|
|
// Members
|
|
PCOL Colp; // Points to matching table column
|
|
PVAL To_Val; // To the matching column value
|
|
bool Pseudo; // TRUE for special columns
|
|
int Colnum; // Used when retrieving columns by number
|
|
}; // end of class PRXCOL
|
|
|
|
/***********************************************************************/
|
|
/* This is the class declaration for the TBC column catalog table. */
|
|
/***********************************************************************/
|
|
class TDBTBC : public TDBCAT {
|
|
public:
|
|
// Constructors
|
|
TDBTBC(PPRXDEF tdp);
|
|
|
|
protected:
|
|
// Specific routines
|
|
virtual PQRYRES GetResult(PGLOBAL g);
|
|
|
|
// Members
|
|
PSZ Db; // Database of the table
|
|
PSZ Tab; // Table name
|
|
}; // end of class TDBMCL
|
|
|
|
class XCOLBLK : public COLBLK {
|
|
friend class PRXCOL;
|
|
}; // end of class XCOLBLK
|
|
|
|
#endif // TABUTIL
|