lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-09-18 18:22:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

patches 00-14 from David Mansfield

Browse Source
This commit is contained in:
brianb
2004-01-06 00:42:07 +00:00
parent 8592cf5db5
commit 11b43644dc
12 changed files with 293 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@@ -18,3 +18,6 @@ Brent Johnson <xone47@yahoo.com>
Tim Nelson <vbprogie@hotmail.com>
Multipage table defs, column totals > 255
David Mansfield <mdbtools@dm.cobite.com>
Numerous patches

2
include/mdbsql.h
View File

@@ -46,6 +46,7 @@ char *g_input_ptr;
#undef YY_INPUT
#define YY_INPUT(b, r, ms) (r = mdb_sql_yyinput(b, ms));
extern MdbSQL *_mdb_sql(MdbSQL *sql);
extern MdbSQL *mdb_sql_init();
extern MdbSQLSarg *mdb_sql_alloc_sarg();
extern MdbSQLColumn *mdb_sql_alloc_column();
@@ -61,5 +62,6 @@ extern void mdb_sql_reset(MdbSQL *sql);
extern void mdb_sql_listtables(MdbSQL *sql);
extern void mdb_sql_select(MdbSQL *sql);
extern void mdbsql_bind_all(MdbSQL *sql);
extern void mdb_sql_dump_node(MdbSargNode *node, int level);
#endif

11
include/mdbtools.h
View File

