Hello community, here is the log from the commit of package sqliteodbc for openSUSE:Factory checked in at 2015-04-18 10:41:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sqliteodbc (Old) and /work/SRC/openSUSE:Factory/.sqliteodbc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sqliteodbc" Changes: -------- --- /work/SRC/openSUSE:Factory/sqliteodbc/sqliteodbc.changes 2015-02-12 10:22:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sqliteodbc.new/sqliteodbc.changes 2015-04-18 10:41:06.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Apr 17 13:16:23 UTC 2015 - [email protected] + +- Update to 0.9992 + * update to SQLite 3.8.9 + * fixed buffer length return in SQLGetStmtAttr*() + * report SQL_SC_SQL92_ENTRY level for + SQLGetInfo(...SQL_SQL_CONFORMANCE...) + * improved configure for cross-compiling + +------------------------------------------------------------------- Old: ---- sqliteodbc-0.9991.tar.gz New: ---- sqliteodbc-0.9992.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sqliteodbc.spec ++++++ --- /var/tmp/diff_new_pack.3LMX3o/_old 2015-04-18 10:41:06.000000000 +0200 +++ /var/tmp/diff_new_pack.3LMX3o/_new 2015-04-18 10:41:06.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sqliteodbc # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: sqliteodbc -Version: 0.9991 +Version: 0.9992 Release: 0 Summary: ODBC driver for SQLite License: BSD-2-Clause @@ -53,7 +53,8 @@ %setup -q %build -%configure --enable-static=no +%configure \ + --enable-static=no make %{?_smp_mflags} all doxy dos2unix README ++++++ sqliteodbc-0.9991.tar.gz -> sqliteodbc-0.9992.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/ChangeLog new/sqliteodbc-0.9992/ChangeLog --- old/sqliteodbc-0.9991/ChangeLog 2014-12-29 10:58:03.000000000 +0100 +++ new/sqliteodbc-0.9992/ChangeLog 2015-04-13 08:29:02.000000000 +0200 @@ -1,6 +1,14 @@ SQLite ODBC Driver ------------------ +Mon Apr 13 2015 version 0.9992 released + + * update to SQLite 3.8.9 + * fixed buffer length return in SQLGetStmtAttr*() + * report SQL_SC_SQL92_ENTRY level for + SQLGetInfo(...SQL_SQL_CONFORMANCE...) + * improved configure for cross-compiling + Mon Dec 29 2014 version 0.9991 released * update to SQLite 3.8.7.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/README new/sqliteodbc-0.9992/README --- old/sqliteodbc-0.9991/README 2014-12-29 09:44:41.000000000 +0100 +++ new/sqliteodbc-0.9992/README 2015-04-13 08:29:27.000000000 +0200 @@ -1,10 +1,9 @@ SQLite ODBC Driver ------------------ -This is an open source ODBC driver for the wonderful -SQLite 2.8.* and SQLite 3.* Database Engine/Library. -The driver is usable but may contain bugs. Use it on -your own risk. +This is an open source ODBC driver for the wonderful SQLite 2.8.* +and SQLite 3.* Database Engine/Library. The driver is usable but may +contain bugs. Use it on your own risk. The current source can be downloaded from @@ -14,7 +13,7 @@ http://www.ch-werner.de/sqliteodbc/sqliteodbc.exe -The binaries were made with SQLite 2.8.17, SQLite 3.8.7.4, MingW +The binaries were made with SQLite 2.8.17, SQLite 3.8.9, 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 @@ -27,7 +26,7 @@ can be specified in the respective field. If empty a default value of 100000 milliseconds is used. -The Win64 installer (sqliteodbc_w64.exe) was made with SQLite 3.8.7.4, +The Win64 installer (sqliteodbc_w64.exe) was made with SQLite 3.8.9, MingW cross compiler and only rudimentary tested on Windows Vista 64. Other tests were made on Linux with the "isql" command line tool @@ -143,6 +142,54 @@ Timeout=2000 +DSN-less connection to the driver + + Using the SQLDriverConnect() API it is possible to connect to + a SQLite database with these strings (Win32 and UN*X) + + DSN=SQLite Datasource;Database=full-path-to-db;... + DSN=SQLite3 Datasource;Database=full-path-to-db;... + + alternatively + + Win32: + + Driver=SQLite ODBC Driver;Database=full-path-to-db;... + Driver=SQLite3 ODBC Driver;Database=full-path-to-db;... + + UN*X (Linux RPM): + + Driver=SQLITE;Database=full-path-to-db;... + Driver=SQLITE3;Database=full-path-to-db;... + + +Connect string parameters for DSN-less connects + + Database (string) name of SQLite2/3 database file; default empty + PWD (string) password when built with SEE support; default empty + Timeout (integer) lock time out in milliseconds; default 100000 + StepAPI (boolean) if true, use sqlite[3]_step et.al.; default false + NoTXN (boolean) if true, only pretend transactions; default false + NoWCHAR (boolean) if true, don't support WCHAR types for character + data; default false + NoCreat (boolean) if true and database file doesn't exist, don't + create it automatically; default false, unsupported + for SQLite2 + LongNames (boolean) if true, don't shorten column names; default false + ShortNames (boolean) if true, enforce short column names; default false + SyncPragma (string) value for PRAGMA SYNCHRONOUS; default empty + FKSupport (boolean) if true, support SQLite3 foreign key constraints; + default false + JournalMode (string) value for PRAGMA JOURNAL_MODE; default empty + OEMCP (boolean) Win32 only: if true, translate strings from/to + UTF8 to current code page; default false + BigInt (boolean) if true, force integer columns to SQL_BIGINT; + default false + JDConv (boolean) if true, use SQLite3 julian day representation for + SQL_TIME, SQL_TIMESTAMP, SQL_DATE types; default false + TraceFile (string) name of file to write SQLite traces to; default empty + + Python sample usage with eGenix mx-Extension (see http://www.lemburg.com/files/python/mxODBC.html) @@ -168,6 +215,7 @@ Build instructions for MS Visual C++ 6.0: + (unsupported, needs manual fiddling makefiles depending on SQLite version) ... for SQLite 2.x.x @@ -225,61 +273,12 @@ final step is creating an NSIS installer. -Win32 install/remove/shell by RUNDLL32 - - Each driver DLL provides entry points for ODBC driver installation - and removal which can be invoked from RUNDLL32.EXE, eg - - ### install sqliteodbc.dll - C:\> rundll32 [path]sqliteodbc.dll,install [quiet] - - ### remove sqlite3odbc.dll - C:\> rundll32 [path]sqlite3odbc.dll,uninstall [quiet] - - If [path] is not provided newer Windows OSes tend to favor the - sqlite*odbc*dll in system directories over the current directory, - thus better provide an absolute path to the DLL of interest. - If the word "quiet" appears anywhere after the DLL/function - name, no info message boxes pop up (but errors are shown). - - An (interactive or batch) SQLite shell can be invoked, too, eg - - ### run SQLite shell on database C:\bla\my.db - C:\> rundll32 [path]sqliteodbc.dll,shell C:\bla\my.db ... - - ### batch run with given SQL - C:\> rundll32 [path]sqliteodbc.dll,shell -batch C:\bla\my.db - "select * from table" <NUL: 2>NUL: >out.txt - - -Win64 notes - - On Win64 (64 bit versions of Vista, Windows 7) both 32 bit and 64 bit - drivers can be installed in parallel. The 32 bit drivers are required - when using 32 bit applications. In order to manage 32 bit data - sources, the 32 bit ODBC admin tool C:\Windows\SysWOW64\odbcad32.exe - must be used. - - -DSN-less connection to the driver - - Using the SQLDriverConnect() API it should be possible to connect to - a SQLite database with these strings (Win32 and UN*X) - - DSN=SQLite Datasource;Database=full-path-to-db;... - DSN=SQLite3 Datasource;Database=full-path-to-db;... - - alternatively - - Win32: - - Driver=SQLite ODBC Driver;Database=full-path-to-db;... - Driver=SQLite3 ODBC Driver;Database=full-path-to-db;... - - UN*X (Linux RPM): +Special build to use System.Data.SQLite on Win32/Win64 - Driver=SQLITE;Database=full-path-to-db;... - Driver=SQLITE3;Database=full-path-to-db;... + A variant of the SQLite3 ODBC driver can be build which uses + internal dynamic linking to System.Data.SQLite.dll or sqlite3.dll. + This feature is turned on when running the mingw*-cross-build.sh + scripts with SQLITE_DLLS=2. Build Instructions for Alpha/Tru64 (OSF1 V5.1) and HP/UX (B.11.23 U ia64) @@ -317,12 +316,41 @@ ./configure && make deb -Special build to use System.Data.SQLite on Win32/Win64 +Win32 install/remove/shell using RUNDLL32 + + Each driver DLL provides entry points for ODBC driver installation + and removal which can be invoked from RUNDLL32.EXE, eg + + ### install sqliteodbc.dll + C:\> RUNDLL32 [path]sqliteodbc.dll,install [quiet] + + ### remove sqlite3odbc.dll + C:\> RUNDLL32 [path]sqlite3odbc.dll,uninstall [quiet] + + If [path] is not provided newer Windows OSes tend to favor the + sqlite*odbc*dll in system directories over the current directory, + thus better provide an absolute path to the DLL of interest. + If the word "quiet" appears anywhere after the DLL/function + name, no info message boxes pop up (but errors are shown). + + An (interactive or batch) SQLite shell can be invoked, too, eg + + ### run SQLite shell on database C:\bla\my.db + C:\> RUNDLL32 [path]sqliteodbc.dll,shell C:\bla\my.db ... + + ### batch run with given SQL + C:\> RUNDLL32 [path]sqliteodbc.dll,shell -batch C:\bla\my.db + "select * from table" <NUL: 2>NUL: >out.txt + + +Win64 notes + + On Win64 (64 bit versions of Vista, Windows 7 ...) both 32 bit and 64 bit + drivers can be installed in parallel. The 32 bit drivers are required + when using 32 bit applications. In order to manage 32 bit data + sources, the 32 bit ODBC admin tool C:\Windows\SysWOW64\odbcad32.exe + must be used. - A variant of the SQLite3 ODBC driver can be build which uses - internal dynamic linking to System.Data.SQLite.dll or sqlite3.dll. - This feature is turned on when running the mingw*-cross-build.sh - scripts with SQLITE_DLLS=2. @@ -331,7 +359,7 @@ - improve documentation -2014-12-29 +2015-04-13 Christian Werner mailto:[email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/VERSION new/sqliteodbc-0.9992/VERSION --- old/sqliteodbc-0.9991/VERSION 2014-12-29 09:44:56.000000000 +0100 +++ new/sqliteodbc-0.9992/VERSION 2015-04-12 16:10:40.000000000 +0200 @@ -1 +1 @@ -0.9991 +0.9992 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/configure new/sqliteodbc-0.9992/configure --- old/sqliteodbc-0.9991/configure 2014-07-21 08:27:18.000000000 +0200 +++ new/sqliteodbc-0.9992/configure 2015-01-12 11:54:38.000000000 +0100 @@ -921,6 +921,7 @@ with_sqlite with_sqlite3 with_sqlite4 +with_libxml2 with_odbc enable_winterface with_dls @@ -1573,6 +1574,7 @@ --with-sqlite=DIR use SQLite header/lib from DIR --with-sqlite3=DIR use SQLite3 hdr/lib from DIR --with-sqlite4=DIR use SQLite4 hdr/src from DIR + --with-libxml2=SCR use xml2-config script SCR --with-odbc=DIR use ODBC header/libs from DIR --with-dls dlopen SQLite3/SQLite4 lib @@ -3691,13 +3693,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:3694: $ac_compile\"" >&5) + (eval echo "\"\$as_me:3696: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:3697: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:3699: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:3700: output\"" >&5) + (eval echo "\"\$as_me:3702: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -4903,7 +4905,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4906 "configure"' > conftest.$ac_ext + echo '#line 4908 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6760,11 +6762,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6763: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6765: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6767: \$? = $ac_status" >&5 + echo "$as_me:6769: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7099,11 +7101,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7102: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7104: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7106: \$? = $ac_status" >&5 + echo "$as_me:7108: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7204,11 +7206,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7207: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7209: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7211: \$? = $ac_status" >&5 + echo "$as_me:7213: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7259,11 +7261,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7262: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7264: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7266: \$? = $ac_status" >&5 + echo "$as_me:7268: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10062,7 +10064,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10065 "configure" +#line 10067 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10158,7 +10160,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10161 "configure" +#line 10163 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12306,23 +12308,43 @@ ######### # libxml2 support for XPath virtual table module + +# Check whether --with-libxml2 was given. +if test "${with_libxml2+set}" = set; then + withval=$with_libxml2; XML2_CONFIG=$withval +fi + XML2_FLAGS="" XML2_LIBS="" EXT_XPATH="" if test "$SQLITE3_LOADEXTENSION" = "1" ; then - { $as_echo "$as_me:$LINENO: checking for libxml2 header and library" >&5 + if test "$with_libxml2" = "no" ; then + XML2_CONFIG="" + else + { $as_echo "$as_me:$LINENO: checking for libxml2 header and library" >&5 $as_echo_n "checking for libxml2 header and library... " >&6; } - XML2_CONFIG="`which xml2-config 2>/dev/null`" - if test -n "$XML2_CONFIG" ; then - XML2_FLAGS="`xml2-config --cflags`" - XML2_LIBS="`xml2-config --libs`" - EXT_XPATH=libsqlite3_mod_xpath.la - LIB_TARGETS="$LIB_TARGETS $EXT_XPATH" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + if test "$with_libxml2" != "no" ; then + if test -z "$XML2_CONFIG" ; then + XML2_CONFIG=`which xml2-config 2>/dev/null` + fi + fi + xml2_err1=1 + xml2_err2=1 + if test -n "$XML2_CONFIG" ; then + XML2_FLAGS="`$XML2_CONFIG --cflags 2>/dev/null`" + xml2_err1=$? + XML2_LIBS="`$XML2_CONFIG --libs 2>/dev/null`" + xml2_err2=$? + fi + if test $xml2_err1 -eq 0 -a $xml2_err2 -eq 0 ; then + EXT_XPATH=libsqlite3_mod_xpath.la + LIB_TARGETS="$LIB_TARGETS $EXT_XPATH" + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 + else + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + fi fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/configure.in new/sqliteodbc-0.9992/configure.in --- old/sqliteodbc-0.9991/configure.in 2014-07-21 08:23:45.000000000 +0200 +++ new/sqliteodbc-0.9992/configure.in 2015-01-12 11:54:32.000000000 +0100 @@ -336,20 +336,36 @@ ######### # libxml2 support for XPath virtual table module +AC_ARG_WITH(libxml2, [ --with-libxml2=SCR use xml2-config script SCR], + XML2_CONFIG=$withval) XML2_FLAGS="" XML2_LIBS="" EXT_XPATH="" if test "$SQLITE3_LOADEXTENSION" = "1" ; then - AC_MSG_CHECKING([for libxml2 header and library]) - XML2_CONFIG="`which xml2-config 2>/dev/null`" - if test -n "$XML2_CONFIG" ; then - XML2_FLAGS="`xml2-config --cflags`" - XML2_LIBS="`xml2-config --libs`" - EXT_XPATH=libsqlite3_mod_xpath.la - LIB_TARGETS="$LIB_TARGETS $EXT_XPATH" - AC_MSG_RESULT(yes) + if test "$with_libxml2" = "no" ; then + XML2_CONFIG="" else - AC_MSG_RESULT(no) + AC_MSG_CHECKING([for libxml2 header and library]) + if test "$with_libxml2" != "no" ; then + if test -z "$XML2_CONFIG" ; then + XML2_CONFIG=`which xml2-config 2>/dev/null` + fi + fi + xml2_err1=1 + xml2_err2=1 + if test -n "$XML2_CONFIG" ; then + XML2_FLAGS="`$XML2_CONFIG --cflags 2>/dev/null`" + xml2_err1=$? + XML2_LIBS="`$XML2_CONFIG --libs 2>/dev/null`" + xml2_err2=$? + fi + if test $xml2_err1 -eq 0 -a $xml2_err2 -eq 0 ; then + EXT_XPATH=libsqlite3_mod_xpath.la + LIB_TARGETS="$LIB_TARGETS $EXT_XPATH" + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi fi fi AC_SUBST(XML2_FLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/debian/changelog new/sqliteodbc-0.9992/debian/changelog --- old/sqliteodbc-0.9991/debian/changelog 2014-12-29 10:58:54.000000000 +0100 +++ new/sqliteodbc-0.9992/debian/changelog 2015-04-13 08:32:42.000000000 +0200 @@ -1,6 +1,6 @@ -sqliteodbc (0.9991-1) unstable; urgency=low +sqliteodbc (0.9992-1) unstable; urgency=low * automatically recreated by configure - -- Christian Werner <[email protected]> Mon, 29 Dec 2014 10:58:52 +0100 + -- Christian Werner <[email protected]> Mon, 13 Apr 2015 08:32:40 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/mingw-cross-build.sh new/sqliteodbc-0.9992/mingw-cross-build.sh --- old/sqliteodbc-0.9991/mingw-cross-build.sh 2014-12-29 10:54:40.000000000 +0100 +++ new/sqliteodbc-0.9992/mingw-cross-build.sh 2015-04-12 16:09:55.000000000 +0200 @@ -25,8 +25,8 @@ set -e VER2=2.8.17 -VER3=3.8.7 -VER3X=3080704 +VER3=3.8.9 +VER3X=3080900 VERZ=1.2.7 TCCVER=0.9.26 @@ -374,7 +374,7 @@ -a "$VER3" != "3.8.0" -a "$VER3" != "3.8.1" -a "$VER3" != "3.8.2" \ -a "$VER3" != "3.8.3" -a "$VER3" != "3.8.4" -a "$VER3" != "3.8.4.1" \ -a "$VER3" != "3.8.4.2" -a "$VER3" != "3.8.5" -a "$VER3" != "3.8.6" \ - -a "$VER3" != "3.8.7" \ + -a "$VER3" != "3.8.7" -a "$VER3" != "3.8.8" -a "$VER3" != "3.8.9" \ && patch sqlite3/src/libshell.c <<'EOD' --- sqlite3.orig/src/libshell.c 2007-01-08 23:40:05.000000000 +0100 +++ sqlite3/src/libshell.c 2007-01-10 18:35:43.000000000 +0100 @@ -467,7 +467,7 @@ -o "$VER3" = "3.7.17" -o "$VER3" = "3.8.0" -o "$VER3" = "3.8.1" \ -o "$VER3" = "3.8.2" -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" \ -o "$VER3" = "3.8.4.1" -o "$VER3" = "3.8.4.2" -o "$VER3" = "3.8.5" \ - -o "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" \ + -o "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" \ && patch sqlite3/src/libshell.c <<'EOD' --- sqlite3.orig/src/libshell.c 2012-12-12 14:42:10.000000000 +0100 +++ sqlite3/src/libshell.c 2012-12-13 12:14:57.000000000 +0100 @@ -511,6 +511,50 @@ #else EOD +test "$VER3" = "3.8.9" \ + && patch sqlite3/src/libshell.c <<'EOD' +--- sqlite3.orig/src/libshell.c 2012-12-12 14:42:10.000000000 +0100 ++++ sqlite3/src/libshell.c 2012-12-13 12:14:57.000000000 +0100 +@@ -36,6 +36,10 @@ + #include <ctype.h> + #include <stdarg.h> + ++#ifdef _WIN32 ++#include <windows.h> ++#endif ++ + #if !defined(_WIN32) && !defined(WIN32) + # include <signal.h> + # if !defined(__RTP__) && !defined(_WRS_KERNEL) +@@ -2894,7 +2898,7 @@ + return argv[i]; + } + +-int SQLITE_CDECL main(int argc, char **argv){ ++int sqlite3_main(int argc, char **argv){ + char *zErrMsg = 0; + struct callback_data data; + const char *zInitFile = 0; +@@ -2996,6 +3000,17 @@ + } + } + if( data.zDbFilename==0 ){ ++#if defined(_WIN32) && !defined(__TINYC__) ++ static OPENFILENAME ofn; ++ static char zDbFn[1024]; ++ ofn.lStructSize = sizeof(ofn); ++ ofn.lpstrFile = (LPTSTR) zDbFn; ++ ofn.nMaxFile = sizeof(zDbFn); ++ ofn.Flags = OFN_PATHMUSTEXIST | OFN_EXPLORER | OFN_NOCHANGEDIR; ++ if( GetOpenFileName(&ofn) ){ ++ data.zDbFilename = zDbFn; ++ } else ++#endif + #ifndef SQLITE_OMIT_MEMORYDB + data.zDbFilename = ":memory:"; + #else +EOD + rm -f sqlite3/src/minshell.c touch sqlite3/src/minshell.c patch sqlite3/src/minshell.c <<'EOD' @@ -582,7 +626,7 @@ -a "$VER3" != "3.8.0" -a "$VER3" != "3.8.1" -a "$VER3" != "3.8.2" \ -a "$VER3" != "3.8.3" -a "$VER3" != "3.8.4" -a "$VER3" != "3.8.4.1" \ -a "$VER3" != "3.8.4.2" -a "$VER3" != "3.8.5" -a "$VER3" != "3.8.6" \ - -a "$VER3" != "3.8.7" \ + -a "$VER3" != "3.8.7" -a "$VER3" != "3.8.8" -a "$VER3" != "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' diff -u sqlite3.orig/src/build.c sqlite3/src/build.c --- sqlite3.orig/src/build.c 2007-01-09 14:53:04.000000000 +0100 @@ -641,13 +685,14 @@ EOD # patch: re-enable NO_TCL in tclsqlite.c (3.3.15) -patch -d sqlite3 -p1 <<'EOD' +test "$VER3" != "3.8.8" -a "$VER3" != "3.8.9" \ + && patch -d sqlite3 -p1 <<'EOD' diff -u sqlite3.orig/src/tclsqlite.c sqlite3/src/tclsqlite.c --- sqlite3.orig/src/tclsqlite.c 2007-04-06 17:02:14.000000000 +0200 +++ sqlite3/src/tclsqlite.c 2007-04-10 07:47:49.000000000 +0200 @@ -14,6 +14,7 @@ ** - ** $Id: mingw-cross-build.sh,v 1.90 2014/12/29 09:54:32 chw Exp chw $ + ** $Id: mingw-cross-build.sh,v 1.95 2015/04/12 14:09:48 chw Exp chw $ */ +#ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ #include "tcl.h" @@ -661,6 +706,26 @@ +#endif /* !defined(NO_TCL) */ EOD +test "$VER3" = "3.8.8" -o "$VER3" = "3.8.9" \ + && patch -d sqlite3 -p1 <<'EOD' +--- sqlite3.orig/src/tclsqlite.c 2015-01-16 14:47:26.000000000 +0100 ++++ sqlite3/src/tclsqlite.c 2015-01-19 17:56:26.517386413 +0100 +@@ -29,6 +29,7 @@ + /* + ** If requested, include the SQLite compiler options file for MSVC. + */ ++#ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ + #if defined(INCLUDE_MSVC_H) + #include "msvc.h" + #endif +@@ -3888,3 +3889,5 @@ + return 0; + } + #endif /* TCLSH */ ++ ++#endif /* !defined(NO_TCL) */ +EOD + # patch: Win32 locking and pager unlock, for SQLite3 < 3.4.0 true || patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/src/os_win.c 2007-04-11 19:52:04.000000000 +0200 @@ -808,7 +873,7 @@ -a "$VER3" != "3.8.0" -a "$VER3" != "3.8.1" -a "$VER3" != "3.8.2" \ -a "$VER3" != "3.8.3" -a "$VER3" != "3.8.4" -a "$VER3" != "3.8.4.1" \ -a "$VER3" != "3.8.4.2" -a "$VER3" != "3.8.5" -a "$VER3" != "3.8.6" \ - -a "$VER3" != "3.8.7" \ + -a "$VER3" != "3.8.7" -a "$VER3" != "3.8.8" -a "$VER3" != "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/fts3/fts3.c 2008-02-02 17:24:34.000000000 +0100 +++ sqlite3/ext/fts3/fts3.c 2008-03-16 11:29:02.000000000 +0100 @@ -900,7 +965,8 @@ -a "$VER3" != "3.7.17" -a "$VER3" != "3.8.0" -a "$VER3" != "3.8.1" \ -a "$VER3" != "3.8.2" -a "$VER3" != "3.8.3" -a "$VER3" != "3.8.4" \ -a "$VER3" != "3.8.4.1" -a "$VER3" != "3.8.4.2" -a "$VER3" != "3.8.5" \ - -a "$VER3" != "3.8.6" -a "$VER3" != "3.8.7" \ + -a "$VER3" != "3.8.6" -a "$VER3" != "3.8.7" -a "$VER3" != "3.8.8" \ + -a "$VER3" != "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/fts3/fts3_hash.c 2007-11-24 01:41:52.000000000 +0100 +++ sqlite3/ext/fts3/fts3_hash.c 2008-03-16 11:39:57.000000000 +0100 @@ -1242,7 +1308,7 @@ test "$VER3" != "3.8.0" -a "$VER3" != "3.8.1" -a "$VER3" != "3.8.2" \ -a "$VER3" != "3.8.3" -a "$VER3" != "3.8.4" -a "$VER3" != "3.8.4.1" \ -a "$VER3" != "3.8.4.2" -a "$VER3" != "3.8.5" -a "$VER3" != "3.8.6" \ - -a "$VER3" != "3.8.7" \ + -a "$VER3" != "3.8.7" -a "$VER3" != "3.8.8" -a "$VER3" != "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/rtree/rtree.c 2008-07-16 16:43:35.000000000 +0200 +++ sqlite3/ext/rtree/rtree.c 2008-07-17 08:59:53.000000000 +0200 @@ -1319,7 +1385,7 @@ -o "$VER3" = "3.8.0" -o "$VER3" = "3.8.1" -o "$VER3" = "3.8.2" \ -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" -o "$VER3" = "3.8.4.1" \ -o "$VER3" = "3.8.4.2" -o "$VER3" = "3.8.5" -o "$VER3" = "3.8.6" \ - -o "$VER3" = "3.8.7" \ + -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" -o "$VER3" = "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/fts3/fts3_aux.c 2011-06-24 09:06:08.000000000 +0200 +++ sqlite3/ext/fts3/fts3_aux.c 2011-06-25 06:44:08.000000000 +0200 @@ -1368,7 +1434,8 @@ -o "$VER3" = "3.7.17" -o "$VER3" = "3.8.0" -o "$VER3" = "3.8.1" \ -o "$VER3" = "3.8.2" -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" \ -o "$VER3" = "3.8.4.1" -o "$VER3" = "3.8.4.2" -o "$VER3" = "3.8.5" \ - -o "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" \ + -o "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" \ + -o "$VER3" = "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/fts3/fts3.c 2011-09-19 20:46:52.000000000 +0200 +++ sqlite3/ext/fts3/fts3.c 2011-09-20 09:47:40.000000000 +0200 @@ -1402,7 +1469,7 @@ -o "$VER3" = "3.8.0" -o "$VER3" = "3.8.1" -o "$VER3" = "3.8.2" \ -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" -o "$VER3" = "3.8.4.1" \ -o "$VER3" = "3.8.4.2" -o "$VER3" = "3.8.5" -o "$VER3" = "3.8.6" \ - -o "$VER3" = "3.8.7" \ + -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" -o "$VER3" = "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/fts3/fts3_expr.c 2011-06-24 09:06:08.000000000 +0200 +++ sqlite3/ext/fts3/fts3_expr.c 2011-06-25 06:47:00.000000000 +0200 @@ -1557,7 +1624,7 @@ test "$VER3" = "3.8.0" -o "$VER3" = "3.8.1" -o "$VER3" = "3.8.2" \ -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" -o "$VER3" = "3.8.4.1" \ -o "$VER3" = "3.8.4.2" -o "$VER3" = "3.8.5" -o "$VER3" = "3.8.6" \ - -o "$VER3" = "3.8.7" \ + -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" -o "$VER3" = "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/src/loadext.c 2013-09-16 06:56:48.000000000 +0200 +++ sqlite3/src/loadext.c 2013-09-16 06:58:14.000000000 +0200 @@ -1576,7 +1643,8 @@ # revert FTS3 initializer name, would work when sqlite3_fts_init test "$VER3" = "3.8.2" -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" \ -o "$VER3" = "3.8.4.1" -o "$VER3" = "3.8.4.2" -o "$VER3" = "3.8.5" \ - -o "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" \ + -o "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" \ + -o "$VER3" = "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/fts3/fts3.c 2014-03-26 10:26:28.000000000 +0100 +++ sqlite3/ext/fts3/fts3.c 2014-03-26 16:54:39.000000000 +0100 @@ -1592,7 +1660,7 @@ EOD # missing windows.h for DWORD, HANDLE in threads.c -test "$VER3" = "3.8.7" \ +test "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" -o "$VER3" = "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/src/threads.c 2014-10-17 13:38:27.000000000 +0200 +++ sqlite3/src/threads.c 2014-10-26 13:40:26.000000000 +0100 @@ -1667,8 +1735,9 @@ unset SQLITE3_A10N_O unset SQLITE3_EXE fi -if test "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" ; then - patch sqlite3/sqlite3.c <<'EOD' +test "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" \ + -o "$VER3" = "3.8.9" \ + && patch sqlite3/sqlite3.c <<'EOD' --- sqlite3.orig/sqlite3.c 2014-09-14 15:02:38.000000000 +0200 +++ sqlite3/sqlite3.c 2014-09-14 15:03:02.000000000 +0200 @@ -121057,7 +121057,7 @@ @@ -1681,7 +1750,6 @@ #ifndef access # define access(f,m) _access((f),(m)) EOD -fi if test -n "$SQLITE_DLLS" ; then make -C sqlite3 -f ../mf-sqlite3.mingw-cross sqlite3.dll fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/mingw64-cross-build.sh new/sqliteodbc-0.9992/mingw64-cross-build.sh --- old/sqliteodbc-0.9991/mingw64-cross-build.sh 2014-12-29 10:54:40.000000000 +0100 +++ new/sqliteodbc-0.9992/mingw64-cross-build.sh 2015-04-12 16:09:56.000000000 +0200 @@ -23,8 +23,8 @@ set -e VER2=2.8.17 -VER3=3.8.7 -VER3X=3080704 +VER3=3.8.9 +VER3X=3080900 VERZ=1.2.7 nov2=false @@ -363,7 +363,7 @@ -a "$VER3" != "3.8.0" -a "$VER3" != "3.8.1" -a "$VER3" != "3.8.2" \ -a "$VER3" != "3.8.3" -a "$VER3" != "3.8.4" -a "$VER3" != "3.8.4.1" \ -a "$VER3" != "3.8.4.2" -a "$VER3" != "3.8.5" -a "$VER3" != "3.8.6" \ - -a "$VER3" != "3.8.7" \ + -a "$VER3" != "3.8.7" -a "$VER3" != "3.8.8" -a "$VER3" != "3.8.9" \ && patch sqlite3/src/libshell.c <<'EOD' --- sqlite3.orig/src/libshell.c 2007-01-08 23:40:05.000000000 +0100 +++ sqlite3/src/libshell.c 2007-01-10 18:35:43.000000000 +0100 @@ -456,7 +456,7 @@ -o "$VER3" = "3.7.17" -o "$VER3" = "3.8.0" -o "$VER3" = "3.8.1" \ -o "$VER3" = "3.8.2" -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" \ -o "$VER3" = "3.8.4.1" -o "$VER3" = "3.8.4.2" -o "$VER3" = "3.8.5" \ - -o "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" \ + -o "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" \ && patch sqlite3/src/libshell.c <<'EOD' --- sqlite3.orig/src/libshell.c 2012-12-12 14:42:10.000000000 +0100 +++ sqlite3/src/libshell.c 2012-12-13 12:14:57.000000000 +0100 @@ -500,6 +500,50 @@ #else EOD +test "$VER3" = "3.8.9" \ + && patch sqlite3/src/libshell.c <<'EOD' +--- sqlite3.orig/src/libshell.c 2012-12-12 14:42:10.000000000 +0100 ++++ sqlite3/src/libshell.c 2012-12-13 12:14:57.000000000 +0100 +@@ -36,6 +36,10 @@ + #include <ctype.h> + #include <stdarg.h> + ++#ifdef _WIN32 ++#include <windows.h> ++#endif ++ + #if !defined(_WIN32) && !defined(WIN32) + # include <signal.h> + # if !defined(__RTP__) && !defined(_WRS_KERNEL) +@@ -2894,7 +2898,7 @@ + return argv[i]; + } + +-int SQLITE_CDECL main(int argc, char **argv){ ++int sqlite3_main(int argc, char **argv){ + char *zErrMsg = 0; + struct callback_data data; + const char *zInitFile = 0; +@@ -2996,6 +3000,17 @@ + } + } + if( data.zDbFilename==0 ){ ++#if defined(_WIN32) && !defined(__TINYC__) ++ static OPENFILENAME ofn; ++ static char zDbFn[1024]; ++ ofn.lStructSize = sizeof(ofn); ++ ofn.lpstrFile = (LPTSTR) zDbFn; ++ ofn.nMaxFile = sizeof(zDbFn); ++ ofn.Flags = OFN_PATHMUSTEXIST | OFN_EXPLORER | OFN_NOCHANGEDIR; ++ if( GetOpenFileName(&ofn) ){ ++ data.zDbFilename = zDbFn; ++ } else ++#endif + #ifndef SQLITE_OMIT_MEMORYDB + data.zDbFilename = ":memory:"; + #else +EOD + rm -f sqlite3/src/minshell.c touch sqlite3/src/minshell.c patch sqlite3/src/minshell.c <<'EOD' @@ -571,7 +615,7 @@ -a "$VER3" != "3.8.0" -a "$VER3" != "3.8.1" -a "$VER3" != "3.8.2" \ -a "$VER3" != "3.8.3" -a "$VER3" != "3.8.4" -a "$VER3" != "3.8.4.1" \ -a "$VER3" != "3.8.4.2" -a "$VER3" != "3.8.5" -a "$VER3" != "3.8.6" \ - -a "$VER3" != "3.8.7" \ + -a "$VER3" != "3.8.7" -a "$VER3" != "3.8.8" -a "$VER3" != "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' diff -u sqlite3.orig/src/build.c sqlite3/src/build.c --- sqlite3.orig/src/build.c 2007-01-09 14:53:04.000000000 +0100 @@ -630,13 +674,14 @@ EOD # patch: re-enable NO_TCL in tclsqlite.c (3.3.15) -patch -d sqlite3 -p1 <<'EOD' +test "$VER3" != "3.8.8" -a "$VER3" != "3.8.9" \ + && patch -d sqlite3 -p1 <<'EOD' diff -u sqlite3.orig/src/tclsqlite.c sqlite3/src/tclsqlite.c --- sqlite3.orig/src/tclsqlite.c 2007-04-06 17:02:14.000000000 +0200 +++ sqlite3/src/tclsqlite.c 2007-04-10 07:47:49.000000000 +0200 @@ -14,6 +14,7 @@ ** - ** $Id: mingw64-cross-build.sh,v 1.50 2014/12/29 09:54:32 chw Exp chw $ + ** $Id: mingw64-cross-build.sh,v 1.55 2015/04/12 14:09:48 chw Exp chw $ */ +#ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ #include "tcl.h" @@ -650,6 +695,26 @@ +#endif /* !defined(NO_TCL) */ EOD +test "$VER3" = "3.8.8" -o "$VER3" = "3.8.9" \ + && patch -d sqlite3 -p1 <<'EOD' +--- sqlite3.orig/src/tclsqlite.c 2015-01-16 14:47:26.000000000 +0100 ++++ sqlite3/src/tclsqlite.c 2015-01-19 17:56:26.517386413 +0100 +@@ -29,6 +29,7 @@ + /* + ** If requested, include the SQLite compiler options file for MSVC. + */ ++#ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ + #if defined(INCLUDE_MSVC_H) + #include "msvc.h" + #endif +@@ -3888,3 +3889,5 @@ + return 0; + } + #endif /* TCLSH */ ++ ++#endif /* !defined(NO_TCL) */ +EOD + # patch: Win32 locking and pager unlock, for SQLite3 < 3.4.0 true || patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/src/os_win.c 2007-04-11 19:52:04.000000000 +0200 @@ -797,7 +862,7 @@ -a "$VER3" != "3.8.0" -a "$VER3" != "3.8.1" -a "$VER3" != "3.8.2" \ -a "$VER3" != "3.8.3" -a "$VER3" != "3.8.4" -a "$VER3" != "3.8.4.1" \ -a "$VER3" != "3.8.4.2" -a "$VER3" != "3.8.5" -a "$VER3" != "3.8.6" \ - -a "$VER3" != "3.8.7" \ + -a "$VER3" != "3.8.7" -a "$VER3" != "3.8.8" -a "$VER3" != "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/fts3/fts3.c 2008-02-02 17:24:34.000000000 +0100 +++ sqlite3/ext/fts3/fts3.c 2008-03-16 11:29:02.000000000 +0100 @@ -943,7 +1008,8 @@ -a "$VER3" != "3.7.17" -a "$VER3" != "3.8.0" -a "$VER3" != "3.8.1" \ -a "$VER3" != "3.8.2" -a "$VER3" != "3.8.3" -a "$VER3" != "3.8.4" \ -a "$VER3" != "3.8.4.1" -a "$VER3" != "3.8.4.2" -a "$VER3" != "3.8.5" \ - -a "$VER3" != "3.8.6" -a "$VER3" != "3.8.7" \ + -a "$VER3" != "3.8.6" -a "$VER3" != "3.8.7" -a "$VER3" != "3.8.8" \ + -a "$VER3" != "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/fts3/fts3_hash.c 2007-11-24 01:41:52.000000000 +0100 +++ sqlite3/ext/fts3/fts3_hash.c 2008-03-16 11:39:57.000000000 +0100 @@ -1286,7 +1352,7 @@ test "$VER3" != "3.8.0" -a "$VER3" != "3.8.1" -a "$VER3" != "3.8.2" \ -a "$VER3" != "3.8.3" -a "$VER3" != "3.8.4" -a "$VER3" != "3.8.4.1" \ -a "$VER3" != "3.8.4.2" -a "$VER3" != "3.8.5" -a "$VER3" != "3.8.6" \ - -a "$VER3" != "3.8.7" \ + -a "$VER3" != "3.8.7" -a "$VER3" != "3.8.8" -a "$VER3" != "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/rtree/rtree.c 2008-07-16 16:43:35.000000000 +0200 +++ sqlite3/ext/rtree/rtree.c 2008-07-17 08:59:53.000000000 +0200 @@ -1363,7 +1429,7 @@ -o "$VER3" = "3.8.0" -o "$VER3" = "3.8.1" -o "$VER3" = "3.8.2" \ -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" -o "$VER3" = "3.8.4.1" \ -o "$VER3" = "3.8.4.2" -o "$VER3" = "3.8.5" -o "$VER3" = "3.8.6" \ - -o "$VER3" = "3.8.7" \ + -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" -o "$VER3" = "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/fts3/fts3_aux.c 2011-06-24 09:06:08.000000000 +0200 +++ sqlite3/ext/fts3/fts3_aux.c 2011-06-25 06:44:08.000000000 +0200 @@ -1412,7 +1478,8 @@ -o "$VER3" = "3.7.17" -o "$VER3" = "3.8.0" -o "$VER3" = "3.8.1" \ -o "$VER3" = "3.8.2" -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" \ -o "$VER3" = "3.8.4.1" -o "$VER3" = "3.8.4.2" -o "$VER3" = "3.8.5" \ - -o "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" \ + -o "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" \ + -o "$VER3" = "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/fts3/fts3.c 2011-09-19 20:46:52.000000000 +0200 +++ sqlite3/ext/fts3/fts3.c 2011-09-20 09:47:40.000000000 +0200 @@ -1446,7 +1513,7 @@ -o "$VER3" = "3.8.0" -o "$VER3" = "3.8.1" -o "$VER3" = "3.8.2" \ -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" -o "$VER3" = "3.8.4.1" \ -o "$VER3" = "3.8.4.2" -o "$VER3" = "3.8.5" -o "$VER3" = "3.8.6" \ - -o "$VER3" = "3.8.7" \ + -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" -o "$VER3" = "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/fts3/fts3_expr.c 2011-06-24 09:06:08.000000000 +0200 +++ sqlite3/ext/fts3/fts3_expr.c 2011-06-25 06:47:00.000000000 +0200 @@ -1601,7 +1668,7 @@ test "$VER3" = "3.8.0" -o "$VER3" = "3.8.1" -o "$VER3" = "3.8.2" \ -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" -o "$VER3" = "3.8.4.1" \ -o "$VER3" = "3.8.4.2" -o "$VER3" = "3.8.5" -o "$VER3" = "3.8.6" \ - -o "$VER3" = "3.8.7" \ + -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" -o "$VER3" = "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/src/loadext.c 2013-09-16 06:56:48.000000000 +0200 +++ sqlite3/src/loadext.c 2013-09-16 06:58:14.000000000 +0200 @@ -1620,7 +1687,8 @@ # revert FTS3 initializer name, would work when sqlite3_fts_init test "$VER3" = "3.8.2" -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" \ -o "$VER3" = "3.8.4.1" -o "$VER3" = "3.8.4.2" -o "$VER3" = "3.8.5" \ - -o "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" \ + -o "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" \ + -o "$VER3" = "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/ext/fts3/fts3.c 2014-03-26 10:26:28.000000000 +0100 +++ sqlite3/ext/fts3/fts3.c 2014-03-26 16:54:39.000000000 +0100 @@ -1636,7 +1704,7 @@ EOD # missing windows.h for DWORD, HANDLE in threads.c -test "$VER3" = "3.8.7" \ +test "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" -o "$VER3" = "3.8.9" \ && patch -d sqlite3 -p1 <<'EOD' --- sqlite3.orig/src/threads.c 2014-10-17 13:38:27.000000000 +0200 +++ sqlite3/src/threads.c 2014-10-26 13:40:26.000000000 +0100 @@ -1709,8 +1777,9 @@ unset SQLITE3_A10N_O unset SQLITE3_EXE fi -if test "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" ; then - patch sqlite3/sqlite3.c <<'EOD' +test "$VER3" = "3.8.6" -o "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" \ + -o "$VER3" = "3.8.9" \ + && patch sqlite3/sqlite3.c <<'EOD' --- sqlite3.orig/sqlite3.c 2014-09-14 15:02:38.000000000 +0200 +++ sqlite3/sqlite3.c 2014-09-14 15:03:02.000000000 +0200 @@ -121057,7 +121057,7 @@ @@ -1723,7 +1792,6 @@ #ifndef access # define access(f,m) _access((f),(m)) EOD -fi if test -n "$SQLITE_DLLS" ; then make -C sqlite3 -f ../mf-sqlite3.mingw64-cross sqlite3.dll fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/sqlite3odbc.c new/sqliteodbc-0.9992/sqlite3odbc.c --- old/sqliteodbc-0.9991/sqlite3odbc.c 2014-12-29 10:56:07.000000000 +0100 +++ new/sqliteodbc-0.9992/sqlite3odbc.c 2015-04-13 08:32:03.000000000 +0200 @@ -2,9 +2,9 @@ * @file sqlite3odbc.c * SQLite3 ODBC Driver main module. * - * $Id: sqlite3odbc.c,v 1.167 2014/12/29 09:55:23 chw Exp chw $ + * $Id: sqlite3odbc.c,v 1.169 2015/04/13 06:31:52 chw Exp chw $ * - * Copyright (c) 2004-2014 Christian Werner <[email protected]> + * Copyright (c) 2004-2015 Christian Werner <[email protected]> * * See the file "license.terms" for information on usage * and redistribution of this file and for a @@ -8972,21 +8972,33 @@ { STMT *s = (STMT *) stmt; SQLULEN *uval = (SQLULEN *) val; + SQLINTEGER dummy; + char dummybuf[16]; + if (!buflen) { + buflen = &dummy; + } + if (!uval) { + uval = (SQLPOINTER) dummybuf; + } switch (attr) { case SQL_QUERY_TIMEOUT: *uval = 0; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_CURSOR_TYPE: *uval = s->curtype; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_CURSOR_SCROLLABLE: *uval = (s->curtype != SQL_CURSOR_FORWARD_ONLY) ? SQL_SCROLLABLE : SQL_NONSCROLLABLE; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; #ifdef SQL_ATTR_CURSOR_SENSITIVITY case SQL_ATTR_CURSOR_SENSITIVITY: *uval = SQL_UNSPECIFIED; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; #endif case SQL_ATTR_ROW_NUMBER: @@ -8996,74 +9008,96 @@ } else { *uval = (s->rowp < 0) ? SQL_ROW_NUMBER_UNKNOWN : (s->rowp + 1); } + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_ASYNC_ENABLE: *uval = SQL_ASYNC_ENABLE_OFF; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_CONCURRENCY: *uval = SQL_CONCUR_LOCK; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_RETRIEVE_DATA: *uval = s->retr_data; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ROWSET_SIZE: case SQL_ATTR_ROW_ARRAY_SIZE: *uval = s->rowset_size; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; /* Needed for some driver managers, but dummies for now */ case SQL_ATTR_IMP_ROW_DESC: case SQL_ATTR_APP_ROW_DESC: case SQL_ATTR_IMP_PARAM_DESC: case SQL_ATTR_APP_PARAM_DESC: - *((SQLHDESC *) val) = (SQLHDESC) DEAD_MAGIC; + *((SQLHDESC *) uval) = (SQLHDESC) DEAD_MAGIC; + *buflen = sizeof (SQLHDESC); return SQL_SUCCESS; case SQL_ATTR_ROW_STATUS_PTR: - *((SQLUSMALLINT **) val) = s->row_status; + *((SQLUSMALLINT **) uval) = s->row_status; + *buflen = sizeof (SQLUSMALLINT *); return SQL_SUCCESS; case SQL_ATTR_ROWS_FETCHED_PTR: - *((SQLULEN **) val) = s->row_count; + *((SQLULEN **) uval) = s->row_count; + *buflen = sizeof (SQLULEN *); return SQL_SUCCESS; case SQL_ATTR_USE_BOOKMARKS: { STMT *s = (STMT *) stmt; - *(SQLUINTEGER *) val = s->bkmrk; + *(SQLUINTEGER *) uval = s->bkmrk; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; } case SQL_ATTR_FETCH_BOOKMARK_PTR: - *(SQLPOINTER *) val = s->bkmrkptr; + *(SQLPOINTER *) uval = s->bkmrkptr; + *buflen = sizeof (SQLPOINTER); return SQL_SUCCESS; case SQL_ATTR_PARAM_BIND_OFFSET_PTR: - *((SQLULEN **) val) = s->parm_bind_offs; + *((SQLULEN **) uval) = s->parm_bind_offs; + *buflen = sizeof (SQLULEN *); return SQL_SUCCESS; case SQL_ATTR_PARAM_BIND_TYPE: - *((SQLULEN *) val) = s->parm_bind_type; + *((SQLULEN *) uval) = s->parm_bind_type; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_PARAM_OPERATION_PTR: - *((SQLUSMALLINT **) val) = s->parm_oper; + *((SQLUSMALLINT **) uval) = s->parm_oper; + *buflen = sizeof (SQLUSMALLINT *); return SQL_SUCCESS; case SQL_ATTR_PARAM_STATUS_PTR: - *((SQLUSMALLINT **) val) = s->parm_status; + *((SQLUSMALLINT **) uval) = s->parm_status; + *buflen = sizeof (SQLUSMALLINT *); return SQL_SUCCESS; case SQL_ATTR_PARAMS_PROCESSED_PTR: - *((SQLULEN **) val) = s->parm_proc; + *((SQLULEN **) uval) = s->parm_proc; + *buflen = sizeof (SQLULEN *); return SQL_SUCCESS; case SQL_ATTR_PARAMSET_SIZE: - *((SQLULEN *) val) = s->paramset_size; + *((SQLULEN *) uval) = s->paramset_size; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_ROW_BIND_TYPE: - *(SQLULEN *) val = s->bind_type; + *(SQLULEN *) uval = s->bind_type; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_ROW_BIND_OFFSET_PTR: - *((SQLULEN **) val) = s->bind_offs; + *((SQLULEN **) uval) = s->bind_offs; + *buflen = sizeof (SQLULEN *); return SQL_SUCCESS; case SQL_ATTR_MAX_ROWS: - *((SQLULEN *) val) = s->max_rows; + *((SQLULEN *) uval) = s->max_rows; + *buflen = sizeof (SQLULEN); + return SQL_SUCCESS; case SQL_ATTR_MAX_LENGTH: - *((SQLINTEGER *) val) = 1000000000; + *((SQLULEN *) uval) = 1000000000; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; #ifdef SQL_ATTR_METADATA_ID case SQL_ATTR_METADATA_ID: - *((SQLULEN *) val) = SQL_FALSE; + *((SQLULEN *) uval) = SQL_FALSE; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; #endif } @@ -10987,6 +11021,10 @@ *((SQLUINTEGER *) val) = SQL_SCC_XOPEN_CLI_VERSION1; *valLen = sizeof (SQLUINTEGER); break; + case SQL_SQL_CONFORMANCE: + *((SQLUINTEGER *) val) = SQL_SC_SQL92_ENTRY; + *valLen = sizeof (SQLUINTEGER); + break; case SQL_SERVER_NAME: case SQL_DATABASE_NAME: strmak(val, d->dbname ? d->dbname : "", valMax, valLen); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/sqlite3odbc.h new/sqliteodbc-0.9992/sqlite3odbc.h --- old/sqliteodbc-0.9991/sqlite3odbc.h 2014-12-29 10:56:08.000000000 +0100 +++ new/sqliteodbc-0.9992/sqlite3odbc.h 2015-04-13 08:32:03.000000000 +0200 @@ -15,9 +15,9 @@ * @file sqlite3odbc.h * Header file for SQLite3 ODBC driver. * - * $Id: sqlite3odbc.h,v 1.45 2014/12/29 09:55:23 chw Exp chw $ + * $Id: sqlite3odbc.h,v 1.46 2015/04/13 06:31:52 chw Exp chw $ * - * Copyright (c) 2004-2014 Christian Werner <[email protected]> + * Copyright (c) 2004-2015 Christian Werner <[email protected]> * * See the file "license.terms" for information on usage * and redistribution of this file and for a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/sqlite4odbc.c new/sqliteodbc-0.9992/sqlite4odbc.c --- old/sqliteodbc-0.9991/sqlite4odbc.c 2014-12-29 10:58:18.000000000 +0100 +++ new/sqliteodbc-0.9992/sqlite4odbc.c 2015-04-13 08:32:05.000000000 +0200 @@ -2,9 +2,9 @@ * @file sqlite4odbc.c * SQLite4 ODBC Driver main module. * - * $Id: sqlite4odbc.c,v 1.13 2014/12/29 09:58:12 chw Exp chw $ + * $Id: sqlite4odbc.c,v 1.15 2015/04/13 06:31:52 chw Exp chw $ * - * Copyright (c) 2014 Christian Werner <[email protected]> + * Copyright (c) 2014-2015 Christian Werner <[email protected]> * * See the file "license.terms" for information on usage * and redistribution of this file and for a @@ -8541,21 +8541,33 @@ { STMT *s = (STMT *) stmt; SQLULEN *uval = (SQLULEN *) val; + SQLINTEGER dummy; + char dummybuf[16]; + if (!buflen) { + buflen = &dummy; + } + if (!uval) { + uval = (SQLPOINTER) dummybuf; + } switch (attr) { case SQL_QUERY_TIMEOUT: *uval = 0; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_CURSOR_TYPE: *uval = s->curtype; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_CURSOR_SCROLLABLE: *uval = (s->curtype != SQL_CURSOR_FORWARD_ONLY) ? SQL_SCROLLABLE : SQL_NONSCROLLABLE; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; #ifdef SQL_ATTR_CURSOR_SENSITIVITY case SQL_ATTR_CURSOR_SENSITIVITY: *uval = SQL_UNSPECIFIED; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; #endif case SQL_ATTR_ROW_NUMBER: @@ -8565,74 +8577,96 @@ } else { *uval = (s->rowp < 0) ? SQL_ROW_NUMBER_UNKNOWN : (s->rowp + 1); } + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_ASYNC_ENABLE: *uval = SQL_ASYNC_ENABLE_OFF; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_CONCURRENCY: *uval = SQL_CONCUR_LOCK; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_RETRIEVE_DATA: *uval = s->retr_data; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ROWSET_SIZE: case SQL_ATTR_ROW_ARRAY_SIZE: *uval = s->rowset_size; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; /* Needed for some driver managers, but dummies for now */ case SQL_ATTR_IMP_ROW_DESC: case SQL_ATTR_APP_ROW_DESC: case SQL_ATTR_IMP_PARAM_DESC: case SQL_ATTR_APP_PARAM_DESC: - *((SQLHDESC *) val) = (SQLHDESC) DEAD_MAGIC; + *((SQLHDESC *) uval) = (SQLHDESC) DEAD_MAGIC; + *buflen = sizeof (SQLHDESC); return SQL_SUCCESS; case SQL_ATTR_ROW_STATUS_PTR: - *((SQLUSMALLINT **) val) = s->row_status; + *((SQLUSMALLINT **) uval) = s->row_status; + *buflen = sizeof (SQLUSMALLINT *); return SQL_SUCCESS; case SQL_ATTR_ROWS_FETCHED_PTR: - *((SQLULEN **) val) = s->row_count; + *((SQLULEN **) uval) = s->row_count; + *buflen = sizeof (SQLULEN *); return SQL_SUCCESS; case SQL_ATTR_USE_BOOKMARKS: { STMT *s = (STMT *) stmt; - *(SQLUINTEGER *) val = s->bkmrk; + *(SQLUINTEGER *) uval = s->bkmrk; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; } case SQL_ATTR_FETCH_BOOKMARK_PTR: - *(SQLPOINTER *) val = s->bkmrkptr; + *(SQLPOINTER *) uval = s->bkmrkptr; + *buflen = sizeof (SQLPOINTER); return SQL_SUCCESS; case SQL_ATTR_PARAM_BIND_OFFSET_PTR: - *((SQLULEN **) val) = s->parm_bind_offs; + *((SQLULEN **) uval) = s->parm_bind_offs; + *buflen = sizeof (SQLULEN *); return SQL_SUCCESS; case SQL_ATTR_PARAM_BIND_TYPE: - *((SQLULEN *) val) = s->parm_bind_type; + *((SQLULEN *) uval) = s->parm_bind_type; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_PARAM_OPERATION_PTR: - *((SQLUSMALLINT **) val) = s->parm_oper; + *((SQLUSMALLINT **) uval) = s->parm_oper; + *buflen = sizeof (SQLUSMALLINT *); return SQL_SUCCESS; case SQL_ATTR_PARAM_STATUS_PTR: - *((SQLUSMALLINT **) val) = s->parm_status; + *((SQLUSMALLINT **) uval) = s->parm_status; + *buflen = sizeof (SQLUSMALLINT *); return SQL_SUCCESS; case SQL_ATTR_PARAMS_PROCESSED_PTR: - *((SQLULEN **) val) = s->parm_proc; + *((SQLULEN **) uval) = s->parm_proc; + *buflen = sizeof (SQLULEN *); return SQL_SUCCESS; case SQL_ATTR_PARAMSET_SIZE: - *((SQLULEN *) val) = s->paramset_size; + *((SQLULEN *) uval) = s->paramset_size; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_ROW_BIND_TYPE: - *(SQLULEN *) val = s->bind_type; + *(SQLULEN *) uval = s->bind_type; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; case SQL_ATTR_ROW_BIND_OFFSET_PTR: - *((SQLULEN **) val) = s->bind_offs; + *((SQLULEN **) uval) = s->bind_offs; + *buflen = sizeof (SQLULEN *); return SQL_SUCCESS; case SQL_ATTR_MAX_ROWS: - *((SQLULEN *) val) = s->max_rows; + *((SQLULEN *) uval) = s->max_rows; + *buflen = sizeof (SQLULEN); + return SQL_SUCCESS; case SQL_ATTR_MAX_LENGTH: - *((SQLINTEGER *) val) = 1000000000; + *((SQLULEN *) uval) = 1000000000; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; #ifdef SQL_ATTR_METADATA_ID case SQL_ATTR_METADATA_ID: - *((SQLULEN *) val) = SQL_FALSE; + *((SQLULEN *) uval) = SQL_FALSE; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; #endif } @@ -10385,6 +10419,10 @@ *((SQLUINTEGER *) val) = SQL_SCC_XOPEN_CLI_VERSION1; *valLen = sizeof (SQLUINTEGER); break; + case SQL_SQL_CONFORMANCE: + *((SQLUINTEGER *) val) = SQL_SC_SQL92_ENTRY; + *valLen = sizeof (SQLUINTEGER); + break; case SQL_SERVER_NAME: case SQL_DATABASE_NAME: strmak(val, d->dbname ? d->dbname : "", valMax, valLen); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/sqlite4odbc.h new/sqliteodbc-0.9992/sqlite4odbc.h --- old/sqliteodbc-0.9991/sqlite4odbc.h 2014-12-29 10:58:19.000000000 +0100 +++ new/sqliteodbc-0.9992/sqlite4odbc.h 2015-04-13 08:32:06.000000000 +0200 @@ -15,9 +15,9 @@ * @file sqlite4odbc.h * Header file for SQLite4 ODBC driver. * - * $Id: sqlite4odbc.h,v 1.4 2014/12/29 09:58:12 chw Exp chw $ + * $Id: sqlite4odbc.h,v 1.5 2015/04/13 06:31:52 chw Exp chw $ * - * Copyright (c) 2013-2014 Christian Werner <[email protected]> + * Copyright (c) 2013-2015 Christian Werner <[email protected]> * * See the file "license.terms" for information on usage * and redistribution of this file and for a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/sqliteodbc.c new/sqliteodbc-0.9992/sqliteodbc.c --- old/sqliteodbc-0.9991/sqliteodbc.c 2014-12-29 10:56:35.000000000 +0100 +++ new/sqliteodbc-0.9992/sqliteodbc.c 2015-04-13 08:32:04.000000000 +0200 @@ -2,9 +2,9 @@ * @file sqliteodbc.c * SQLite ODBC Driver main module. * - * $Id: sqliteodbc.c,v 1.214 2014/12/29 09:56:27 chw Exp chw $ + * $Id: sqliteodbc.c,v 1.216 2015/04/13 06:31:52 chw Exp chw $ * - * Copyright (c) 2001-2014 Christian Werner <[email protected]> + * Copyright (c) 2001-2015 Christian Werner <[email protected]> * OS/2 Port Copyright (c) 2004 Lorne R. Sunley <[email protected]> * * See the file "license.terms" for information on usage @@ -7240,21 +7240,33 @@ STMT *s = (STMT *) stmt; DBC *d = (DBC *) s->dbc; SQLUINTEGER *uval = (SQLUINTEGER *) val; + SQLINTEGER dummy; + char dummybuf[16]; + if (!buflen) { + buflen = &dummy; + } + if (!uval) { + uval = (SQLPOINTER) dummybuf; + } switch (attr) { case SQL_QUERY_TIMEOUT: *uval = 0; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; case SQL_ATTR_CURSOR_TYPE: *uval = s->curtype; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; case SQL_ATTR_CURSOR_SCROLLABLE: *uval = (s->curtype != SQL_CURSOR_FORWARD_ONLY) ? SQL_SCROLLABLE : SQL_NONSCROLLABLE; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; #ifdef SQL_ATTR_CURSOR_SENSITIVITY case SQL_ATTR_CURSOR_SENSITIVITY: *uval = SQL_UNSPECIFIED; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; #endif case SQL_ATTR_ROW_NUMBER: @@ -7264,69 +7276,91 @@ } else { *uval = (s->rowp < 0) ? SQL_ROW_NUMBER_UNKNOWN : (s->rowp + 1); } + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; case SQL_ATTR_ASYNC_ENABLE: *uval = SQL_ASYNC_ENABLE_OFF; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; case SQL_CONCURRENCY: *uval = SQL_CONCUR_LOCK; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; case SQL_ATTR_RETRIEVE_DATA: *uval = s->retr_data; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; case SQL_ROWSET_SIZE: case SQL_ATTR_ROW_ARRAY_SIZE: *uval = s->rowset_size; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; /* Needed for some driver managers, but dummies for now */ case SQL_ATTR_IMP_ROW_DESC: case SQL_ATTR_APP_ROW_DESC: case SQL_ATTR_IMP_PARAM_DESC: case SQL_ATTR_APP_PARAM_DESC: - *((SQLHDESC *) val) = (SQLHDESC) DEAD_MAGIC; + *((SQLHDESC *) uval) = (SQLHDESC) DEAD_MAGIC; + *buflen = sizeof (SQLHDESC); return SQL_SUCCESS; case SQL_ATTR_ROW_STATUS_PTR: - *((SQLUSMALLINT **) val) = s->row_status; + *((SQLUSMALLINT **) uval) = s->row_status; + *buflen = sizeof (SQLUSMALLINT *); return SQL_SUCCESS; case SQL_ATTR_ROWS_FETCHED_PTR: - *((SQLULEN **) val) = s->row_count; + *((SQLULEN **) uval) = s->row_count; + *buflen = sizeof (SQLULEN *); return SQL_SUCCESS; case SQL_ATTR_USE_BOOKMARKS: { STMT *s = (STMT *) stmt; - *(SQLUINTEGER *) val = s->bkmrk ? SQL_UB_ON : SQL_UB_OFF; + *(SQLUINTEGER *) uval = s->bkmrk ? SQL_UB_ON : SQL_UB_OFF; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; } case SQL_ATTR_PARAM_BIND_OFFSET_PTR: - *((SQLULEN **) val) = s->parm_bind_offs; + *((SQLULEN **) uval) = s->parm_bind_offs; + *buflen = sizeof (SQLULEN *); return SQL_SUCCESS; case SQL_ATTR_PARAM_BIND_TYPE: - *((SQLUINTEGER *) val) = SQL_PARAM_BIND_BY_COLUMN; + *((SQLUINTEGER *) uval) = SQL_PARAM_BIND_BY_COLUMN; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; case SQL_ATTR_PARAM_OPERATION_PTR: - *((SQLUSMALLINT **) val) = s->parm_oper; + *((SQLUSMALLINT **) uval) = s->parm_oper; + *buflen = sizeof (SQLUSMALLINT *); return SQL_SUCCESS; case SQL_ATTR_PARAM_STATUS_PTR: - *((SQLUSMALLINT **) val) = s->parm_status; + *((SQLUSMALLINT **) uval) = s->parm_status; + *buflen = sizeof (SQLUSMALLINT *); return SQL_SUCCESS; case SQL_ATTR_PARAMS_PROCESSED_PTR: - *((SQLULEN **) val) = s->parm_proc; + *((SQLULEN **) uval) = s->parm_proc; + *buflen = sizeof (SQLULEN *); return SQL_SUCCESS; case SQL_ATTR_PARAMSET_SIZE: - *((SQLUINTEGER *) val) = s->paramset_size; + *((SQLUINTEGER *) uval) = s->paramset_size; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; case SQL_ATTR_ROW_BIND_TYPE: - *(SQLUINTEGER *) val = s->bind_type; + *(SQLUINTEGER *) uval = s->bind_type; + *buflen = sizeof (SQLUINTEGER); return SQL_SUCCESS; case SQL_ATTR_ROW_BIND_OFFSET_PTR: - *((SQLULEN **) val) = s->bind_offs; + *((SQLULEN **) uval) = s->bind_offs; + *buflen = sizeof (SQLULEN *); return SQL_SUCCESS; case SQL_ATTR_NOSCAN: - *((SQLUINTEGER **) val) = SQL_NOSCAN_OFF; + *((SQLUINTEGER **) uval) = SQL_NOSCAN_OFF; + *buflen = sizeof (SQLUINTEGER *); return SQL_SUCCESS; case SQL_ATTR_MAX_ROWS: + *((SQLULEN *) uval) = 1000000000; + *buflen = sizeof (SQLULEN); + return SQL_SUCCESS; case SQL_ATTR_MAX_LENGTH: - *((SQLINTEGER *) val) = 1000000000; + *((SQLULEN *) uval) = 1000000000; + *buflen = sizeof (SQLULEN); return SQL_SUCCESS; } return drvunimplstmt(stmt); @@ -8004,6 +8038,10 @@ *((SQLUINTEGER *) val) = SQL_SCC_XOPEN_CLI_VERSION1; *valLen = sizeof (SQLUINTEGER); break; + case SQL_SQL_CONFORMANCE: + *((SQLUINTEGER *) val) = SQL_SC_SQL92_ENTRY; + *valLen = sizeof (SQLUINTEGER); + break; case SQL_SERVER_NAME: case SQL_DATABASE_NAME: strmak(val, d->dbname ? d->dbname : "", valMax, valLen); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/sqliteodbc.h new/sqliteodbc-0.9992/sqliteodbc.h --- old/sqliteodbc-0.9991/sqliteodbc.h 2014-12-29 10:56:36.000000000 +0100 +++ new/sqliteodbc-0.9992/sqliteodbc.h 2015-04-13 08:32:04.000000000 +0200 @@ -15,9 +15,9 @@ * @file sqliteodbc.h * Header file for SQLite ODBC driver. * - * $Id: sqliteodbc.h,v 1.61 2014/12/29 09:56:27 chw Exp chw $ + * $Id: sqliteodbc.h,v 1.62 2015/04/13 06:31:52 chw Exp chw $ * - * Copyright (c) 2001-2014 Christian Werner <[email protected]> + * Copyright (c) 2001-2015 Christian Werner <[email protected]> * * See the file "license.terms" for information on usage * and redistribution of this file and for a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqliteodbc-0.9991/sqliteodbc.spec new/sqliteodbc-0.9992/sqliteodbc.spec --- old/sqliteodbc-0.9991/sqliteodbc.spec 2014-12-29 10:58:54.000000000 +0100 +++ new/sqliteodbc-0.9992/sqliteodbc.spec 2015-04-13 08:32:42.000000000 +0200 @@ -1,5 +1,5 @@ %define name sqliteodbc -%define version 0.9991 +%define version 0.9992 %define release 1 Name: %{name} @@ -102,5 +102,5 @@ %{_libdir}/*.so* %changelog -* Mon Dec 29 2014 ... +* Mon Apr 13 2015 ... - automatically recreated by configure ...
