Imported sqliteodbc-0.81.tar

Author: chw

ChangeLog

@@ -1,6 +1,26 @@
 SQLite ODBC Driver
 ------------------
 
+Tue Apr 14 2009 version 0.81 released
+
+	* update to SQLite 3.6.13
+	* use sqlite3_table_column_metadata() when available to
+	  optimize out "PRAGMA table_info()"
+	* configure now prefers the amalgamation SQLite3 source if
+	  it finds sqlite3.c/sqlite3.h using the --with-sqlite3 switch
+	* various hacks to make MS Excel/Query happy
+	* various fixes and enhancements in impexp.c
+	* keep sqlite3_stmt pointers as long as possible between
+	  SQLPrepare() and SQLExecute() in order to minimize
+	  SQLite API calls
+	* provide current date when retrieving TIME rows as TIMESTAMP
+	* now use amalgamation source sqlite3.c when building
+	  SQLite3 drivers
+	* partial implementation of SQLSetPos(), fixes in length
+	  handling for deferred parameters, and row-wise parameter
+	  array binding to make Database Template Library (DTL) happy
+	* 64 Bit fixes for getrowdata() thanks Nikolas Taylor for fix
+
 Tue Jan 27 2009 version 0.80 released
 
 	* update to SQLite 3.6.10

Makefile.in

@@ -6,7 +6,7 @@ libdir =	@libdir@
 CC =		@CC@
 INSTALL =	@INSTALL@
 LIBTOOL =	./libtool
-CFLAGS=		@CFLAGS@ -DDRIVER_VER_INFO=\"@VER_INFO@\"
+CFLAGS=		@CFLAGS@ -DDRIVER_VER_INFO=\"@VER_INFO@\" @SQLITE3_A10N_FLAGS@
 SQLITE_INC =	@SQLITE_INC@
 SQLITE_LIB =	@SQLITE_LIB@
 SQLITE_FLAGS =	-DHAVE_LIBVERSION=@SQLITE_LIBVERSION@ \
@@ -22,7 +22,10 @@ SQLITE3_FLAGS = -DHAVE_SQLITE3COLUMNTABLENAME=@SQLITE3_COLUMNTABLENAME@ \
 		-DHAVE_SQLITE3PREPAREV2=@SQLITE3_PREPARE_V2@ \
 		-DHAVE_SQLITE3CLEARBINDINGS=@SQLITE3_CLEARBINDINGS@ \
 		-DHAVE_SQLITE3CREATEMODULEV2=@SQLITE3_CREATEMODULE_V2@ \
-		-DHAVE_SQLITE3VFS=@SQLITE3_VFS@
+		-DHAVE_SQLITE3VFS=@SQLITE3_VFS@ \
+		-DHAVE_SQLITE3TABLECOLUMNMETADATA=@SQLITE3_TABLECOLUMNMETADATA@
+SQLITE3_A10N_C =	@SQLITE3_A10N_C@
+SQLITE3_A10N_O =	@SQLITE3_A10N_O@
 ODBC_FLAGS =	@ODBC_FLAGS@
 ODBC_LIB =	@ODBC_LIB@
 VER_INFO =	@VER_INFO@
@@ -34,10 +37,10 @@ libsqliteodbc.la:	sqliteodbc.lo
 		    sqliteodbc.lo -rpath $(libdir) $(SQLITE_LIB) \
 		    $(ODBC_LIB) -release $(VER_INFO)
 
-libsqlite3odbc.la:	sqlite3odbc.lo
+libsqlite3odbc.la:	sqlite3odbc.lo $(SQLITE3_A10N_O)
 		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libsqlite3odbc.la \
-		    sqlite3odbc.lo -rpath $(libdir) $(SQLITE3_LIB) \
-		    $(ODBC_LIB) -release $(VER_INFO)
+		    sqlite3odbc.lo $(SQLITE3_A10N_O) -rpath $(libdir) \
+		    $(SQLITE3_LIB) $(ODBC_LIB) -release $(VER_INFO)
 
 libsqlite3_mod_blobtoxy.la:	blobtoxy.lo
 		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) \
