mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +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
115 lines
4.2 KiB
C++
115 lines
4.2 KiB
C++
/*************** TabDos H Declares Source Code File (.H) ***************/
|
|
/* Name: TABFIX.H Version 2.4 */
|
|
/* */
|
|
/* (C) Copyright to the author Olivier BERTRAND 1999-2015 */
|
|
/* */
|
|
/* This file contains the TDBFIX and (FIX/BIN)COL classes declares. */
|
|
/***********************************************************************/
|
|
#ifndef __TABFIX__
|
|
#define __TABFIX__
|
|
#include "tabdos.h" /* Base class declares */
|
|
#include "filamdbf.h"
|
|
|
|
typedef class FIXCOL *PFIXCOL;
|
|
typedef class BINCOL *PBINCOL;
|
|
typedef class TXTFAM *PTXF;
|
|
|
|
/***********************************************************************/
|
|
/* This is the DOS/UNIX Access Method class declaration for files */
|
|
/* that are standard files with columns starting at fixed offset. */
|
|
/* This class is for fixed formatted files. */
|
|
/***********************************************************************/
|
|
class DllExport TDBFIX : public TDBDOS {
|
|
friend class FIXCOL;
|
|
friend class BINCOL;
|
|
public:
|
|
// Constructor
|
|
TDBFIX(PDOSDEF tdp, PTXF txfp);
|
|
TDBFIX(PGLOBAL g, PTDBFIX tdbp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_FIX;}
|
|
virtual void RestoreNrec(void);
|
|
virtual PTDB Duplicate(PGLOBAL g)
|
|
{return (PTDB)new(g) TDBFIX(g, this);}
|
|
|
|
// Methods
|
|
virtual PTDB Clone(PTABS t);
|
|
virtual void ResetDB(void);
|
|
virtual bool IsUsingTemp(PGLOBAL g);
|
|
virtual int RowNumber(PGLOBAL g, bool b = false);
|
|
virtual int ResetTableOpt(PGLOBAL g, bool dop, bool dox);
|
|
virtual void ResetSize(void);
|
|
virtual int GetBadLines(void) {return Txfp->GetNerr();}
|
|
|
|
// Database routines
|
|
virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
|
|
virtual int GetProgMax(PGLOBAL g);
|
|
virtual int Cardinality(PGLOBAL g);
|
|
virtual int GetMaxSize(PGLOBAL g);
|
|
virtual bool OpenDB(PGLOBAL g);
|
|
virtual int WriteDB(PGLOBAL g);
|
|
|
|
protected:
|
|
virtual bool PrepareWriting(PGLOBAL g) {return false;}
|
|
|
|
// Members
|
|
char Teds; /* Binary table default endian setting */
|
|
}; // end of class TDBFIX
|
|
|
|
/***********************************************************************/
|
|
/* Class BINCOL: BIN access method column descriptor. */
|
|
/* This A.M. is used for file processed by blocks. */
|
|
/***********************************************************************/
|
|
class DllExport BINCOL : public DOSCOL {
|
|
friend class TDBFIX;
|
|
public:
|
|
// Constructors
|
|
BINCOL(PGLOBAL g, PCOLDEF cdp, PTDB tp, PCOL cp, int i, PCSZ am = "BIN");
|
|
BINCOL(BINCOL *colp, PTDB tdbp); // Constructor used in copy process
|
|
|
|
// Implementation
|
|
virtual int GetAmType(void) {return TYPE_AM_BIN;}
|
|
int GetDeplac(void) {return Deplac;}
|
|
int GetFileSize(void)
|
|
{return N ? N : GetTypeSize(Buf_Type, Long);}
|
|
|
|
// Methods
|
|
virtual void ReadColumn(PGLOBAL g);
|
|
virtual void WriteColumn(PGLOBAL g);
|
|
|
|
// Static
|
|
static void SetEndian(void);
|
|
|
|
protected:
|
|
BINCOL(void) {} // Default constructor not to be used
|
|
|
|
// Members
|
|
static char Endian; // The host endian setting (L or B)
|
|
char *Buff; // Utility buffer
|
|
char Eds; // The file endian setting
|
|
char Fmt; // The converted value format
|
|
int N; // The number of bytes in the file
|
|
int M; // The buffer type size
|
|
int Lim; // Min(N,M)
|
|
}; // end of class BINCOL
|
|
|
|
/***********************************************************************/
|
|
/* This is the class declaration for the DBF columns catalog table. */
|
|
/***********************************************************************/
|
|
class TDBDCL : public TDBCAT {
|
|
public:
|
|
// Constructor
|
|
TDBDCL(PDOSDEF tdp) : TDBCAT(tdp) {Fn = tdp->GetFn();}
|
|
|
|
protected:
|
|
// Specific routines
|
|
virtual PQRYRES GetResult(PGLOBAL g)
|
|
{return DBFColumns(g, ((PTABDEF)To_Def)->GetPath(), Fn, false);}
|
|
|
|
// Members
|
|
PCSZ Fn; // The DBF file (path) name
|
|
}; // end of class TDBOCL
|
|
|
|
|
|
#endif // __TABFIX__
|