mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +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
200 lines
6.4 KiB
C++
200 lines
6.4 KiB
C++
/************** filamzip H Declares Source Code File (.H) **************/
|
|
/* Name: filamzip.h Version 1.2 */
|
|
/* */
|
|
/* (C) Copyright to the author Olivier BERTRAND 2016-2017 */
|
|
/* */
|
|
/* This file contains the ZIP file access method classes declares. */
|
|
/***********************************************************************/
|
|
#ifndef __FILAMZIP_H
|
|
#define __FILAMZIP_H
|
|
|
|
#include "block.h"
|
|
#include "filamap.h"
|
|
#include "filamfix.h"
|
|
#include "zip.h"
|
|
#include "unzip.h"
|
|
|
|
#define DLLEXPORT extern "C"
|
|
|
|
typedef class UNZFAM *PUNZFAM;
|
|
typedef class UZXFAM *PUZXFAM;
|
|
typedef class ZIPFAM *PZIPFAM;
|
|
typedef class ZPXFAM *PZPXFAM;
|
|
|
|
/***********************************************************************/
|
|
/* This is the ZIP utility fonctions class. */
|
|
/***********************************************************************/
|
|
class DllExport ZIPUTIL : public BLOCK {
|
|
public:
|
|
// Constructor
|
|
ZIPUTIL(PCSZ tgt);
|
|
//ZIPUTIL(ZIPUTIL *zutp);
|
|
|
|
// Methods
|
|
bool OpenTable(PGLOBAL g, MODE mode, PCSZ fn, bool append);
|
|
bool open(PGLOBAL g, PCSZ fn, bool append);
|
|
bool addEntry(PGLOBAL g, PCSZ entry);
|
|
void close(void);
|
|
void closeEntry(void);
|
|
int writeEntry(PGLOBAL g, char *buf, int len);
|
|
void getTime(tm_zip& tmZip);
|
|
|
|
// Members
|
|
zipFile zipfile; // The ZIP container file
|
|
PCSZ target; // The target file name
|
|
PCSZ pwd; // The ZIP file password
|
|
PFBLOCK fp;
|
|
bool entryopen; // True when open current entry
|
|
}; // end of ZIPUTIL
|
|
|
|
/***********************************************************************/
|
|
/* This is the unZIP utility fonctions class. */
|
|
/***********************************************************************/
|
|
class DllExport UNZIPUTL : public BLOCK {
|
|
public:
|
|
// Constructor
|
|
UNZIPUTL(PCSZ tgt, bool mul);
|
|
UNZIPUTL(PDOSDEF tdp);
|
|
|
|
// Implementation
|
|
//PTXF Duplicate(PGLOBAL g) { return (PTXF) new(g)UNZFAM(this); }
|
|
|
|
// Methods
|
|
bool OpenTable(PGLOBAL g, MODE mode, PCSZ fn);
|
|
bool open(PGLOBAL g, PCSZ fn);
|
|
bool openEntry(PGLOBAL g);
|
|
void close(void);
|
|
void closeEntry(void);
|
|
bool WildMatch(PCSZ pat, PCSZ str);
|
|
int findEntry(PGLOBAL g, bool next);
|
|
int nextEntry(PGLOBAL g);
|
|
bool IsInsertOk(PGLOBAL g, PCSZ fn);
|
|
|
|
// Members
|
|
unzFile zipfile; // The ZIP container file
|
|
PCSZ target; // The target file name
|
|
PCSZ pwd; // The ZIP file password
|
|
unz_file_info finfo; // The current file info
|
|
PFBLOCK fp;
|
|
char *memory;
|
|
uint size;
|
|
int multiple; // Multiple targets
|
|
bool entryopen; // True when open current entry
|
|
char fn[FILENAME_MAX]; // The current entry file name
|
|
char mapCaseTable[256];
|
|
}; // end of UNZIPUTL
|
|
|
|
/***********************************************************************/
|
|
/* This is the unzip file access method. */
|
|
/***********************************************************************/
|
|
class DllExport UNZFAM : public MAPFAM {
|
|
//friend class UZXFAM;
|
|
public:
|
|
// Constructors
|
|
UNZFAM(PDOSDEF tdp);
|
|
UNZFAM(PUNZFAM txfp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_ZIP;}
|
|
virtual PTXF Duplicate(PGLOBAL g) {return (PTXF) new(g) UNZFAM(this);}
|
|
|
|
// Methods
|
|
virtual int Cardinality(PGLOBAL g);
|
|
virtual int GetFileLength(PGLOBAL g);
|
|
//virtual int MaxBlkSize(PGLOBAL g, int s) {return s;}
|
|
virtual bool OpenTableFile(PGLOBAL g);
|
|
virtual bool DeferReading(void) { return false; }
|
|
virtual int GetNext(PGLOBAL g);
|
|
//virtual int ReadBuffer(PGLOBAL g);
|
|
//virtual int WriteBuffer(PGLOBAL g);
|
|
//virtual int DeleteRecords(PGLOBAL g, int irc);
|
|
//virtual void CloseTableFile(PGLOBAL g, bool abort);
|
|
|
|
protected:
|
|
// Members
|
|
UNZIPUTL *zutp;
|
|
PDOSDEF tdfp;
|
|
}; // end of UNZFAM
|
|
|
|
/***********************************************************************/
|
|
/* This is the fixed unzip file access method. */
|
|
/***********************************************************************/
|
|
class DllExport UZXFAM : public MPXFAM {
|
|
//friend class UNZFAM;
|
|
public:
|
|
// Constructors
|
|
UZXFAM(PDOSDEF tdp);
|
|
UZXFAM(PUZXFAM txfp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) { return TYPE_AM_ZIP; }
|
|
virtual PTXF Duplicate(PGLOBAL g) { return (PTXF) new(g)UZXFAM(this); }
|
|
|
|
// Methods
|
|
virtual int GetFileLength(PGLOBAL g);
|
|
virtual int Cardinality(PGLOBAL g);
|
|
virtual bool OpenTableFile(PGLOBAL g);
|
|
virtual int GetNext(PGLOBAL g);
|
|
//virtual int ReadBuffer(PGLOBAL g);
|
|
|
|
protected:
|
|
// Members
|
|
UNZIPUTL *zutp;
|
|
PDOSDEF tdfp;
|
|
}; // end of UZXFAM
|
|
|
|
/***********************************************************************/
|
|
/* This is the zip file access method. */
|
|
/***********************************************************************/
|
|
class DllExport ZIPFAM : public DOSFAM {
|
|
public:
|
|
// Constructors
|
|
ZIPFAM(PDOSDEF tdp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_ZIP;}
|
|
|
|
// Methods
|
|
virtual int Cardinality(PGLOBAL g) {return 0;}
|
|
virtual int GetFileLength(PGLOBAL g) {return g ? 0 : 1;}
|
|
//virtual int MaxBlkSize(PGLOBAL g, int s) {return s;}
|
|
virtual bool OpenTableFile(PGLOBAL g);
|
|
virtual int ReadBuffer(PGLOBAL g);
|
|
virtual int WriteBuffer(PGLOBAL g);
|
|
//virtual int DeleteRecords(PGLOBAL g, int irc);
|
|
virtual void CloseTableFile(PGLOBAL g, bool abort);
|
|
|
|
protected:
|
|
// Members
|
|
ZIPUTIL *zutp;
|
|
PCSZ target;
|
|
bool append;
|
|
//bool replace;
|
|
}; // end of ZIPFAM
|
|
|
|
/***********************************************************************/
|
|
/* This is the fixed zip file access method. */
|
|
/***********************************************************************/
|
|
class DllExport ZPXFAM : public FIXFAM {
|
|
public:
|
|
// Constructors
|
|
ZPXFAM(PDOSDEF tdp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_ZIP;}
|
|
|
|
// Methods
|
|
virtual int Cardinality(PGLOBAL g) {return 0;}
|
|
virtual int GetFileLength(PGLOBAL g) {return g ? 0 : 1;}
|
|
virtual bool OpenTableFile(PGLOBAL g);
|
|
virtual int WriteBuffer(PGLOBAL g);
|
|
virtual void CloseTableFile(PGLOBAL g, bool abort);
|
|
|
|
protected:
|
|
// Members
|
|
ZIPUTIL *zutp;
|
|
PCSZ target;
|
|
bool append;
|
|
}; // end of ZPXFAM
|
|
|
|
#endif // __FILAMZIP_H
|