@@ -59,6 +62,9 @@ sqlite3odbc.lo:	sqlite3odbc.c sqlite3odbc.h
 		    -I$(SQLITE3_INC) $(ODBC_FLAGS) \
 		    $(SQLITE3_FLAGS) sqlite3odbc.c
 
+$(SQLITE3_A10N_O):	$(SQLITE3_A10N_C)
+		$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(SQLITE3_A10N_C)
+
 blobtoxy.lo:	blobtoxy.c
 		$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c \
 		    -I$(SQLITE3_INC) \

Makefile.mingw-cross

@@ -9,7 +9,7 @@ MAKENSIS =	makensis
 
 DRV_VER=	$(shell cat VERSION)
 
-CFLAGS=		-g -O2 -Wall -DDRIVER_VER_INFO=\"$(DRV_VER)\"
+CFLAGS=		-O2 -Wall -DDRIVER_VER_INFO=\"$(DRV_VER)\"
 
 
 SQLITE_INC =	sqlite
@@ -27,6 +27,17 @@ SQLITE3_FLAGS=	-DHAVE_SQLITE3COLUMNTABLENAME=1 \
 		-DHAVE_SQLITE3LOADEXTENSION=1 \
 		-DHAVE_SQLITE3PREPAREV2=1 \
 		-DHAVE_SQLITE3VFS=1
+SQLITE3_A10N =	sqlite3/sqlite3.c
+SQLITE3_A10N_FLAGS = \
+		-DWIN32=1 -DNDEBUG=1 -DNO_TCL -DTHREADSAFE=1 \
+		-DSQLITE_ENABLE_COLUMN_METADATA=1 \
+		-DSQLITE_DLL=1 \
+		-DSQLITE_THREADSAFE=1 \
+		-DSQLITE_OS_WIN=1 \
+		-DSQLITE_ASCII=1 \
+		-DSQLITE_SOUNDEX=1 \
+		-DSQLITE_OMIT_SHARED_CACHE=1 \
+		-DSQLITE_OMIT_EXPLAIN=1
 
 TCC_INC =	TCC/include
 TCC_LIB =	TCC/lib/libtcc.a
@@ -95,6 +106,10 @@ resource.h:	resource.h.in
 		sed -e 's/--VERS_C--/'$$VERS_C'/g' < resource.h.in | \
 		sed -e 's/--VERS--/'$$VERS'/g' > resource.h
 
+sqlite3a10n.o:	$(SQLITE3_A10N)
+		$(CC) $(CFLAGS) -c -I$(SQLITE3_INC) $(SQLITE3_A10N_FLAGS) \
+		    $(ADD_CFLAGS) -o sqlite3a10n.o $(SQLITE3_A10N)
+
 sqlite3odbc.o:	sqlite3odbc.c sqlite3odbc.h resource3.h
 		$(CC) $(CFLAGS) -c -I$(SQLITE3_INC) $(ODBC_FLAGS) \
 		    $(SQLITE3_FLAGS) $(ADD_CFLAGS) sqlite3odbc.c
@@ -104,28 +119,27 @@ sqlite3odbcnw.o:	sqlite3odbc.c sqlite3odbc.h resource3.h
 		    $(SQLITE3_FLAGS) $(ADD_CFLAGS) -DWITHOUT_WINTERFACE=1 \
 		    -o sqlite3odbcnw.o sqlite3odbc.c
 
-sqlite3odbc.dll:	sqlite3odbc.o sqlite3odbcres.o
+sqlite3odbc.dll:	sqlite3odbc.o sqlite3odbcres.o sqlite3a10n.o
 		$(CC) $(CFLAGS) -shared -Wl,--kill-at \
 		    -Wl,--out-implib,libsqlite3odbc.a -Wl,--strip-all \
 		    -o sqlite3odbc.dll \
-		    sqlite3odbc.o sqlite3odbcres.o \
+		    sqlite3odbc.o sqlite3odbcres.o sqlite3a10n.o \
 		    -lodbc32 -lodbccp32 -lcomdlg32 \
-		    -lkernel32 -luser32 -lmsvcrt $(SQLITE3_LIB)
+		    -lkernel32 -luser32 -lmsvcrt
 		$(STRIP) sqlite3odbc.dll
 
