lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-03-10 00:20:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed unixODBC 2.1.0+ bug.

Browse Source 
fixed GTK/Gnome handling.
more debugger stuff.
This commit is contained in:
brianb
2002-04-14 23:35:39 +00:00
parent 0d0e0efbb7
commit e7927f94bc
27 changed files with 443 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/odbc/Makefile
View File

@@ -62,9 +62,11 @@ host_triplet = i686-pc-linux-gnu
AS = @AS@
CC = gcc
DLLTOOL = @DLLTOOL@
GTK_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
GTK_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
GMDB_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
GMDB_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
HAVE_GNOME =
HAVE_GTK =
HAVE_ODBC =
LD = /usr/bin/ld
LEX = flex
LIBTOOL = $(SHELL) $(top_builddir)/libtool
@@ -72,13 +74,12 @@ LN_S = ln -s
MAKEINFO = makeinfo
NM = /usr/bin/nm -B
OBJDUMP = @OBJDUMP@
ODBC =
ODBC_INC = /usr/local/include
PACKAGE = mdbtools
RANLIB = ranlib
READLINE_LIBS = -lncurses -lreadline
SQL =
VERSION = 0.3
VERSION = 0.4
YACC = bison -y
include_HEADERS = connectparams.h
@@ -87,7 +88,6 @@ SQLSOURCES = mdbsql.c parser.c lexer.c
MDBDIR = ../libmdb
MDBSOURCES = backend.c index.c money.c catalog.c kkd.c sargs.c \
data.c like.c table.c dump.c file.c mem.c
bin_PROGRAMS = unittest
lib_LTLIBRARIES = libmdbodbc.la
INCLUDES = -I ../../include `glib-config --cflags`
@@ -96,7 +96,6 @@ libmdbodbc_la_LIBADD = $(patsubst %, $(SQLDIR)/%, \
$(patsubst %.c, %.lo, $(SQLSOURCES))) \
$(patsubst %, $(MDBDIR)/%, \
$(patsubst %.c, %.lo, $(MDBSOURCES))) -lglib
LIBS = -lfl `glib-config --libs`
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -104,20 +103,20 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = -DPACKAGE=\"mdbtools\" -DVERSION=\"0.3\" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_WORDEXP_H=1 -DHAVE_READLINE=1 -I. -I$(srcdir)
DEFS = -DPACKAGE=\"mdbtools\" -DVERSION=\"0.4\" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_WORDEXP_H=1 -DHAVE_READLINE=1 -I. -I$(srcdir)
CPPFLAGS =
LDFLAGS =
libmdbodbc_la_LDFLAGS =
libmdbodbc_la_DEPENDENCIES = $(patsubst %, $(SQLDIR)/%, $(patsubst %.c, \
%.lo, $(SQLSOURCES))) $(patsubst %, $(MDBDIR)/%, $(patsubst %.c, %.lo, \
$(MDBSOURCES)))
libmdbodbc_la_DEPENDENCIES = $(patsubst %, $(SQLDIR)/%, \
$(patsubst %.c, %.lo, $(SQLSOURCES))) $(patsubst %, \
$(MDBDIR)/%, $(patsubst %.c, %.lo, $(MDBSOURCES)))
libmdbodbc_la_OBJECTS = odbc.lo connectparams.lo
PROGRAMS = $(bin_PROGRAMS)
unittest_SOURCES = unittest.c
unittest_OBJECTS = unittest.o
unittest_DEPENDENCIES = libmdbodbc.la ../libmdb/libmdb.la \
../sql/libmdbsql.la
unittest_DEPENDENCIES = libmdbodbc.la \
../libmdb/libmdb.la ../sql/libmdbsql.la
unittest_LDFLAGS =
CFLAGS = -g -O2 -DUNIXODBC -DSQL -DHAVE_GNOME
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

3
src/odbc/Makefile.am
View File

@@ -1,3 +1,4 @@
if HAVE_ODBC
include_HEADERS = connectparams.h
SQLDIR = ../sql
SQLSOURCES = mdbsql.c parser.c lexer.c
@@ -18,4 +19,4 @@ unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
## Need blank statement to avoid compiling odbc.c
odbc: $(EXTRA_LTLIBRARIES)
@echo ''
endif

57
src/odbc/Makefile.in
View File

