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
105 lines
4.2 KiB
C++
105 lines
4.2 KiB
C++
/*************** Catalog H Declares Source Code File (.H) **************/
|
|
/* Name: CATALOG.H Version 3.3 */
|
|
/* */
|
|
/* (C) Copyright to the author Olivier BERTRAND 2000-2015 */
|
|
/* */
|
|
/* This file contains the CATALOG PlugDB classes definitions. */
|
|
/***********************************************************************/
|
|
#ifndef __CATALOG__H
|
|
#define __CATALOG__H
|
|
|
|
#include "block.h"
|
|
|
|
/***********************************************************************/
|
|
/* Defines the length of a buffer to contain entire table section. */
|
|
/***********************************************************************/
|
|
#define PLG_MAX_PATH 144 /* Must be the same across systems */
|
|
#define PLG_BUFF_LEN 100 /* Number of lines in binary file buffer */
|
|
|
|
|
|
//typedef class INDEXDEF *PIXDEF;
|
|
|
|
/***********************************************************************/
|
|
/* Defines the structure used to enumerate tables or views. */
|
|
/***********************************************************************/
|
|
typedef struct _curtab {
|
|
PRELDEF CurTdb;
|
|
char *Curp;
|
|
char *Tabpat;
|
|
bool Ispat;
|
|
bool NoView;
|
|
int Nt;
|
|
char *Type[16];
|
|
} CURTAB, *PCURTAB;
|
|
|
|
/***********************************************************************/
|
|
/* Defines the structure used to get column catalog info. */
|
|
/***********************************************************************/
|
|
typedef struct _colinfo {
|
|
PCSZ Name;
|
|
int Type;
|
|
int Offset;
|
|
int Length;
|
|
int Key;
|
|
int Precision;
|
|
int Scale;
|
|
int Opt;
|
|
int Freq;
|
|
PCSZ Remark;
|
|
PCSZ Datefmt;
|
|
PCSZ Fieldfmt;
|
|
ushort Flags; // Used by MariaDB CONNECT handlers
|
|
} COLINFO, *PCOLINFO;
|
|
|
|
/***********************************************************************/
|
|
/* CATALOG: base class for catalog classes. */
|
|
/***********************************************************************/
|
|
class DllExport CATALOG {
|
|
friend class RELDEF;
|
|
friend class TABDEF;
|
|
friend class DIRDEF;
|
|
friend class OEMDEF;
|
|
public:
|
|
CATALOG(void); // Constructor
|
|
virtual ~CATALOG() { } // Make -Wdelete-non-virtual-dtor happy
|
|
|
|
// Implementation
|
|
int GetCblen(void) {return Cblen;}
|
|
bool GetDefHuge(void) {return DefHuge;}
|
|
void SetDefHuge(bool b) {DefHuge = b;}
|
|
char *GetCbuf(void) {return Cbuf;}
|
|
|
|
// Methods
|
|
virtual void Reset(void) {}
|
|
virtual bool CheckName(PGLOBAL, char*) {return true;}
|
|
virtual bool ClearName(PGLOBAL, PSZ) {return true;}
|
|
virtual PRELDEF MakeOneTableDesc(PGLOBAL, LPCSTR, LPCSTR) {return NULL;}
|
|
virtual PRELDEF GetTableDescEx(PGLOBAL, PTABLE) {return NULL;}
|
|
//virtual PRELDEF GetTableDesc(PGLOBAL, LPCSTR, LPCSTR,
|
|
// PRELDEF* = NULL) {return NULL;}
|
|
virtual PRELDEF GetFirstTable(PGLOBAL) {return NULL;}
|
|
virtual PRELDEF GetNextTable(PGLOBAL) {return NULL;}
|
|
virtual bool TestCond(PGLOBAL, const char*, const char*) {return true;}
|
|
virtual bool DropTable(PGLOBAL, PSZ, bool) {return true;}
|
|
virtual PTDB GetTable(PGLOBAL, PTABLE,
|
|
MODE = MODE_READ, LPCSTR = NULL) {return NULL;}
|
|
virtual void TableNames(PGLOBAL, char*, int, int[]) {}
|
|
virtual void ColumnNames(PGLOBAL, char*, char*, int, int[]) {}
|
|
virtual void ColumnDefs(PGLOBAL, char*, char*, int, int[]) {}
|
|
virtual void *DecodeValues(PGLOBAL, char*, char*, char*,
|
|
int, int[]) {return NULL;}
|
|
virtual int ColumnType(PGLOBAL, char*, char*) {return 0;}
|
|
virtual void ClearDB(PGLOBAL) {}
|
|
|
|
protected:
|
|
virtual bool ClearSection(PGLOBAL, const char*, const char*) {return true;}
|
|
//virtual PRELDEF MakeTableDesc(PGLOBAL, LPCSTR, LPCSTR) {return NULL;}
|
|
|
|
// Members
|
|
char *Cbuf; /* Buffer used for col section */
|
|
int Cblen; /* Length of suballoc. buffer */
|
|
CURTAB Ctb; /* Used to enumerate tables */
|
|
bool DefHuge; /* true: tables default to huge */
|
|
}; // end of class CATALOG
|
|
|
|
#endif // __CATALOG__H
|