-sqlite3odbcnw.dll:	sqlite3odbcnw.o sqlite3odbcres.o
+sqlite3odbcnw.dll:	sqlite3odbcnw.o sqlite3odbcres.o sqlite3a10n.o
 		$(CC) $(CFLAGS) -shared -Wl,--kill-at \
 		    -Wl,--out-implib,libsqlite3odbcnw.a -Wl,--strip-all \
 		    -o sqlite3odbcnw.dll \
-		    sqlite3odbcnw.o sqlite3odbcres.o \
+		    sqlite3odbcnw.o sqlite3odbcres.o sqlite3a10n.o \
 		    -lodbc32 -lodbccp32 -lcomdlg32 \
-		    -lkernel32 -luser32 -lmsvcrt $(SQLITE3_LIB)
+		    -lkernel32 -luser32 -lmsvcrt
 		$(STRIP) sqlite3odbcnw.dll
 
 sqlite3.exe:		sqlite3odbc.dll sqlite3/src/minshell.c sqliteres.o
 		$(CC) $(CFLAGS) $(SQLITE3_FLAGS) -Isqlite3 -o sqlite3.exe \
-		    sqlite3/src/minshell.c sqliteres.o -L. -lsqlite3odbc \
-		    $(SQLITE3_LIB)
+		    sqlite3/src/minshell.c sqliteres.o -L. -lsqlite3odbc
 		$(STRIP) sqlite3.exe
 
 sqlite3odbcres.o:	sqlite3odbc.rc resource3.h

README

@@ -15,7 +15,7 @@ WIN32 binaries (the ODBC driver DLL, install/uninstall programs) are in
 
     http://www.ch-werner.de/sqliteodbc/sqliteodbc.exe
 
-The binaries were made with SQLite 2.8.17, SQLite 3.6.10, MingW
+The binaries were made with SQLite 2.8.17, SQLite 3.6.13, MingW
 cross compiler and tested on Windows NT 4.0 with the query tool
 of MS Excel 97, with StarOffice 5.2 and OpenOffice 1.1 and 2.x.
 Execute the sqliteodbc.exe NSIS installer to unpack the necessary
@@ -186,17 +186,15 @@ Build instructions for MS Visual C++ 6.0:
 ... for SQLite 3.x.x
 
 1. Extract the source tarball sqliteodbc.tar.gz
-2. Extract the official SQLite 3.x.x. sources in the sqliteodbc
-   directory which resulted from step 1. Rename the resulting
-   sqlite directory to sqlite3
+2. Extract the amalgamation SQLite 3.x.x. sources in the sqliteodbc
+   directory which resulted from step 1.
 3. Setup your MSVC++ environment, ie PATH/INCLUDE/LIB, then
    open a command window, cd to the sqliteodbc directory and enter:
 
         nmake -f sqlite3odbc.mak
 
-   This compiles the SQLite3 sources first, creates a link library
-   of the necessary object files, then compiles and links the ODBC
-   driver and the (un)install program.
+   This compiles the amalgamation SQLite3 source and the ODBC driver
+   first, then and links the ODBC driver and the (un)install program.
 
 Names of Win32 Driver DLLs:
 
@@ -289,7 +287,7 @@ TODO:
 - improve documentation
 
 
-2009-01-27
+2009-04-14
 Christian Werner
 mailto:[email protected]
 

SQLiteODBCInstaller.c

@@ -801,7 +801,7 @@ int RunUnInstaller( const struct RunningOptionData_Struct *pRunData )
 			break;
 
 			default:
-				_snprintf( g_ErrorMessage, SQLINST_MAX_ERROR_BUFFER, "Internel error: %s: Can not run: %d\n", __FUNCTION__, pRunData->DoFollow );
+				_snprintf( g_ErrorMessage, SQLINST_MAX_ERROR_BUFFER, "Internel error: %s: Can not run: %d\n", "RunUnInstaller", pRunData->DoFollow );
 				g_ErrorMessage[SQLINST_MAX_ERROR_BUFFER-1] = 0;
 				MessageToUser( g_ErrorMessage );
 				// Break with error

VERSION

@@ -1 +1 @@
-0.80
+0.81