@@ -62,9 +62,11 @@ host_triplet = @host@
AS = @AS@
CC = @CC@
DLLTOOL = @DLLTOOL@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GMDB_CFLAGS = @GMDB_CFLAGS@
GMDB_LIBS = @GMDB_LIBS@
HAVE_GNOME = @HAVE_GNOME@
HAVE_GTK = @HAVE_GTK@
HAVE_ODBC = @HAVE_ODBC@
LD = @LD@
LEX = @LEX@
LIBTOOL = @LIBTOOL@
@@ -72,7 +74,6 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
NM = @NM@
OBJDUMP = @OBJDUMP@
ODBC = @ODBC@
ODBC_INC = @ODBC_INC@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
@@ -81,24 +82,22 @@ SQL = @SQL@
VERSION = @VERSION@
YACC = @YACC@
include_HEADERS = connectparams.h
SQLDIR = ../sql
SQLSOURCES = mdbsql.c parser.c lexer.c
MDBDIR = ../libmdb
MDBSOURCES = backend.c index.c money.c catalog.c kkd.c sargs.c \
data.c like.c table.c dump.c file.c mem.c
bin_PROGRAMS = unittest
lib_LTLIBRARIES = libmdbodbc.la
INCLUDES = -I ../../include `glib-config --cflags`
libmdbodbc_la_SOURCES = odbc.c connectparams.c
libmdbodbc_la_LIBADD = $(patsubst %, $(SQLDIR)/%, \
$(patsubst %.c, %.lo, $(SQLSOURCES))) \
$(patsubst %, $(MDBDIR)/%, \
$(patsubst %.c, %.lo, $(MDBSOURCES))) -lglib
LIBS = @LEXLIB@ `glib-config --libs`
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
@HAVE_ODBC_TRUE@include_HEADERS = @HAVE_ODBC_TRUE@connectparams.h
@HAVE_ODBC_TRUE@SQLDIR = @HAVE_ODBC_TRUE@../sql
@HAVE_ODBC_TRUE@SQLSOURCES = @HAVE_ODBC_TRUE@mdbsql.c parser.c lexer.c
@HAVE_ODBC_TRUE@MDBDIR = @HAVE_ODBC_TRUE@../libmdb
@HAVE_ODBC_TRUE@MDBSOURCES = @HAVE_ODBC_TRUE@backend.c index.c money.c catalog.c kkd.c sargs.c \
@HAVE_ODBC_TRUE@ data.c like.c table.c dump.c file.c mem.c
@HAVE_ODBC_TRUE@bin_PROGRAMS = @HAVE_ODBC_TRUE@unittest
@HAVE_ODBC_TRUE@lib_LTLIBRARIES = @HAVE_ODBC_TRUE@libmdbodbc.la
@HAVE_ODBC_TRUE@INCLUDES = @HAVE_ODBC_TRUE@-I ../../include `glib-config --cflags`
@HAVE_ODBC_TRUE@libmdbodbc_la_SOURCES = @HAVE_ODBC_TRUE@odbc.c connectparams.c
@HAVE_ODBC_TRUE@libmdbodbc_la_LIBADD = @HAVE_ODBC_TRUE@$(patsubst %, $(SQLDIR)/%, \
@HAVE_ODBC_TRUE@ $(patsubst %.c, %.lo, $(SQLSOURCES))) \
@HAVE_ODBC_TRUE@ $(patsubst %, $(MDBDIR)/%, \
@HAVE_ODBC_TRUE@ $(patsubst %.c, %.lo, $(MDBSOURCES))) -lglib
@HAVE_ODBC_TRUE@LIBS = @HAVE_ODBC_TRUE@@LEXLIB@ `glib-config --libs`
@HAVE_ODBC_TRUE@unittest_LDADD = @HAVE_ODBC_TRUE@libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -108,16 +107,16 @@ DEFS = @DEFS@ -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
libmdbodbc_la_LDFLAGS =
libmdbodbc_la_DEPENDENCIES = $(patsubst %, $(SQLDIR)/%, $(patsubst %.c, \
%.lo, $(SQLSOURCES))) $(patsubst %, $(MDBDIR)/%, $(patsubst %.c, %.lo, \
$(MDBSOURCES)))
libmdbodbc_la_OBJECTS = odbc.lo connectparams.lo
@HAVE_ODBC_TRUE@libmdbodbc_la_DEPENDENCIES = $(patsubst %, $(SQLDIR)/%, \
@HAVE_ODBC_TRUE@$(patsubst %.c, %.lo, $(SQLSOURCES))) $(patsubst %, \
@HAVE_ODBC_TRUE@$(MDBDIR)/%, $(patsubst %.c, %.lo, $(MDBSOURCES)))
@HAVE_ODBC_TRUE@libmdbodbc_la_OBJECTS = odbc.lo connectparams.lo
PROGRAMS = $(bin_PROGRAMS)
unittest_SOURCES = unittest.c
unittest_OBJECTS = unittest.o
unittest_DEPENDENCIES = libmdbodbc.la ../libmdb/libmdb.la \
../sql/libmdbsql.la
@HAVE_ODBC_TRUE@unittest_DEPENDENCIES = libmdbodbc.la \
@HAVE_ODBC_TRUE@../libmdb/libmdb.la ../sql/libmdbsql.la
unittest_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -418,8 +417,8 @@ distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
odbc: $(EXTRA_LTLIBRARIES)
@echo ''
@HAVE_ODBC_TRUE@odbc: $(EXTRA_LTLIBRARIES)
@HAVE_ODBC_TRUE@ @echo ''
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