@@ -138,7 +138,14 @@ GHashTable *mdb_backends;
typedef struct mdbindex MdbIndex;
typedef struct {
char **types_table;
char *name;
unsigned char needs_length; /* or precision */
unsigned char needs_scale;
unsigned char needs_quotes;
} MdbBackendType;
typedef struct {
MdbBackendType *types_table;
} MdbBackend;
typedef struct {
@@ -400,12 +407,14 @@ extern void mdb_bind_len(MdbTableDef *table, int col_num, int *len_ptr);
extern int mdb_unicode2ascii(MdbHandle *mdb, unsigned char *buf, int offset, int len, char *dest);
extern int mdb_ole_read_next(MdbHandle *mdb, MdbColumn *col, void *ole_ptr);
extern int mdb_ole_read(MdbHandle *mdb, MdbColumn *col, void *ole_ptr, int chunk_size);
extern void mdb_set_date_fmt(const char *);
/* dump.c */
extern void buffer_dump(const unsigned char* buf, int start, int end);
/* backend.c */
extern char *mdb_get_coltype_string(MdbBackend *backend, int col_type);
extern int mdb_coltype_takes_length(MdbBackend *backend, int col_type);
extern void mdb_init_backends();
extern void mdb_register_backend(MdbBackend *backend, char *backend_name);
extern int mdb_set_default_backend(MdbHandle *mdb, char *backend_name);

2
src/libmdb/Makefile.am
View File

@@ -1,4 +1,4 @@
lib_LTLIBRARIES = libmdb.la
libmdb_la_SOURCES= catalog.c mem.c file.c kkd.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c props.c
INCLUDES = -I$(top_srcdir)/include $(GLIB_CFLAGS)
LIBS = $(GLIB_LIBS)
LIBS = $(GLIB_LIBS) -lm

166
src/libmdb/backend.c
View File

@@ -28,84 +28,88 @@
#endif
/* Access data types */
char *mdb_access_types[] =
{"Unknown 0x00",
"Boolean",
"Byte",
"Integer",
"Long Integer",
"Currency",
"Single",
"Double",
"DateTime (Short)",
"Unknown 0x09",
"Text",
"OLE",
"Memo/Hyperlink",
"Unknown 0x0d",
"Unknown 0x0e",
"Replication ID",
"Numeric"};
MdbBackendType mdb_access_types[] = {
{"Unknown 0x00", 0,0,0 },
{"Boolean", 0,0,0},
{"Byte", 0,0,0},
{"Integer", 0,0,0},
{"Long Integer", 0,0,0},
{"Currency", 0,0,0},
{"Single", 0,0,0},
{"Double", 0,0,0},
{"DateTime (Short)", 0,0,1},
{"Unknown 0x09", 0,0,0},
{"Text", 1,0,1},
{"OLE", 1,0,1},
{"Memo/Hyperlink",1,0,1},
{"Unknown 0x0d",0,0,0},
{"Unknown 0x0e",0,0,0},
{"Replication ID",0,0,0},
{"Numeric",1,1,0}
};
/* Oracle data types */
char *mdb_oracle_types[] =
{"Oracle_Unknown 0x00",
"NUMBER",
"NUMBER",
"NUMBER",
"NUMBER",
"NUMBER",
"FLOAT",
"FLOAT",
"DATE",
"Oracle_Unknown 0x09",
"VARCHAR2",
"BLOB",
"CLOB",
"Oracle_Unknown 0x0d",
"Oracle_Unknown 0x0e",
"NUMBER",
"NUMBER"};
MdbBackendType mdb_oracle_types[] = {
{"Oracle_Unknown 0x00",0,0,0},
{"NUMBER",1,0,0},
{"NUMBER",1,0,0},
{"NUMBER",1,0,0},
{"NUMBER",1,0,0},
{"NUMBER",1,0,0},
{"FLOAT",0,0,0},
{"FLOAT",0,0,0},
{"DATE",0,0,0},
{"Oracle_Unknown 0x09",0,0,0},
{"VARCHAR2",1,0,1},
{"BLOB",1,0,1},
{"CLOB",1,0,1},
{"Oracle_Unknown 0x0d",0,0,0},
{"Oracle_Unknown 0x0e",0,0,0},
{"NUMBER",1,0,0},
{"NUMBER",1,0,0},
};
/* Sybase/MSSQL data types */
char *mdb_sybase_types[] =
{"Sybase_Unknown 0x00",
"bit",
"char",
"smallint",
"int",
"money",
"real",
"float",
"smalldatetime",
"Sybase_Unknown 0x09",
"varchar",
"varbinary",
"text",
"Sybase_Unknown 0x0d",
"Sybase_Unknown 0x0e",
"Sybase_Replication ID",
"numeric"};
MdbBackendType mdb_sybase_types[] = {
{"Sybase_Unknown 0x00",0,0,0},
{"bit",0,0,0},
{"char",1,0,1},
{"smallint",0,0,0},
{"int",0,0,0},
{"money",0,0,0},
{"real",0,0,0},
{"float",0,0,0},
{"smalldatetime",0,0,0},
{"Sybase_Unknown 0x09",0,0,0},
{"varchar",1,0,1},
{"varbinary",1,0,1},
{"text",1,0,1},
{"Sybase_Unknown 0x0d",0,0,0},
{"Sybase_Unknown 0x0e",0,0,0},
{"Sybase_Replication ID",0,0,0},
{"numeric",1,1,0},
};
/* Postgres data types */
char *mdb_postgres_types[] =
{"Postgres_Unknown 0x00",
"Bool",
"Int2",
"Int4",
"Int8",
"Money",
"Float4",
"Float8",
"Timestamp",
"Postgres_Unknown 0x09",
"Char",
"Postgres_Unknown 0x0b",
"Postgres_Unknown 0x0c",
"Postgres_Unknown 0x0d",
"Postgres_Unknown 0x0e",
"Serial",
"Postgres_Unknown 0x10"};
MdbBackendType mdb_postgres_types[] = {
{"Postgres_Unknown 0x00",0,0,0},
{"Bool",0,0,0},
{"Int2",0,0,0},
{"Int4",0,0,0},
{"Int8",0,0,0},
{"Money",0,0,0},
{"Float4",0,0,0},
{"Float8",0,0,0},
{"Timestamp",0,0,0},
{"Postgres_Unknown 0x09",0,0,0},
{"Char",1,0,1},
{"Postgres_Unknown 0x0b",0,0,0},
{"Postgres_Unknown 0x0c",0,0,0},
{"Postgres_Unknown 0x0d",0,0,0},
{"Postgres_Unknown 0x0e",0,0,0},
{"Serial",0,0,0},
{"Postgres_Unknown 0x10",0,0,0},
};
char *bound_values[MDB_MAX_COLS];
char *relationships[4];
@@ -118,14 +122,20 @@ char *mdb_get_coltype_string(MdbBackend *backend, int col_type)
{
static char buf[100];
if (col_type > 0x10) {
// return NULL;
if (col_type > 0x10 ) {
// return NULL;
sprintf(buf,"type %04x", col_type);
return buf;
} else {
return backend->types_table[col_type];
}
return buf;
} else {
return backend->types_table[col_type].name;
}
}
int mdb_coltype_takes_length(MdbBackend *backend, int col_type)
{
return backend->types_table[col_type].needs_length;
}
/*
** mdb_init_backends() initializes the mdb_backends hash and loads the builtin
** backends

92
src/libmdb/data.c
View File

@@ -26,6 +26,7 @@
#endif
#define MDB_DEBUG_OLE 0
#define OFFSET_MASK 0x1fff
char *mdb_money_to_string(MdbHandle *mdb, int start, char *s);
static int _mdb_attempt_bind(MdbHandle *mdb,
@@ -33,6 +34,13 @@ static int _mdb_attempt_bind(MdbHandle *mdb,
char *mdb_num_to_string(MdbHandle *mdb, int start, int datatype, int prec, int scale);
int mdb_copy_ole(MdbHandle *mdb, char *dest, int start, int size);
static char date_fmt[64] = "%x %X";
void mdb_set_date_fmt(const char *fmt)
{
date_fmt[63] = 0;
strncpy(date_fmt, fmt, 63);
}
void mdb_bind_column(MdbTableDef *table, int col_num, void *bind_ptr)
{
@@ -73,29 +81,31 @@ mdb_find_end_of_row(MdbHandle *mdb, int row)
MdbFormatConstants *fmt = mdb->fmt;
int row_end;
/* Search the previous "row start" values for the first non-deleted one.
/* Search the previous "row start" values for the first non-'lookupflag' one.
* If we don't find one, then the end of the page is the correct value.
*/
#if 1
if (row==0) {
row_end = fmt->pg_size - 1;
} else {
row_end = (mdb_pg_get_int16(mdb, ((fmt->row_count_offset + 2) + (row - 1) * 2)) & 0x0FFF) - 1;
row_end = (mdb_pg_get_int16(mdb, ((fmt->row_count_offset + 2) + (row - 1) * 2)) & OFFSET_MASK) - 1;
}
return row_end;
#else
int i, row_start;
/* if lookupflag is not set, it's good (deleteflag is ok) */
for (i = row - 1; i >= 0; i--) {
row_start = mdb_pg_get_int16(mdb, ((fmt->row_count_offset + 2) + i * 2));
if (!(row_start & 0x8000)) {
break;
}
}
row_start &= 0x0FFF;
if (i == -1) {
row_end = fmt->pg_size - 1;
} else {
row_end = row_start - 1;
row_end = (row_start & OFFSET_MASK) - 1;
}
return row_end;
#endif
@@ -195,13 +205,16 @@ int mdb_read_row(MdbTableDef *table, int row)
MdbField fields[256];
int num_fields;
if (table->num_rows <= row)
return 0;
row_start = mdb_pg_get_int16(mdb, (fmt->row_count_offset + 2) + (row*2));
row_end = mdb_find_end_of_row(mdb, row);
delflag = lookupflag = 0;
if (row_start & 0x8000) lookupflag++;
if (row_start & 0x4000) delflag++;
row_start &= 0x0FFF; /* remove flags */
row_start &= OFFSET_MASK; /* remove flags */
#if MDB_DEBUG
fprintf(stdout,"Row %d bytes %d to %d %s %s\n",
row, row_start, row_end,
@@ -284,7 +297,7 @@ int mdb_read_row(MdbTableDef *table, int row)
}
/* if fixed columns add up to more than 256, we need a jump */
if (col_start >= 256) {
if (IS_JET3(mdb) && col_start >= 256) {
num_of_jumps++;
jumps_used++;
row_start = row_start + col_start - (col_start % 256);
@@ -423,25 +436,48 @@ int pgnum, i, bitn;
int
mdb_read_next_dpg_by_map1(MdbTableDef *table)
{
MdbCatalogEntry *entry = table->entry;
MdbHandle *mdb = entry->mdb;
guint32 pgnum, i, j, bitn, map_pg;
MdbCatalogEntry *entry = table->entry;
MdbHandle *mdb = entry->mdb;
guint32 pgnum, i, j, bitn, map_pg, map_ind, offset, bit_offset;
pgnum = 0;
/*
* table->cur_phys_pg will tell us where to (re)start the scan
* for the next data page. each usage_map entry points to a
* 0x05 page which bitmaps (mdb->fmt->pg_size - 4) * 8 pages.
*
* map_ind gives us the starting usage_map entry
* offset gives us a page offset into the bitmap (must be converted
* to bytes and bits).
*/
pgnum = table->cur_phys_pg + 1;
map_ind = pgnum / ((mdb->fmt->pg_size - 4) * 8);
offset = pgnum % ((mdb->fmt->pg_size - 4) * 8);
bit_offset = offset % 8;
//printf("map size %ld\n", table->map_sz);
for (i=1;i<table->map_sz-1;i+=4) {
for (i = 4 * map_ind + 1;i < table->map_sz-1; i += 4) {
map_pg = mdb_get_int32(table->usage_map, i);
//printf("loop %d pg %ld %02x%02x%02x%02x\n",i, map_pg,table->usage_map[i],table->usage_map[i+1],table->usage_map[i+2],table->usage_map[i+3]);
if (!map_pg) continue;
/* if the usage_map entry is empty, skip it, but advance the page counter */
if (!map_pg) {
pgnum += (mdb->fmt->pg_size - 4) * 8;
continue;
}
if(mdb_read_alt_pg(mdb, map_pg) != mdb->fmt->pg_size) {
fprintf(stderr, "Oops! didn't get a full page at %d\n", map_pg);
exit(1);
}
//printf("reading page %ld\n",map_pg);
for (j=4;j<mdb->fmt->pg_size;j++) {
for (bitn=0;bitn<8;bitn++) {
/* first time through, start j, bitn based on the starting offset
* after that, reset offset to 0 to start at the beginning of the page/byte
*/
for (j=4 + offset;j<mdb->fmt->pg_size;j++) {
for (bitn=bit_offset;bitn<8;bitn++) {
if (mdb->alt_pg_buf[j] & 1 << bitn && pgnum > table->cur_phys_pg) {
table->cur_phys_pg = pgnum;
if (!mdb_read_pg(mdb, pgnum)) {
@@ -453,7 +489,9 @@ guint32 pgnum, i, j, bitn, map_pg;
}
pgnum++;
}
bit_offset = 0;
}
offset = 0;
}
/* didn't find anything */
//printf("returning 0\n");
@@ -940,12 +978,26 @@ gint32 l;
}
return text;
}
static int trim_trailing_zeros(char * buff, int n)
{
char * p = buff + n - 1;
while (p >= buff && *p == '0')
*p-- = '\0';
if (*p == '.')
*p = '\0';
}
char *mdb_col_to_string(MdbHandle *mdb, unsigned char *buf, int start, int datatype, int size)
{
/* FIX ME -- not thread safe */
static char text[MDB_BIND_SIZE];
time_t t;
int i;
int i, n;
float tf;
double td;
switch (datatype) {
case MDB_BOOL:
@@ -965,11 +1017,15 @@ int i;
return text;
break;
case MDB_FLOAT:
sprintf(text,"%f",mdb_get_single(buf, start));
tf = mdb_get_single(mdb, start);
n = sprintf(text,"%.*f",FLT_DIG - (int)ceil(log10(tf)), tf);
trim_trailing_zeros(text, n);
return text;
break;
case MDB_DOUBLE:
sprintf(text,"%f",mdb_get_double(buf, start));
td = mdb_get_double(mdb, start);
n = sprintf(text,"%.*f",DBL_DIG - (int)ceil(log10(td)), td);
trim_trailing_zeros(text, n);
return text;
break;
case MDB_TEXT:
@@ -1001,7 +1057,7 @@ int i;
break;
case MDB_SDATETIME:
t = (long int)((mdb_get_double(buf, start) - 25569.0) * 86400.0);
strftime(text, MDB_BIND_SIZE, "%x %X",
strftime(text, MDB_BIND_SIZE, date_fmt,
(struct tm*)gmtime(&t));
return text;

4
src/libmdb/file.c
View File

@@ -24,7 +24,7 @@
#endif
MdbFormatConstants MdbJet4Constants = {
4096, 0x0c, 12, 45, 47, 51, 55, 56, 63, 12, 15, 23, 5, 25, 59
4096, 0x0c, 16, 45, 47, 51, 55, 56, 63, 12, 15, 23, 5, 25, 59
};
MdbFormatConstants MdbJet3Constants = {
2048, 0x08, 12, 25, 27, 31, 35, 36, 43, 8, 13, 16, 1, 18, 39
@@ -364,7 +364,7 @@ mdb_get_double(unsigned char *buf, int offset)
double
mdb_pg_get_double(MdbHandle *mdb, int offset)
{
if (offset <0 || offset+4 > mdb->fmt->pg_size) return -1;
if (offset <0 || offset+8 > mdb->fmt->pg_size) return -1;
mdb->cur_pos+=8;
return mdb_get_double(mdb->pg_buf, offset);
}

1
src/libmdb/mem.c
View File

@@ -18,6 +18,7 @@
*/
#include "mdbtools.h"
#include <locale.h>
#ifdef DMALLOC
#include "dmalloc.h"

39
src/libmdb/table.c
View File

@@ -157,14 +157,14 @@ read_pg_if_n(MdbHandle *mdb, unsigned char *buf, int *cur_pos, int len)
GPtrArray *mdb_read_columns(MdbTableDef *table)
{
MdbHandle *mdb = table->entry->mdb;
MdbFormatConstants *fmt = mdb->fmt;
MdbColumn col, *pcol;
int len, i,j;
unsigned char low_byte, high_byte;
int cur_col, cur_name;
int name_sz;
GSList *slist = NULL;
MdbHandle *mdb = table->entry->mdb;
MdbFormatConstants *fmt = mdb->fmt;
MdbColumn col, *pcol;
int len, i,j;
unsigned char low_byte, high_byte;
int cur_col, cur_name;
int name_sz;
GSList *slist = NULL;
table->columns = g_ptr_array_new();
@@ -182,23 +182,28 @@ GSList *slist = NULL;
buffer_dump(mdb->pg_buf, cur_col ,cur_col + 18); */
#endif
memset(&col, 0, sizeof(col));
col.col_num = mdb->pg_buf[cur_col + fmt->col_num_offset];
read_pg_if(mdb, &cur_col, 0);
col.col_type = mdb->pg_buf[cur_col];
read_pg_if(mdb, &cur_col, fmt->col_num_offset); // col_num_offset == 1
col.col_num = mdb->pg_buf[cur_col + fmt->col_num_offset];
/* FIXME: can this be right in Jet3 and Jet4? */
if (col.col_type == MDB_NUMERIC) {
read_pg_if(mdb, &cur_col, 11);
col.col_prec = mdb->pg_buf[cur_col + 11];
read_pg_if(mdb, &cur_col, 12);
col.col_scale = mdb->pg_buf[cur_col + 12];
}
read_pg_if(mdb, &cur_col, 13);
read_pg_if(mdb, &cur_col, fmt->col_fixed_offset); // col_fixed_offset == 13 or 15
col.is_fixed = mdb->pg_buf[cur_col + fmt->col_fixed_offset] &
0x01 ? 1 : 0;
0x01 ? 1 : 0;
if (col.col_type != MDB_BOOL) {
read_pg_if(mdb, &cur_col, 17);
read_pg_if(mdb, &cur_col, fmt->col_size_offset); // col_size_offset == 16 or 23
low_byte = mdb->pg_buf[cur_col + fmt->col_size_offset];
read_pg_if(mdb, &cur_col, 18);
read_pg_if(mdb, &cur_col, fmt->col_size_offset + 1);
high_byte = mdb->pg_buf[cur_col + fmt->col_size_offset + 1];
col.col_size += high_byte * 256 + low_byte;
} else
@@ -239,13 +244,13 @@ GSList *slist = NULL;
/* read the next pg */
mdb_read_pg(mdb, mdb_pg_get_int32(mdb,4));
cur_name = 8 - (fmt->pg_size - cur_name);
if (len % 2) cur_name++;
/* get the rest of the name */
for (j=0;j<len;j+=2) {
for (j=len;j<name_sz;j++) {
if (!(j%2))
pcol->name[j/2] = mdb->pg_buf[cur_name + j];
}
memcpy(&pcol->name[len], &mdb->pg_buf[cur_name], name_sz - len);
}
pcol->name[name_sz]='\0';
pcol->name[name_sz/2]='\0';
cur_name += name_sz;
} else if (IS_JET3(mdb)) {

27
src/util/mdb-export.c
View File

@@ -46,19 +46,19 @@ print_col(gchar *col_val, int quote_text, int col_type)
int
main(int argc, char **argv)
{
int i, j;
MdbHandle *mdb;
MdbCatalogEntry *entry;
MdbTableDef *table;
MdbColumn *col;
/* doesn't handle tables > 256 columns. Can that happen? */
char *bound_values[256];
char *delimiter = ",";
char header_row = 1;
char quote_text = 1;
int opt;
int i, j;
MdbHandle *mdb;
MdbCatalogEntry *entry;
MdbTableDef *table;
MdbColumn *col;
/* doesn't handle tables > 256 columns. Can that happen? */
char *bound_values[256];
char *delimiter = ",";
char header_row = 1;
char quote_text = 1;
int opt;
while ((opt=getopt(argc, argv, "HQd:"))!=-1) {
while ((opt=getopt(argc, argv, "HQd:D:"))!=-1) {
switch (opt) {
case 'H':
header_row = 0;
@@ -70,6 +70,9 @@ int opt;
delimiter = (char *) malloc(strlen(optarg)+1);
strcpy(delimiter, optarg);
break;
case 'D':
mdb_set_date_fmt(optarg);
break;
default:
break;
}

91
src/util/mdb-schema.c
View File

@@ -17,35 +17,47 @@
*/
/* this utility dumps the schema for an existing database */
#include <ctype.h>
#include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
static char *santize_name(char *str, int santize);
int
main (int argc, char **argv)
{
int i, k;
MdbHandle *mdb;
MdbCatalogEntry *entry;
MdbTableDef *table;
MdbColumn *col;
char *the_relation;
char *tabname = NULL;
int opt;
int i, k;
MdbHandle *mdb;
MdbCatalogEntry *entry;
MdbTableDef *table;
MdbColumn *col;
char *the_relation;
char *tabname = NULL;
char *namespace = "";
int s = 0;
int opt;
if (argc < 2) {
fprintf (stderr, "Usage: %s <file> [<backend>]\n",argv[0]);
exit (1);
}
if (argc < 2) {
fprintf (stderr, "Usage: %s <file> [<backend>]\n",argv[0]);
exit (1);
}
while ((opt=getopt(argc, argv, "T:"))!=-1) {
switch (opt) {
case 'T':
tabname = (char *) malloc(strlen(optarg)+1);
strcpy(tabname, optarg);
break;
while ((opt=getopt(argc, argv, "T:N:S:"))!=-1) {
switch (opt) {
case 'T':
tabname = (char *) malloc(strlen(optarg)+1);
strcpy(tabname, optarg);
break;
case 'N':
namespace = (char *) malloc(strlen(optarg)+1);
strcpy(namespace, optarg);
break;
case 'S':
s = 1;
break;
}
}
@@ -54,7 +66,7 @@ int opt;
/* open the database */
mdb = mdb_open (argv[optind]);
if (argc - optind >2) {
if (argc - optind >= 2) {
if (!mdb_set_default_backend(mdb, argv[optind + 1])) {
fprintf(stderr,"Invalid backend type\n");
mdb_exit();
@@ -86,10 +98,10 @@ int opt;
if (!strcmp (mdb_get_objtype_string (entry->object_type), "Table"))
{
/* drop the table if it exists */
fprintf (stdout, "DROP TABLE %s;\n", entry->object_name);
fprintf (stdout, "DROP TABLE %s%s;\n", namespace, sanitize_name(entry->object_name,s));
/* create the table */
fprintf (stdout, "CREATE TABLE %s\n", entry->object_name);
fprintf (stdout, "CREATE TABLE %s%s\n", sanitize_name(entry->object_name,s));
fprintf (stdout, " (\n");
table = mdb_read_table (entry);
@@ -99,15 +111,17 @@ int opt;
/* loop over the columns, dumping the names and types */
for (k = 0; k < table->num_cols; k++)
{
col = g_ptr_array_index (table->columns, k);
for (k = 0; k < table->num_cols; k++) {
col = g_ptr_array_index (table->columns, k);
fprintf (stdout, "\t%s\t\t\t%s", col->name,
mdb_get_coltype_string (mdb->default_backend, col->col_type));
fprintf (stdout, "\t%s\t\t\t%s", sanitize_name(col->name,s),
mdb_get_coltype_string (mdb->default_backend, col->col_type));
if (col->col_size != 0)
fprintf (stdout, " (%d)", col->col_size);
if (col->col_size != 0 &&
mdb_coltype_takes_length(mdb->default_backend, col->col_type)) {
fprintf (stdout, " (%d)", col->col_size);
}
if (k < table->num_cols - 1)
fprintf (stdout, ", \n");
@@ -115,7 +129,7 @@ int opt;
fprintf (stdout, "\n");
}
fprintf (stdout, "\n);\n");
fprintf (stdout, ");\n");
fprintf (stdout, "-- CREATE ANY INDEXES ...\n");
fprintf (stdout, "\n");
}
@@ -137,3 +151,22 @@ int opt;
exit(0);
}
static char *sanitize_name(char *str, int sanitize)
{
static char namebuf[256];
char *p = namebuf;
if (!sanitize)
return str;
while (*str) {
*p = isalnum(*str) ? *str : '_';
p++;
str++;
}
*p = 0;
return namebuf;
}

21
src/util/mdb-sql.c
View File

@@ -29,6 +29,7 @@
void dump_results(MdbSQL *sql);
void dump_results_pp(MdbSQL *sql);
int yyparse(void);
#if SQL
@@ -46,7 +47,9 @@ char *buf, line[1000];
int i = 0;
printf("%s",prompt);
fgets(line,1000,stdin);
if (! fgets(line,1000,stdin)) {
return NULL;
}
for (i=strlen(line);i>0;i--) {
if (line[i]=='\n') {
line[i]='\0';
@@ -58,7 +61,7 @@ int i = 0;
return buf;
}
add_history(char *s)
void add_history(char *s)
{
}
#endif
@@ -230,7 +233,7 @@ unsigned long row_count = 0;
else if (row_count==1)
fprintf(stdout, "1 Row retrieved\n");
else
fprintf(stdout, "%d Rows retrieved\n", row_count);
fprintf(stdout, "%lu Rows retrieved\n", row_count);
}
mdb_sql_reset(sql);
}
@@ -284,7 +287,7 @@ unsigned long row_count = 0;
else if (row_count==1)
fprintf(stdout, "1 Row retrieved\n");
else
fprintf(stdout, "%d Rows retrieved\n", row_count);
fprintf(stdout, "%lu Rows retrieved\n", row_count);
}
/* clean up */
@@ -372,7 +375,8 @@ FILE *in = NULL, *out = NULL;
} else {
sprintf(prompt,"1 => ");
s=readline(prompt);
if (!strcmp(s,"exit") || !strcmp(s,"quit") || !strcmp(s,"bye"))
if (!s) done = 1;
if (s && (!strcmp(s,"exit") || !strcmp(s,"quit") || !strcmp(s,"bye")))
done = 1;
}
while (!done) {
@@ -398,7 +402,7 @@ FILE *in = NULL, *out = NULL;
/* preserve line numbering for the parser */
strcat(mybuf,"\n");
}
free(s);
if (s) free(s);
if (in) {
s=malloc(256);
if (!fgets(s, 256, in)) {
@@ -411,15 +415,16 @@ FILE *in = NULL, *out = NULL;
} else {
sprintf(prompt,"%d => ",++line);
s=readline(prompt);
if (!s) done = 1;
}
if (!strcmp(s,"exit") || !strcmp(s,"quit") || !strcmp(s,"bye")) {
if( s && (!strcmp(s,"exit") || !strcmp(s,"quit") || !strcmp(s,"bye"))) {
done = 1;
}
}
mdb_sql_exit(sql);
free(mybuf);
free(s);
if (s) free(s);
myexit(0);
return 0; /* make gcc -Wall happy */