126
src/odbc/odbc.c
View File

@@ -32,7 +32,7 @@
#include "connectparams.h"
static char software_version[] = "$Id: odbc.c,v 1.6 2002/04/09 01:19:26 brianb Exp $";
static char software_version[] = "$Id: odbc.c,v 1.7 2002/04/14 23:35:39 brianb Exp $";
static void *no_unused_var_warn[] = {software_version,
no_unused_var_warn};
@@ -1038,12 +1038,136 @@ int i;
return 0;
}
static void _set_func_exists(SQLUSMALLINT FAR *pfExists, SQLUSMALLINT fFunction)
{
SQLUSMALLINT FAR *mod;
mod = pfExists + (fFunction >> 4);
*mod |= (1 << (fFunction & 0x0f));
}
SQLRETURN SQL_API SQLGetFunctions(
SQLHDBC hdbc,
SQLUSMALLINT fFunction,
SQLUSMALLINT FAR *pfExists)
{
int i;
TRACE("SQLGetFunctions");
switch (fFunction) {
#if ODBCVER >= 0x0300
case SQL_API_ODBC3_ALL_FUNCTIONS:
/* for (i=0;i<SQL_API_ODBC3_ALL_FUNCTIONS_SIZE;i++) {
pfExists[i] = 0xFFFF;
}
*/
_set_func_exists(pfExists,SQL_API_SQLALLOCCONNECT);
_set_func_exists(pfExists,SQL_API_SQLALLOCENV);
_set_func_exists(pfExists,SQL_API_SQLALLOCHANDLE);
_set_func_exists(pfExists,SQL_API_SQLALLOCSTMT);
_set_func_exists(pfExists,SQL_API_SQLBINDCOL);
_set_func_exists(pfExists,SQL_API_SQLBINDPARAMETER);
_set_func_exists(pfExists,SQL_API_SQLCANCEL);
_set_func_exists(pfExists,SQL_API_SQLCLOSECURSOR);
_set_func_exists(pfExists,SQL_API_SQLCOLATTRIBUTE);
_set_func_exists(pfExists,SQL_API_SQLCOLUMNS);
_set_func_exists(pfExists,SQL_API_SQLCONNECT);
_set_func_exists(pfExists,SQL_API_SQLCOPYDESC);
_set_func_exists(pfExists,SQL_API_SQLDATASOURCES);
_set_func_exists(pfExists,SQL_API_SQLDESCRIBECOL);
_set_func_exists(pfExists,SQL_API_SQLDISCONNECT);
_set_func_exists(pfExists,SQL_API_SQLENDTRAN);
_set_func_exists(pfExists,SQL_API_SQLERROR);
_set_func_exists(pfExists,SQL_API_SQLEXECDIRECT);
_set_func_exists(pfExists,SQL_API_SQLEXECUTE);
_set_func_exists(pfExists,SQL_API_SQLFETCH);
_set_func_exists(pfExists,SQL_API_SQLFETCHSCROLL);
_set_func_exists(pfExists,SQL_API_SQLFREECONNECT);
_set_func_exists(pfExists,SQL_API_SQLFREEENV);
_set_func_exists(pfExists,SQL_API_SQLFREEHANDLE);
_set_func_exists(pfExists,SQL_API_SQLFREESTMT);
_set_func_exists(pfExists,SQL_API_SQLGETCONNECTATTR);
_set_func_exists(pfExists,SQL_API_SQLGETCONNECTOPTION);
_set_func_exists(pfExists,SQL_API_SQLGETCURSORNAME);
_set_func_exists(pfExists,SQL_API_SQLGETDATA);
_set_func_exists(pfExists,SQL_API_SQLGETDESCFIELD);
_set_func_exists(pfExists,SQL_API_SQLGETDESCREC);
_set_func_exists(pfExists,SQL_API_SQLGETDIAGFIELD);
_set_func_exists(pfExists,SQL_API_SQLGETDIAGREC);
_set_func_exists(pfExists,SQL_API_SQLGETENVATTR);
_set_func_exists(pfExists,SQL_API_SQLGETFUNCTIONS);
_set_func_exists(pfExists,SQL_API_SQLGETINFO);
_set_func_exists(pfExists,SQL_API_SQLGETSTMTATTR);
_set_func_exists(pfExists,SQL_API_SQLGETSTMTOPTION);
_set_func_exists(pfExists,SQL_API_SQLGETTYPEINFO);
_set_func_exists(pfExists,SQL_API_SQLNUMRESULTCOLS);
_set_func_exists(pfExists,SQL_API_SQLPARAMDATA);
_set_func_exists(pfExists,SQL_API_SQLPREPARE);
_set_func_exists(pfExists,SQL_API_SQLPUTDATA);
_set_func_exists(pfExists,SQL_API_SQLROWCOUNT);
_set_func_exists(pfExists,SQL_API_SQLSETCONNECTATTR);
_set_func_exists(pfExists,SQL_API_SQLSETCONNECTOPTION);
_set_func_exists(pfExists,SQL_API_SQLSETCURSORNAME);
_set_func_exists(pfExists,SQL_API_SQLSETDESCFIELD);
_set_func_exists(pfExists,SQL_API_SQLSETDESCREC);
_set_func_exists(pfExists,SQL_API_SQLSETENVATTR);
_set_func_exists(pfExists,SQL_API_SQLSETPARAM);
_set_func_exists(pfExists,SQL_API_SQLSETSTMTATTR);
_set_func_exists(pfExists,SQL_API_SQLSETSTMTOPTION);
_set_func_exists(pfExists,SQL_API_SQLSPECIALCOLUMNS);
_set_func_exists(pfExists,SQL_API_SQLSTATISTICS);
_set_func_exists(pfExists,SQL_API_SQLTABLES);
_set_func_exists(pfExists,SQL_API_SQLTRANSACT);
return SQL_SUCCESS;
break;
#endif
case SQL_API_ALL_FUNCTIONS:
_set_func_exists(pfExists,SQL_API_SQLALLOCCONNECT);
_set_func_exists(pfExists,SQL_API_SQLALLOCENV);
_set_func_exists(pfExists,SQL_API_SQLALLOCSTMT);
_set_func_exists(pfExists,SQL_API_SQLBINDCOL);
_set_func_exists(pfExists,SQL_API_SQLCANCEL);
_set_func_exists(pfExists,SQL_API_SQLCOLATTRIBUTES);
_set_func_exists(pfExists,SQL_API_SQLCOLUMNS);
_set_func_exists(pfExists,SQL_API_SQLCONNECT);
_set_func_exists(pfExists,SQL_API_SQLDATASOURCES);
_set_func_exists(pfExists,SQL_API_SQLDESCRIBECOL);
_set_func_exists(pfExists,SQL_API_SQLDISCONNECT);
_set_func_exists(pfExists,SQL_API_SQLERROR);
_set_func_exists(pfExists,SQL_API_SQLEXECDIRECT);
_set_func_exists(pfExists,SQL_API_SQLEXECUTE);
_set_func_exists(pfExists,SQL_API_SQLFETCH);
_set_func_exists(pfExists,SQL_API_SQLFREECONNECT);
_set_func_exists(pfExists,SQL_API_SQLFREEENV);
_set_func_exists(pfExists,SQL_API_SQLFREESTMT);
_set_func_exists(pfExists,SQL_API_SQLGETCONNECTOPTION);
_set_func_exists(pfExists,SQL_API_SQLGETCURSORNAME);
_set_func_exists(pfExists,SQL_API_SQLGETDATA);
_set_func_exists(pfExists,SQL_API_SQLGETFUNCTIONS);
_set_func_exists(pfExists,SQL_API_SQLGETINFO);
_set_func_exists(pfExists,SQL_API_SQLGETSTMTOPTION);
_set_func_exists(pfExists,SQL_API_SQLGETTYPEINFO);
_set_func_exists(pfExists,SQL_API_SQLNUMRESULTCOLS);
_set_func_exists(pfExists,SQL_API_SQLPARAMDATA);
_set_func_exists(pfExists,SQL_API_SQLPREPARE);
_set_func_exists(pfExists,SQL_API_SQLPUTDATA);
_set_func_exists(pfExists,SQL_API_SQLROWCOUNT);
_set_func_exists(pfExists,SQL_API_SQLSETCONNECTOPTION);
_set_func_exists(pfExists,SQL_API_SQLSETCURSORNAME);
_set_func_exists(pfExists,SQL_API_SQLSETPARAM);
_set_func_exists(pfExists,SQL_API_SQLSETSTMTOPTION);
_set_func_exists(pfExists,SQL_API_SQLSPECIALCOLUMNS);
_set_func_exists(pfExists,SQL_API_SQLSTATISTICS);
_set_func_exists(pfExists,SQL_API_SQLTABLES);
_set_func_exists(pfExists,SQL_API_SQLTRANSACT);
return SQL_SUCCESS;
break;
default:
*pfExists = 1; /* SQL_TRUE */
return SQL_SUCCESS;
break;
}
return SQL_SUCCESS;
}