diff options
Diffstat (limited to 'lang/sql/jdbc')
45 files changed, 1086 insertions, 791 deletions
diff --git a/lang/sql/jdbc/ChangeLog b/lang/sql/jdbc/ChangeLog index 73261387..4b1eeeb6 100644 --- a/lang/sql/jdbc/ChangeLog +++ b/lang/sql/jdbc/ChangeLog @@ -1,3 +1,15 @@ +2013-11-24 + + * fixed memory leak in SQLite.Database.vm_compile as + suggested by Vijay Shankar Rajanna + +2013-02-14 + + * improved vatest in configure as suggested by Michael Brey + * fixed memory leaks in SQLite.Database.(re)key as + suggested by Tam'as Kov'acs + * fixed concurrency/locking issues in finalizer methods + 2012-02-09 * added newer sqlite3_status(), sqlite3_db_status() constants diff --git a/lang/sql/jdbc/Makefile.in b/lang/sql/jdbc/Makefile.in index 4e01e8bb..071b0865 100644 --- a/lang/sql/jdbc/Makefile.in +++ b/lang/sql/jdbc/Makefile.in @@ -209,11 +209,17 @@ test3: all $(JAVA_RUN) $(JAVA_FLAGS) -classpath sqlite.jar:$(CURDIR) \ -DSQLite.library.path=$(CURDIR)/.libs test3 +testg: all + $(JAVAC) -classpath sqlite.jar:$(CURDIR) $(JAVAC_FLAGS) testg.java + LD_LIBRARY_PATH="$$LD_LIBRARY_PATH:$(CURDIR)/.libs" \ + $(JAVA_RUN) $(JAVA_FLAGS) -classpath sqlite.jar:$(CURDIR) \ + -DSQLite.library.path=$(CURDIR)/.libs testg + clean: $(RM) SQLite/*.class SQLite/@JDBCVER@/*.class *.lo *.la *.o *~ \ native/sqlite_jni.h native/mkconst \ SQLite/Constants.java \ - test.class test3.class sqlite.jar conftest* + test.class test3.class testg.class sqlite.jar conftest* $(RM) -r .libs native/.libs META-INF distclean: clean diff --git a/lang/sql/jdbc/SQLite/Constants.java b/lang/sql/jdbc/SQLite/Constants.java index 2bd2d7f1..e249f75f 100644 --- a/lang/sql/jdbc/SQLite/Constants.java +++ b/lang/sql/jdbc/SQLite/Constants.java @@ -117,7 +117,7 @@ public final class Constants { public static final int SQLITE_OPEN_TEMP_DB = 512; public static final int SQLITE_OPEN_TEMP_JOURNAL = 4096; public static final int SQLITE_OPEN_TRANSIENT_DB = 1024; - public static final int SQLITE_OPEN_URI = 0; + public static final int SQLITE_OPEN_URI = 64; public static final int SQLITE_OPEN_WAL = 524288; public static final int SQLITE_STATUS_MALLOC_COUNT = 9; public static final int SQLITE_STATUS_MALLOC_SIZE = 5; @@ -129,8 +129,8 @@ public final class Constants { public static final int SQLITE_STATUS_SCRATCH_OVERFLOW = 4; public static final int SQLITE_STATUS_SCRATCH_SIZE = 8; public static final int SQLITE_STATUS_SCRATCH_USED = 3; - public static final int SQLITE_DBSTATUS_CACHE_HIT = 0; - public static final int SQLITE_DBSTATUS_CACHE_MISS = 0; + public static final int SQLITE_DBSTATUS_CACHE_HIT = 7; + public static final int SQLITE_DBSTATUS_CACHE_MISS = 8; public static final int SQLITE_DBSTATUS_CACHE_USED = 1; public static final int SQLITE_DBSTATUS_LOOKASIDE_HIT = 4; public static final int SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE = 5; diff --git a/lang/sql/jdbc/SQLite/Database.java b/lang/sql/jdbc/SQLite/Database.java index 5d31b361..5185423f 100644 --- a/lang/sql/jdbc/SQLite/Database.java +++ b/lang/sql/jdbc/SQLite/Database.java @@ -504,7 +504,7 @@ public class Database { private native void _function_type(String name, int type); /** - * Return the code of the last error occured in + * Return the code of the last error occurred in * any of the exec() methods. The value is valid * after an Exception has been reported by one of * these methods. See the <A HREF="Constants.html">Constants</A> diff --git a/lang/sql/jdbc/SQLite/Database.java-sync1 b/lang/sql/jdbc/SQLite/Database.java-sync1 deleted file mode 100644 index 62121974..00000000 --- a/lang/sql/jdbc/SQLite/Database.java-sync1 +++ /dev/null @@ -1,473 +0,0 @@ -package SQLite; - -/** - * Main class wrapping an SQLite database. - */ - -public class Database { - - /** - * Internal handle for the native SQLite API. - */ - - protected long handle = 0; - - /** - * Internal last error code for exec() methods. - */ - - protected int error_code = 0; - - /** - * Open an SQLite database file. - * - * @param filename the name of the database file - * @param mode open mode, currently ignored - */ - - public synchronized void open(String filename, int mode) - throws SQLite.Exception { - _open(filename, mode); - } - - private native void _open(String filename, int mode) - throws SQLite.Exception; - - /** - * Open SQLite auxiliary database file for temporary - * tables. - * - * @param filename the name of the auxiliary file or null - */ - - public synchronized void open_aux_file(String filename) - throws SQLite.Exception { - _open_aux_file(filename); - } - - private native void _open_aux_file(String filename) - throws SQLite.Exception; - - /** - * Destructor for object. - */ - - protected synchronized void finalize() { - _finalize(); - } - - private native void _finalize(); - - /** - * Close the underlying SQLite database file. - */ - - public synchronized void close() - throws SQLite.Exception { - _close(); - } - - private native void _close() - throws SQLite.Exception; - - /** - * Execute an SQL statement and invoke callback methods - * for each row of the result set.<P> - * - * It the method fails, an SQLite.Exception is thrown and - * an error code is set, which later can be retrieved by - * the last_error() method. - * - * @param sql the SQL statement to be executed - * @param cb the object implementing the callback methods - */ - - public synchronized void exec(String sql, SQLite.Callback cb) - throws SQLite.Exception { - _exec(sql, cb); - } - - private native void _exec(String sql, SQLite.Callback cb) - throws SQLite.Exception; - - /** - * Execute an SQL statement and invoke callback methods - * for each row of the result set. Each '%q' or %Q in the - * statement string is substituted by its corresponding - * element in the argument vector. - * <BR><BR> - * Example:<BR> - * <PRE> - * String args[] = new String[1]; - * args[0] = "tab%"; - * db.exec("select * from sqlite_master where type like '%q'", - * null, args); - * </PRE> - * - * It the method fails, an SQLite.Exception is thrown and - * an error code is set, which later can be retrieved by - * the last_error() method. - * - * @param sql the SQL statement to be executed - * @param cb the object implementing the callback methods - * @param args arguments for the SQL statement, '%q' substitution - */ - - public synchronized void exec(String sql, SQLite.Callback cb, - String args[]) throws SQLite.Exception { - _exec(sql, cb, args); - } - - private native void _exec(String sql, SQLite.Callback cb, String args[]) - throws SQLite.Exception; - - /** - * Return the row identifier of the last inserted - * row. - */ - - public synchronized long last_insert_rowid() { - return _last_insert_rowid(); - } - - private native long _last_insert_rowid(); - - /** - * Abort the current SQLite operation. - */ - - public synchronized void interrupt() { - _interrupt(); - } - - private native void _interrupt(); - - /** - * Return the number of changed rows for the last statement. - */ - - public synchronized long changes() { - return _changes(); - } - - private native long _changes(); - - /** - * Establish a busy callback method which gets called when - * an SQLite table is locked. - * - * @param bh the object implementing the busy callback method - */ - - public synchronized void busy_handler(SQLite.BusyHandler bh) { - _busy_handler(bh); - } - - private native void _busy_handler(SQLite.BusyHandler bh); - - /** - * Set the timeout for waiting for an SQLite table to become - * unlocked. - * - * @param ms number of millisecond to wait - */ - - public synchronized void busy_timeout(int ms) { - _busy_timeout(ms); - } - - private native void _busy_timeout(int ms); - - /** - * Convenience method to retrieve an entire result - * set into memory. - * - * @param sql the SQL statement to be executed - * @return result set - */ - - public TableResult get_table(String sql) throws SQLite.Exception { - TableResult ret = new TableResult(); - if (!is3()) { - exec(sql, ret); - } else { - /* only one statement !!! */ - Vm vm = compile(sql); - set_last_error(vm.error_code); - while (vm.step(ret)) { - set_last_error(vm.error_code); - } - vm.finalize(); - } - return ret; - } - - /** - * Convenience method to retrieve an entire result - * set into memory. - * - * @param sql the SQL statement to be executed - * @param args arguments for the SQL statement, '%q' substitution - * @return result set - */ - - public TableResult get_table(String sql, String args[]) - throws SQLite.Exception { - TableResult ret = new TableResult(); - if (!is3()) { - exec(sql, ret, args); - } else { - /* only one statement !!! */ - Vm vm = compile(sql, args); - set_last_error(vm.error_code); - while (vm.step(ret)) { - set_last_error(vm.error_code); - } - vm.finalize(); - } - return ret; - } - - /** - * Convenience method to retrieve an entire result - * set into memory. - * - * @param sql the SQL statement to be executed - * @param args arguments for the SQL statement, '%q' substitution - * @param tbl TableResult to receive result set - * @return result set - */ - - public void get_table(String sql, String args[], TableResult tbl) - throws SQLite.Exception { - tbl.clear(); - if (!is3()) { - exec(sql, tbl, args); - } else { - /* only one statement !!! */ - Vm vm = compile(sql, args); - while (vm.step(tbl)) { - } - vm.finalize(); - } - } - - /** - * See if an SQL statement is complete. - * Returns true if the input string comprises - * one or more complete SQL statements. - * - * @param sql the SQL statement to be checked - */ - - public synchronized static boolean complete(String sql) { - return _complete(sql); - } - - private native static boolean _complete(String sql); - - /** - * Return SQLite version number as string. - * Don't rely on this when both SQLite 2 and 3 are compiled - * into the native part. Use the class method in this case. - */ - - public native static String version(); - - /** - * Return SQLite version number as string. - * If the database is not open, <tt>unknown</tt> is returned. - */ - - public native String dbversion(); - - /** - * Create regular function. - * - * @param name the name of the new function - * @param nargs number of arguments to function - * @param f interface of function - */ - - public native void create_function(String name, int nargs, Function f); - - /** - * Create aggregate function. - * - * @param name the name of the new function - * @param nargs number of arguments to function - * @param f interface of function - */ - - public native void create_aggregate(String name, int nargs, Function f); - - /** - * Set function return type. Only available in SQLite 2.6.0 and - * above, otherwise a no-op. - * - * @param name the name of the function whose return type is to be set - * @param type return type code, e.g. SQLite.Constants.SQLITE_NUMERIC - */ - - public native void function_type(String name, int type); - - /** - * Return the code of the last error occured in - * any of the exec() methods. The value is valid - * after an Exception has been reported by one of - * these methods. See the <A HREF="Constants.html">Constants</A> - * class for possible values. - * - * @return SQLite error code - */ - - public int last_error() { - return error_code; - } - - /** - * Internal: set error code. - * @param error_code new error code - */ - - protected void set_last_error(int error_code) { - this.error_code = error_code; - } - - /** - * Return error string given SQLite error code. - * - * @param error_code the error code - * @return error string - */ - - public static native String error_string(int error_code); - - /** - * Set character encoding. - * @param enc name of encoding - */ - - public synchronized void set_encoding(String enc) throws SQLite.Exception { - _set_encoding(enc); - } - - private native void _set_encoding(String enc) - throws SQLite.Exception; - - /** - * Set authorizer function. Only available in SQLite 2.7.6 and - * above, otherwise a no-op. - * - * @param auth the authorizer function - */ - - public synchronized void set_authorizer(Authorizer auth) { - _set_authorizer(auth); - } - - private native void _set_authorizer(Authorizer auth); - - /** - * Set trace function. Only available in SQLite 2.7.6 and above, - * otherwise a no-op. - * - * @param tr the trace function - */ - - public synchronized void trace(Trace tr) { - _trace(tr); - } - - private native void _trace(Trace tr); - - /** - * Compile and return SQLite VM for SQL statement. Only available - * in SQLite 2.8.0 and above, otherwise a no-op. - * - * @param sql SQL statement to be compiled - * @return a Vm object - */ - - public synchronized Vm compile(String sql) throws SQLite.Exception { - Vm vm = new Vm(); - vm_compile(sql, vm); - return vm; - } - - /** - * Compile and return SQLite VM for SQL statement. Only available - * in SQLite 3.0 and above, otherwise a no-op. - * - * @param sql SQL statement to be compiled - * @param args arguments for the SQL statement, '%q' substitution - * @return a Vm object - */ - - public synchronized Vm compile(String sql, String args[]) - throws SQLite.Exception { - Vm vm = new Vm(); - vm_compile_args(sql, vm, args); - return vm; - } - - /** - * Check type of open database. - * @return true if SQLite3 database - */ - - public native boolean is3(); - - /** - * Internal compile method. - * @param sql SQL statement - * @param vm Vm object - */ - - private native void vm_compile(String sql, Vm vm) - throws SQLite.Exception; - - /** - * Internal compile method, SQLite 3.0 only. - * @param sql SQL statement - * @param args arguments for the SQL statement, '%q' substitution - * @param vm Vm object - */ - - private native void vm_compile_args(String sql, Vm vm, String args[]) - throws SQLite.Exception; - - /** - * Establish a progress callback method which gets called after - * N SQLite VM opcodes. - * - * @param n number of SQLite VM opcodes until callback is invoked - * @param p the object implementing the progress callback method - */ - - public synchronized void progress_handler(int n, - SQLite.ProgressHandler p) { - _progress_handler(n, p); - } - - private native void _progress_handler(int n, SQLite.ProgressHandler p); - - /** - * Internal native initializer. - */ - - private static native void internal_init(); - - /** - * Static initializer to load the native part. - */ - - static { - try { - System.loadLibrary("sqlite_jni"); - internal_init(); - } catch (Throwable t) { - System.err.println("Unable to load sqlite: " + t); - } - } -} diff --git a/lang/sql/jdbc/VERSION b/lang/sql/jdbc/VERSION index 65b588f1..a7c75d6a 100644 --- a/lang/sql/jdbc/VERSION +++ b/lang/sql/jdbc/VERSION @@ -1 +1 @@ -20120209 +20131124 diff --git a/lang/sql/jdbc/configure b/lang/sql/jdbc/configure index 79f1dd59..34a6fe00 100755 --- a/lang/sql/jdbc/configure +++ b/lang/sql/jdbc/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67. +# Generated by GNU Autoconf 2.68. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -89,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -214,11 +215,18 @@ IFS=$as_save_IFS # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -1303,7 +1311,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1614,7 +1622,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1660,7 +1668,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1706,7 +1714,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1720,7 +1728,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1738,7 +1746,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1774,7 +1782,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1816,7 +1824,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1829,7 +1837,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1884,7 +1892,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func cat >config.log <<_ACEOF @@ -1892,7 +1900,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2150,7 +2158,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2330,7 +2338,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -2346,7 +2354,7 @@ fi $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2364,7 +2372,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -2379,7 +2387,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2405,7 +2413,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2445,7 +2453,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2498,7 +2506,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2538,7 +2546,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2597,7 +2605,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2641,7 +2649,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2696,7 +2704,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2811,7 +2819,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2854,7 +2862,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -2913,7 +2921,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -2924,7 +2932,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2965,7 +2973,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -2975,7 +2983,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3012,7 +3020,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3090,7 +3098,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3187,7 +3195,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -3269,7 +3277,7 @@ Xsed="$SED -e 1s/^X//" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -3332,7 +3340,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -3399,7 +3407,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then : +if ${ac_cv_path_FGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -3530,7 +3538,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then : +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -3570,7 +3578,7 @@ fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then : +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -3597,7 +3605,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then : +if ${lt_cv_path_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -3657,7 +3665,7 @@ else set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : +if ${ac_cv_prog_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -3701,7 +3709,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -3764,18 +3772,18 @@ test -z "$NM" && NM=nm { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then : +if ${lt_cv_nm_interface+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:3772: $ac_compile\"" >&5) + (eval echo "\"\$as_me:3780: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:3775: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:3783: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:3778: output\"" >&5) + (eval echo "\"\$as_me:3786: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -3799,7 +3807,7 @@ fi # find the maximum length of command line arguments { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then : +if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 @@ -3991,7 +3999,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then : +if ${lt_cv_ld_reload_flag+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' @@ -4027,7 +4035,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -4067,7 +4075,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then set dummy objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -4126,7 +4134,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then : +if ${lt_cv_deplibs_check_method+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -4342,7 +4350,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then : +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -4382,7 +4390,7 @@ if test -z "$ac_cv_prog_AR"; then set dummy ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -4447,7 +4455,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -4487,7 +4495,7 @@ if test -z "$ac_cv_prog_STRIP"; then set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -4546,7 +4554,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then : +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -4586,7 +4594,7 @@ if test -z "$ac_cv_prog_RANLIB"; then set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -4703,7 +4711,7 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : +if ${lt_cv_sys_global_symbol_pipe+:} false; then : $as_echo_n "(cached) " >&6 else @@ -4981,7 +4989,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4984 "configure"' > conftest.$ac_ext + echo '#line 4992 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5075,7 +5083,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then : +if ${lt_cv_cc_needs_belf+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -5151,7 +5159,7 @@ need_locks="$enable_libtool_lock" set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -5191,7 +5199,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then set dummy dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -5243,7 +5251,7 @@ fi set dummy ${ac_tool_prefix}nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then : +if ${ac_cv_prog_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -5283,7 +5291,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then set dummy nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -5335,7 +5343,7 @@ fi set dummy ${ac_tool_prefix}lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then : +if ${ac_cv_prog_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -5375,7 +5383,7 @@ if test -z "$ac_cv_prog_LIPO"; then set dummy lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -5427,7 +5435,7 @@ fi set dummy ${ac_tool_prefix}otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then : +if ${ac_cv_prog_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -5467,7 +5475,7 @@ if test -z "$ac_cv_prog_OTOOL"; then set dummy otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -5519,7 +5527,7 @@ fi set dummy ${ac_tool_prefix}otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then : +if ${ac_cv_prog_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -5559,7 +5567,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then set dummy otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -5634,7 +5642,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then : +if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -5663,7 +5671,7 @@ fi $as_echo "$lt_cv_apple_cc_single_mod" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : +if ${lt_cv_ld_exported_symbols_list+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no @@ -5740,7 +5748,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -5856,7 +5864,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -5868,7 +5876,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5999,7 +6007,7 @@ for ac_header in dlfcn.h do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = x""yes; then : +if test "x$ac_cv_header_dlfcn_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DLFCN_H 1 _ACEOF @@ -6153,7 +6161,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then : +if ${lt_cv_objdir+:} false; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -6261,7 +6269,7 @@ file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -6327,7 +6335,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -6460,7 +6468,7 @@ if test "$GCC" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -6476,11 +6484,11 @@ else -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:6479: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6487: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6483: \$? = $ac_status" >&5 + echo "$as_me:6491: \$? = $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. @@ -6799,7 +6807,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; } if test -n "$lt_prog_compiler_pic"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : +if ${lt_cv_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -6815,11 +6823,11 @@ else -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:6818: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6826: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6822: \$? = $ac_status" >&5 + echo "$as_me:6830: \$? = $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. @@ -6858,7 +6866,7 @@ fi wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then : +if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -6901,7 +6909,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -6920,11 +6928,11 @@ else -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:6923: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6931: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6927: \$? = $ac_status" >&5 + echo "$as_me:6935: \$? = $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 @@ -6956,7 +6964,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -6975,11 +6983,11 @@ else -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:6978: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6986: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6982: \$? = $ac_status" >&5 + echo "$as_me:6990: \$? = $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 @@ -9087,7 +9095,7 @@ else # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9121,7 +9129,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -9135,12 +9143,12 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = x""yes; then : +if test "x$ac_cv_func_shl_load" = xyes; then : lt_cv_dlopen="shl_load" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then : +if ${ac_cv_lib_dld_shl_load+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9174,16 +9182,16 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = x""yes; then : +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen="dlopen" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9217,12 +9225,12 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then : +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9256,12 +9264,12 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then : +if ${ac_cv_lib_dld_dld_link+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9295,7 +9303,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -9336,7 +9344,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then : +if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -9345,7 +9353,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9348 "configure" +#line 9356 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9432,7 +9440,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; } wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then : +if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -9441,7 +9449,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9444 "configure" +#line 9452 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9685,7 +9693,7 @@ CC="$lt_save_CC" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9769,7 +9777,7 @@ HOSTCC=${HOSTCC:-cc} { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 $as_echo_n "checking target system type... " >&6; } -if test "${ac_cv_target+set}" = set; then : +if ${ac_cv_target+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$target_alias" = x; then @@ -9784,7 +9792,7 @@ fi $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -9937,7 +9945,7 @@ if test "$HAVE_SQLITE2" = 1 ; then LIBS="$LIBS $SQLITE_LIBDIR" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_function_type in -lsqlite" >&5 $as_echo_n "checking for sqlite_function_type in -lsqlite... " >&6; } -if test "${ac_cv_lib_sqlite_sqlite_function_type+set}" = set; then : +if ${ac_cv_lib_sqlite_sqlite_function_type+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9971,7 +9979,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_function_type" >&5 $as_echo "$ac_cv_lib_sqlite_sqlite_function_type" >&6; } -if test "x$ac_cv_lib_sqlite_sqlite_function_type" = x""yes; then : +if test "x$ac_cv_lib_sqlite_sqlite_function_type" = xyes; then : HAVE_SQLITE_FUNCTION_TYPE=1 else HAVE_SQLITE_FUNCTION_TYPE=0 @@ -9979,7 +9987,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_open_aux_file in -lsqlite" >&5 $as_echo_n "checking for sqlite_open_aux_file in -lsqlite... " >&6; } -if test "${ac_cv_lib_sqlite_sqlite_open_aux_file+set}" = set; then : +if ${ac_cv_lib_sqlite_sqlite_open_aux_file+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10013,7 +10021,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_open_aux_file" >&5 $as_echo "$ac_cv_lib_sqlite_sqlite_open_aux_file" >&6; } -if test "x$ac_cv_lib_sqlite_sqlite_open_aux_file" = x""yes; then : +if test "x$ac_cv_lib_sqlite_sqlite_open_aux_file" = xyes; then : HAVE_SQLITE_OPEN_AUX_FILE=1 else HAVE_SQLITE_OPEN_AUX_FILE=0 @@ -10021,7 +10029,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_set_authorizer in -lsqlite" >&5 $as_echo_n "checking for sqlite_set_authorizer in -lsqlite... " >&6; } -if test "${ac_cv_lib_sqlite_sqlite_set_authorizer+set}" = set; then : +if ${ac_cv_lib_sqlite_sqlite_set_authorizer+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10055,7 +10063,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_set_authorizer" >&5 $as_echo "$ac_cv_lib_sqlite_sqlite_set_authorizer" >&6; } -if test "x$ac_cv_lib_sqlite_sqlite_set_authorizer" = x""yes; then : +if test "x$ac_cv_lib_sqlite_sqlite_set_authorizer" = xyes; then : HAVE_SQLITE_SET_AUTHORIZER=1 else HAVE_SQLITE_SET_AUTHORIZER=0 @@ -10063,7 +10071,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_trace in -lsqlite" >&5 $as_echo_n "checking for sqlite_trace in -lsqlite... " >&6; } -if test "${ac_cv_lib_sqlite_sqlite_trace+set}" = set; then : +if ${ac_cv_lib_sqlite_sqlite_trace+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10097,7 +10105,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_trace" >&5 $as_echo "$ac_cv_lib_sqlite_sqlite_trace" >&6; } -if test "x$ac_cv_lib_sqlite_sqlite_trace" = x""yes; then : +if test "x$ac_cv_lib_sqlite_sqlite_trace" = xyes; then : HAVE_SQLITE_TRACE=1 else HAVE_SQLITE_TRACE=0 @@ -10105,7 +10113,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_compile in -lsqlite" >&5 $as_echo_n "checking for sqlite_compile in -lsqlite... " >&6; } -if test "${ac_cv_lib_sqlite_sqlite_compile+set}" = set; then : +if ${ac_cv_lib_sqlite_sqlite_compile+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10139,7 +10147,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_compile" >&5 $as_echo "$ac_cv_lib_sqlite_sqlite_compile" >&6; } -if test "x$ac_cv_lib_sqlite_sqlite_compile" = x""yes; then : +if test "x$ac_cv_lib_sqlite_sqlite_compile" = xyes; then : HAVE_SQLITE_COMPILE=1 else HAVE_SQLITE_COMPILE=0 @@ -10147,7 +10155,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_progress_handler in -lsqlite" >&5 $as_echo_n "checking for sqlite_progress_handler in -lsqlite... " >&6; } -if test "${ac_cv_lib_sqlite_sqlite_progress_handler+set}" = set; then : +if ${ac_cv_lib_sqlite_sqlite_progress_handler+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10181,7 +10189,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_progress_handler" >&5 $as_echo "$ac_cv_lib_sqlite_sqlite_progress_handler" >&6; } -if test "x$ac_cv_lib_sqlite_sqlite_progress_handler" = x""yes; then : +if test "x$ac_cv_lib_sqlite_sqlite_progress_handler" = xyes; then : HAVE_SQLITE_PROGRESS_HANDLER=1 else HAVE_SQLITE_PROGRESS_HANDLER=0 @@ -10197,6 +10205,29 @@ fi +HAVE_SQLITE3_MALLOC=0 +HAVE_SQLITE3_PREPARE_V2=0 +HAVE_SQLITE3_PREPARE16_V2=0 +HAVE_SQLITE3_BIND_ZEROBLOB=0 +HAVE_SQLITE3_CLEAR_BINDINGS=0 +HAVE_SQLITE3_COLUMN_TABLE_NAME16=0 +HAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 +HAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0 +HAVE_SQLITE3_BIND_PARAMETER_COUNT=0 +HAVE_SQLITE3_BIND_PARAMETER_NAME=0 +HAVE_SQLITE3_BIND_PARAMETER_INDEX=0 +HAVE_SQLITE3_RESULT_ZEROBLOB=0 +HAVE_SQLITE3_INCRBLOBIO=0 +HAVE_SQLITE3_KEY="${HAVE_SQLITE3_KEY:-0}" +HAVE_SQLITE3_SHARED_CACHE=0 +HAVE_SQLITE3_OPEN_V2=0 +HAVE_SQLITE3_LOAD_EXTENSION=0 +HAVE_SQLITE3_BACKUPAPI=0 +HAVE_SQLITE3_PROFILE=0 +HAVE_SQLITE3_STATUS=0 +HAVE_SQLITE3_DB_STATUS=0 +HAVE_SQLITE3_STMT_STATUS=0 + ########## # Find SQLite3 header file and library # @@ -10319,28 +10350,6 @@ if test "${enable_load_extension+set}" = set; then : fi test "x$enable_load_extension" = "xyes" || enable_load_extension=no -HAVE_SQLITE3_MALLOC=0 -HAVE_SQLITE3_PREPARE_V2=0 -HAVE_SQLITE3_PREPARE16_V2=0 -HAVE_SQLITE3_BIND_ZEROBLOB=0 -HAVE_SQLITE3_CLEAR_BINDINGS=0 -HAVE_SQLITE3_COLUMN_TABLE_NAME16=0 -HAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 -HAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0 -HAVE_SQLITE3_BIND_PARAMETER_COUNT=0 -HAVE_SQLITE3_BIND_PARAMETER_NAME=0 -HAVE_SQLITE3_BIND_PARAMETER_INDEX=0 -HAVE_SQLITE3_RESULT_ZEROBLOB=0 -HAVE_SQLITE3_INCRBLOBIO=0 -HAVE_SQLITE3_KEY=0 -HAVE_SQLITE3_SHARED_CACHE=0 -HAVE_SQLITE3_OPEN_V2=0 -HAVE_SQLITE3_LOAD_EXTENSION=0 -HAVE_SQLITE3_BACKUPAPI=0 -HAVE_SQLITE3_PROFILE=0 -HAVE_SQLITE3_STATUS=0 -HAVE_SQLITE3_DB_STATUS=0 -HAVE_SQLITE3_STMT_STATUS=0 if test "$HAVE_SQLITE3" = 1 -a -n "$SQLITE3_A10N_C" ; then HAVE_SQLITE3_MALLOC=1 HAVE_SQLITE3_PREPARE_V2=1 @@ -10373,7 +10382,7 @@ if test "$HAVE_SQLITE3" = 1 -a -z "$SQLITE3_A10N_C" ; then LIBS="$LIBS $SQLITE3_LIBDIR" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_malloc in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_malloc in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_malloc+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_malloc+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10407,7 +10416,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_malloc" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_malloc" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_malloc" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_malloc" = xyes; then : HAVE_SQLITE3_MALLOC=1 else HAVE_SQLITE3_MALLOC=0 @@ -10415,7 +10424,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_prepare_v2 in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_prepare_v2+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_prepare_v2+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10449,7 +10458,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_prepare_v2" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_prepare_v2" = xyes; then : HAVE_SQLITE3_PREPARE_V2=1 else HAVE_SQLITE3_PREPARE_V2=0 @@ -10457,7 +10466,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_prepare16_v2 in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_prepare16_v2 in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_prepare16_v2+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_prepare16_v2+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10491,7 +10500,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_prepare16_v2" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_prepare16_v2" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_prepare16_v2" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_prepare16_v2" = xyes; then : HAVE_SQLITE3_PREPARE16_V2=1 else HAVE_SQLITE3_PREPARE16_V2=0 @@ -10499,7 +10508,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_bind_zeroblob in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_bind_zeroblob in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_bind_zeroblob+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_bind_zeroblob+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10533,7 +10542,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_bind_zeroblob" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_bind_zeroblob" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_bind_zeroblob" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_bind_zeroblob" = xyes; then : HAVE_SQLITE3_BIND_ZEROBLOB=1 else HAVE_SQLITE3_BIND_ZEROBLOB=0 @@ -10541,7 +10550,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_clear_bindings in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_clear_bindings in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_clear_bindings+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_clear_bindings+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10575,7 +10584,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_clear_bindings" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_clear_bindings" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_clear_bindings" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_clear_bindings" = xyes; then : HAVE_SQLITE3_CLEAR_BINDINGS=1 else HAVE_SQLITE3_CLEAR_BINDINGS=0 @@ -10583,7 +10592,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_table_name16 in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_column_table_name16 in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_column_table_name16+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_column_table_name16+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10617,7 +10626,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name16" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_column_table_name16" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_column_table_name16" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_column_table_name16" = xyes; then : HAVE_SQLITE3_COLUMN_TABLE_NAME16=1 else HAVE_SQLITE3_COLUMN_TABLE_NAME16=0 @@ -10625,7 +10634,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_database_name16 in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_column_database_name16 in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_column_database_name16+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_column_database_name16+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10659,7 +10668,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_database_name16" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_column_database_name16" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_column_database_name16" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_column_database_name16" = xyes; then : HAVE_SQLITE3_COLUMN_DATABASE_NAME16=1 else HAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 @@ -10667,7 +10676,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_origin_name16 in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_column_origin_name16 in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_column_origin_name16+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_column_origin_name16+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10701,7 +10710,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_origin_name16" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_column_origin_name16" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_column_origin_name16" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_column_origin_name16" = xyes; then : HAVE_SQLITE3_COLUMN_ORIGIN_NAME16=1 else HAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0 @@ -10709,7 +10718,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_bind_parameter_count in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_bind_parameter_count in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_bind_parameter_count+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_bind_parameter_count+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10743,7 +10752,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_bind_parameter_count" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_bind_parameter_count" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_bind_parameter_count" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_bind_parameter_count" = xyes; then : HAVE_SQLITE3_BIND_PARAMETER_COUNT=1 else HAVE_SQLITE3_BIND_PARAMETER_COUNT=0 @@ -10751,7 +10760,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_bind_parameter_name in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_bind_parameter_name in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_bind_parameter_name+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_bind_parameter_name+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10785,7 +10794,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_bind_parameter_name" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_bind_parameter_name" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_bind_parameter_name" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_bind_parameter_name" = xyes; then : HAVE_SQLITE3_BIND_PARAMETER_NAME=1 else HAVE_SQLITE3_BIND_PARAMETER_NAME=0 @@ -10793,7 +10802,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_bind_parameter_index in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_bind_parameter_index in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_bind_parameter_index+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_bind_parameter_index+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10827,7 +10836,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_bind_parameter_index" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_bind_parameter_index" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_bind_parameter_index" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_bind_parameter_index" = xyes; then : HAVE_SQLITE3_BIND_PARAMETER_INDEX=1 else HAVE_SQLITE3_BIND_PARAMETER_INDEX=0 @@ -10835,7 +10844,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_result_zeroblob in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_result_zeroblob in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_result_zeroblob+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_result_zeroblob+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10869,7 +10878,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_result_zeroblob" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_result_zeroblob" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_result_zeroblob" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_result_zeroblob" = xyes; then : HAVE_SQLITE3_RESULT_ZEROBLOB=1 else HAVE_SQLITE3_RESULT_ZEROBLOB=0 @@ -10877,7 +10886,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_blob_open in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_blob_open in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_blob_open+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_blob_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10911,7 +10920,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_blob_open" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_blob_open" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_blob_open" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_blob_open" = xyes; then : HAVE_SQLITE3_INCRBLOBIO=1 else HAVE_SQLITE3_INCRBLOBIO=0 @@ -10919,7 +10928,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_key in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_key in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_key+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_key+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10953,7 +10962,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_key" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_key" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_key" = xyes; then : HAVE_SQLITE3_KEY=1 else HAVE_SQLITE3_KEY=0 @@ -10961,7 +10970,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_rekey in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_rekey in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_rekey+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_rekey+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10995,7 +11004,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_rekey" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_rekey" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_rekey" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_rekey" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBSQLITE3 1 _ACEOF @@ -11008,7 +11017,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_enable_shared_cache in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_enable_shared_cache in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_enable_shared_cache+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_enable_shared_cache+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11042,7 +11051,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_enable_shared_cache" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_enable_shared_cache" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_enable_shared_cache" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_enable_shared_cache" = xyes; then : HAVE_SQLITE3_SHARED_CACHE=1 else HAVE_SQLITE3_SHARED_CACHE=0 @@ -11050,7 +11059,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open_v2 in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_open_v2 in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_open_v2+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_open_v2+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11084,7 +11093,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open_v2" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_open_v2" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_open_v2" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_open_v2" = xyes; then : HAVE_SQLITE3_OPEN_V2=1 else HAVE_SQLITE3_OPEN_V2=0 @@ -11093,7 +11102,7 @@ fi if test "$enable_load_extension" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_load_extension in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_load_extension+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_load_extension+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11127,7 +11136,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = xyes; then : HAVE_SQLITE3_LOAD_EXTENSION=1 else HAVE_SQLITE3_LOAD_EXTENSION=0 @@ -11136,7 +11145,7 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_backup_init in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_backup_init in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_backup_init+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_backup_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11170,7 +11179,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_backup_init" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_backup_init" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_backup_init" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_backup_init" = xyes; then : HAVE_SQLITE3_BACKUPAPI=1 else HAVE_SQLITE3_BACKUPAPI=0 @@ -11178,7 +11187,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_profile in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_profile in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_profile+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_profile+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11212,7 +11221,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_profile" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_profile" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_profile" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_profile" = xyes; then : HAVE_SQLITE3_PROFILE=1 else HAVE_SQLITE3_PROFILE=0 @@ -11220,7 +11229,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_status in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_status in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_status+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_status+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11254,7 +11263,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_status" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_status" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_status" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_status" = xyes; then : HAVE_SQLITE3_STATUS=1 else HAVE_SQLITE3_STATUS=0 @@ -11262,7 +11271,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_db_status in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_db_status in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_db_status+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_db_status+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11296,7 +11305,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_db_status" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_db_status" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_db_status" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_db_status" = xyes; then : HAVE_SQLITE3_DB_STATUS=1 else HAVE_SQLITE3_DB_STATUS=0 @@ -11304,7 +11313,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_stmt_status in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_stmt_status in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_stmt_status+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_stmt_status+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11338,7 +11347,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_stmt_status" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_stmt_status" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_stmt_status" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_stmt_status" = xyes; then : HAVE_SQLITE3_STMT_STATUS=1 else HAVE_SQLITE3_STMT_STATUS=0 @@ -11406,6 +11415,12 @@ else #include <stdio.h> static int +vatest2(va_list ap) +{ + return 0; +} + +static int vatest(char **x, ...) { va_list ap; @@ -11423,6 +11438,9 @@ vatest(char **x, ...) int main(int argc, char **argv) { + /* Check if we can convert char ** to va_list. */ + vatest2((va_list) argv); + /* Check if parameters are passed through stack. */ exit(vatest(NULL, vatest, 0.0, 0, NULL)); } @@ -11455,7 +11473,7 @@ fi set dummy readlink; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_READLINK+set}" = set; then : +if ${ac_cv_prog_READLINK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$READLINK"; then @@ -11701,10 +11719,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -11772,7 +11801,7 @@ LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -11873,6 +11902,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12180,7 +12210,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -12237,7 +12267,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.67, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" Copyright (C) 2010 Free Software Foundation, Inc. @@ -12609,7 +12639,7 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -12631,9 +12661,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -12641,12 +12672,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -12668,7 +12700,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -12696,7 +12728,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -12744,7 +12776,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -12776,7 +12808,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -12816,7 +12848,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -12835,7 +12867,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -12844,7 +12876,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -12870,8 +12902,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -13001,21 +13033,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; diff --git a/lang/sql/jdbc/configure.in b/lang/sql/jdbc/configure.in index 95a1d424..bc583a5f 100755 --- a/lang/sql/jdbc/configure.in +++ b/lang/sql/jdbc/configure.in @@ -147,6 +147,29 @@ AC_SUBST(HAVE_SQLITE_TRACE) AC_SUBST(HAVE_SQLITE_COMPILE) AC_SUBST(HAVE_SQLITE_PROGRESS_HANDLER) +HAVE_SQLITE3_MALLOC=0 +HAVE_SQLITE3_PREPARE_V2=0 +HAVE_SQLITE3_PREPARE16_V2=0 +HAVE_SQLITE3_BIND_ZEROBLOB=0 +HAVE_SQLITE3_CLEAR_BINDINGS=0 +HAVE_SQLITE3_COLUMN_TABLE_NAME16=0 +HAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 +HAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0 +HAVE_SQLITE3_BIND_PARAMETER_COUNT=0 +HAVE_SQLITE3_BIND_PARAMETER_NAME=0 +HAVE_SQLITE3_BIND_PARAMETER_INDEX=0 +HAVE_SQLITE3_RESULT_ZEROBLOB=0 +HAVE_SQLITE3_INCRBLOBIO=0 +HAVE_SQLITE3_KEY="${HAVE_SQLITE3_KEY:-0}" +HAVE_SQLITE3_SHARED_CACHE=0 +HAVE_SQLITE3_OPEN_V2=0 +HAVE_SQLITE3_LOAD_EXTENSION=0 +HAVE_SQLITE3_BACKUPAPI=0 +HAVE_SQLITE3_PROFILE=0 +HAVE_SQLITE3_STATUS=0 +HAVE_SQLITE3_DB_STATUS=0 +HAVE_SQLITE3_STMT_STATUS=0 + ########## # Find SQLite3 header file and library # @@ -262,28 +285,6 @@ AC_ARG_ENABLE(load-extension, *** thus should be enabled only if you know what you're doing. *** *******************************************************************]) test "x$enable_load_extension" = "xyes" || enable_load_extension=no -HAVE_SQLITE3_MALLOC=0 -HAVE_SQLITE3_PREPARE_V2=0 -HAVE_SQLITE3_PREPARE16_V2=0 -HAVE_SQLITE3_BIND_ZEROBLOB=0 -HAVE_SQLITE3_CLEAR_BINDINGS=0 -HAVE_SQLITE3_COLUMN_TABLE_NAME16=0 -HAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 -HAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0 -HAVE_SQLITE3_BIND_PARAMETER_COUNT=0 -HAVE_SQLITE3_BIND_PARAMETER_NAME=0 -HAVE_SQLITE3_BIND_PARAMETER_INDEX=0 -HAVE_SQLITE3_RESULT_ZEROBLOB=0 -HAVE_SQLITE3_INCRBLOBIO=0 -HAVE_SQLITE3_KEY=0 -HAVE_SQLITE3_SHARED_CACHE=0 -HAVE_SQLITE3_OPEN_V2=0 -HAVE_SQLITE3_LOAD_EXTENSION=0 -HAVE_SQLITE3_BACKUPAPI=0 -HAVE_SQLITE3_PROFILE=0 -HAVE_SQLITE3_STATUS=0 -HAVE_SQLITE3_DB_STATUS=0 -HAVE_SQLITE3_STMT_STATUS=0 if test "$HAVE_SQLITE3" = 1 -a -n "$SQLITE3_A10N_C" ; then HAVE_SQLITE3_MALLOC=1 HAVE_SQLITE3_PREPARE_V2=1 @@ -422,6 +423,12 @@ AC_TRY_RUN([ #include <stdio.h> static int +vatest2(va_list ap) +{ + return 0; +} + +static int vatest(char **x, ...) { va_list ap; @@ -439,6 +446,9 @@ vatest(char **x, ...) int main(int argc, char **argv) { + /* Check if we can convert char ** to va_list. */ + vatest2((va_list) argv); + /* Check if parameters are passed through stack. */ exit(vatest(NULL, vatest, 0.0, 0, NULL)); } ],[USE_VFUNCS=1],[USE_VFUNCS=0],[USE_VFUNCS=0]) diff --git a/lang/sql/jdbc/doc/ChangeLog b/lang/sql/jdbc/doc/ChangeLog index 9132a079..4b1eeeb6 100644 --- a/lang/sql/jdbc/doc/ChangeLog +++ b/lang/sql/jdbc/doc/ChangeLog @@ -1,5 +1,18 @@ +2013-11-24 + + * fixed memory leak in SQLite.Database.vm_compile as + suggested by Vijay Shankar Rajanna + +2013-02-14 + + * improved vatest in configure as suggested by Michael Brey + * fixed memory leaks in SQLite.Database.(re)key as + suggested by Tam'as Kov'acs + * fixed concurrency/locking issues in finalizer methods + 2012-02-09 + * added newer sqlite3_status(), sqlite3_db_status() constants * added DataSource for JDK 1.4/1.5/1.6 * proper detect Java 1.7 in SQLite.JDBC diff --git a/lang/sql/jdbc/doc/SQLite/Authorizer.html b/lang/sql/jdbc/doc/SQLite/Authorizer.html index 21f750e9..206c9e6a 100644 --- a/lang/sql/jdbc/doc/SQLite/Authorizer.html +++ b/lang/sql/jdbc/doc/SQLite/Authorizer.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> Authorizer (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/Backup.html b/lang/sql/jdbc/doc/SQLite/Backup.html index 4d134fcf..d5139f70 100644 --- a/lang/sql/jdbc/doc/SQLite/Backup.html +++ b/lang/sql/jdbc/doc/SQLite/Backup.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> Backup (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/Blob.html b/lang/sql/jdbc/doc/SQLite/Blob.html index 05cc8891..8277aae0 100644 --- a/lang/sql/jdbc/doc/SQLite/Blob.html +++ b/lang/sql/jdbc/doc/SQLite/Blob.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> Blob (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/BlobR.html b/lang/sql/jdbc/doc/SQLite/BlobR.html index 5155515e..a12278fc 100644 --- a/lang/sql/jdbc/doc/SQLite/BlobR.html +++ b/lang/sql/jdbc/doc/SQLite/BlobR.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> BlobR (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/BlobW.html b/lang/sql/jdbc/doc/SQLite/BlobW.html index 095f601c..6a1b2c42 100644 --- a/lang/sql/jdbc/doc/SQLite/BlobW.html +++ b/lang/sql/jdbc/doc/SQLite/BlobW.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> BlobW (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/BusyHandler.html b/lang/sql/jdbc/doc/SQLite/BusyHandler.html index d406549b..602427b3 100644 --- a/lang/sql/jdbc/doc/SQLite/BusyHandler.html +++ b/lang/sql/jdbc/doc/SQLite/BusyHandler.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> BusyHandler (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/Callback.html b/lang/sql/jdbc/doc/SQLite/Callback.html index 32726f76..e9b89115 100644 --- a/lang/sql/jdbc/doc/SQLite/Callback.html +++ b/lang/sql/jdbc/doc/SQLite/Callback.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> Callback (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/Constants.html b/lang/sql/jdbc/doc/SQLite/Constants.html index e627e4f8..30f7b2b6 100644 --- a/lang/sql/jdbc/doc/SQLite/Constants.html +++ b/lang/sql/jdbc/doc/SQLite/Constants.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> Constants (SQLite Java Wrapper) </TITLE> @@ -263,6 +263,22 @@ Container for SQLite constants. <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_DBSTATUS_CACHE_HIT">SQLITE_DBSTATUS_CACHE_HIT</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_DBSTATUS_CACHE_MISS">SQLITE_DBSTATUS_CACHE_MISS</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> <TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_DBSTATUS_CACHE_USED">SQLITE_DBSTATUS_CACHE_USED</A></B></CODE> <BR> @@ -271,6 +287,30 @@ Container for SQLite constants. <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_DBSTATUS_LOOKASIDE_HIT">SQLITE_DBSTATUS_LOOKASIDE_HIT</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL">SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE">SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> <TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_DBSTATUS_LOOKASIDE_USED">SQLITE_DBSTATUS_LOOKASIDE_USED</A></B></CODE> <BR> @@ -279,6 +319,22 @@ Container for SQLite constants. <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_DBSTATUS_SCHEMA_USED">SQLITE_DBSTATUS_SCHEMA_USED</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_DBSTATUS_STMT_USED">SQLITE_DBSTATUS_STMT_USED</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> <TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_DELETE">SQLITE_DELETE</A></B></CODE> <BR> @@ -543,6 +599,14 @@ Container for SQLite constants. <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_AUTOPROXY">SQLITE_OPEN_AUTOPROXY</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> <TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_CREATE">SQLITE_OPEN_CREATE</A></B></CODE> <BR> @@ -551,6 +615,22 @@ Container for SQLite constants. <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_DELETEONCLOSE">SQLITE_OPEN_DELETEONCLOSE</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_EXCLUSIVE">SQLITE_OPEN_EXCLUSIVE</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> <TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_FULLMUTEX">SQLITE_OPEN_FULLMUTEX</A></B></CODE> <BR> @@ -559,6 +639,30 @@ Container for SQLite constants. <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_MAIN_DB">SQLITE_OPEN_MAIN_DB</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_MAIN_JOURNAL">SQLITE_OPEN_MAIN_JOURNAL</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_MASTER_JOURNAL">SQLITE_OPEN_MASTER_JOURNAL</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> <TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_NOMUTEX">SQLITE_OPEN_NOMUTEX</A></B></CODE> <BR> @@ -567,6 +671,14 @@ Container for SQLite constants. <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_PRIVATECACHE">SQLITE_OPEN_PRIVATECACHE</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> <TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_READONLY">SQLITE_OPEN_READONLY</A></B></CODE> <BR> @@ -583,6 +695,62 @@ Container for SQLite constants. <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_SHAREDCACHE">SQLITE_OPEN_SHAREDCACHE</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_SUBJOURNAL">SQLITE_OPEN_SUBJOURNAL</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_TEMP_DB">SQLITE_OPEN_TEMP_DB</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_TEMP_JOURNAL">SQLITE_OPEN_TEMP_JOURNAL</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_TRANSIENT_DB">SQLITE_OPEN_TRANSIENT_DB</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_URI">SQLITE_OPEN_URI</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_OPEN_WAL">SQLITE_OPEN_WAL</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> <TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_PERM">SQLITE_PERM</A></B></CODE> <BR> @@ -655,6 +823,14 @@ Container for SQLite constants. <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>static int</CODE></FONT></TD> +<TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_STATUS_MALLOC_COUNT">SQLITE_STATUS_MALLOC_COUNT</A></B></CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static int</CODE></FONT></TD> <TD><CODE><B><A HREF="../SQLite/Constants.html#SQLITE_STATUS_MALLOC_SIZE">SQLITE_STATUS_MALLOC_SIZE</A></B></CODE> <BR> @@ -1028,6 +1204,26 @@ public static final int <B>SQLITE_CREATE_VIEW</B></PRE> </DL> <HR> +<A NAME="SQLITE_DBSTATUS_CACHE_HIT"><!-- --></A><H3> +SQLITE_DBSTATUS_CACHE_HIT</H3> +<PRE> +public static final int <B>SQLITE_DBSTATUS_CACHE_HIT</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_DBSTATUS_CACHE_HIT">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_DBSTATUS_CACHE_MISS"><!-- --></A><H3> +SQLITE_DBSTATUS_CACHE_MISS</H3> +<PRE> +public static final int <B>SQLITE_DBSTATUS_CACHE_MISS</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_DBSTATUS_CACHE_MISS">Constant Field Values</A></DL> +</DL> +<HR> + <A NAME="SQLITE_DBSTATUS_CACHE_USED"><!-- --></A><H3> SQLITE_DBSTATUS_CACHE_USED</H3> <PRE> @@ -1038,6 +1234,36 @@ public static final int <B>SQLITE_DBSTATUS_CACHE_USED</B></PRE> </DL> <HR> +<A NAME="SQLITE_DBSTATUS_LOOKASIDE_HIT"><!-- --></A><H3> +SQLITE_DBSTATUS_LOOKASIDE_HIT</H3> +<PRE> +public static final int <B>SQLITE_DBSTATUS_LOOKASIDE_HIT</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_DBSTATUS_LOOKASIDE_HIT">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL"><!-- --></A><H3> +SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</H3> +<PRE> +public static final int <B>SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE"><!-- --></A><H3> +SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</H3> +<PRE> +public static final int <B>SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE">Constant Field Values</A></DL> +</DL> +<HR> + <A NAME="SQLITE_DBSTATUS_LOOKASIDE_USED"><!-- --></A><H3> SQLITE_DBSTATUS_LOOKASIDE_USED</H3> <PRE> @@ -1048,6 +1274,26 @@ public static final int <B>SQLITE_DBSTATUS_LOOKASIDE_USED</B></PRE> </DL> <HR> +<A NAME="SQLITE_DBSTATUS_SCHEMA_USED"><!-- --></A><H3> +SQLITE_DBSTATUS_SCHEMA_USED</H3> +<PRE> +public static final int <B>SQLITE_DBSTATUS_SCHEMA_USED</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_DBSTATUS_SCHEMA_USED">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_DBSTATUS_STMT_USED"><!-- --></A><H3> +SQLITE_DBSTATUS_STMT_USED</H3> +<PRE> +public static final int <B>SQLITE_DBSTATUS_STMT_USED</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_DBSTATUS_STMT_USED">Constant Field Values</A></DL> +</DL> +<HR> + <A NAME="SQLITE_DELETE"><!-- --></A><H3> SQLITE_DELETE</H3> <PRE> @@ -1378,6 +1624,16 @@ public static final int <B>SQLITE_OK</B></PRE> </DL> <HR> +<A NAME="SQLITE_OPEN_AUTOPROXY"><!-- --></A><H3> +SQLITE_OPEN_AUTOPROXY</H3> +<PRE> +public static final int <B>SQLITE_OPEN_AUTOPROXY</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_AUTOPROXY">Constant Field Values</A></DL> +</DL> +<HR> + <A NAME="SQLITE_OPEN_CREATE"><!-- --></A><H3> SQLITE_OPEN_CREATE</H3> <PRE> @@ -1388,6 +1644,26 @@ public static final int <B>SQLITE_OPEN_CREATE</B></PRE> </DL> <HR> +<A NAME="SQLITE_OPEN_DELETEONCLOSE"><!-- --></A><H3> +SQLITE_OPEN_DELETEONCLOSE</H3> +<PRE> +public static final int <B>SQLITE_OPEN_DELETEONCLOSE</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_DELETEONCLOSE">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_OPEN_EXCLUSIVE"><!-- --></A><H3> +SQLITE_OPEN_EXCLUSIVE</H3> +<PRE> +public static final int <B>SQLITE_OPEN_EXCLUSIVE</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_EXCLUSIVE">Constant Field Values</A></DL> +</DL> +<HR> + <A NAME="SQLITE_OPEN_FULLMUTEX"><!-- --></A><H3> SQLITE_OPEN_FULLMUTEX</H3> <PRE> @@ -1398,6 +1674,36 @@ public static final int <B>SQLITE_OPEN_FULLMUTEX</B></PRE> </DL> <HR> +<A NAME="SQLITE_OPEN_MAIN_DB"><!-- --></A><H3> +SQLITE_OPEN_MAIN_DB</H3> +<PRE> +public static final int <B>SQLITE_OPEN_MAIN_DB</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_MAIN_DB">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_OPEN_MAIN_JOURNAL"><!-- --></A><H3> +SQLITE_OPEN_MAIN_JOURNAL</H3> +<PRE> +public static final int <B>SQLITE_OPEN_MAIN_JOURNAL</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_MAIN_JOURNAL">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_OPEN_MASTER_JOURNAL"><!-- --></A><H3> +SQLITE_OPEN_MASTER_JOURNAL</H3> +<PRE> +public static final int <B>SQLITE_OPEN_MASTER_JOURNAL</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_MASTER_JOURNAL">Constant Field Values</A></DL> +</DL> +<HR> + <A NAME="SQLITE_OPEN_NOMUTEX"><!-- --></A><H3> SQLITE_OPEN_NOMUTEX</H3> <PRE> @@ -1408,6 +1714,16 @@ public static final int <B>SQLITE_OPEN_NOMUTEX</B></PRE> </DL> <HR> +<A NAME="SQLITE_OPEN_PRIVATECACHE"><!-- --></A><H3> +SQLITE_OPEN_PRIVATECACHE</H3> +<PRE> +public static final int <B>SQLITE_OPEN_PRIVATECACHE</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_PRIVATECACHE">Constant Field Values</A></DL> +</DL> +<HR> + <A NAME="SQLITE_OPEN_READONLY"><!-- --></A><H3> SQLITE_OPEN_READONLY</H3> <PRE> @@ -1428,6 +1744,76 @@ public static final int <B>SQLITE_OPEN_READWRITE</B></PRE> </DL> <HR> +<A NAME="SQLITE_OPEN_SHAREDCACHE"><!-- --></A><H3> +SQLITE_OPEN_SHAREDCACHE</H3> +<PRE> +public static final int <B>SQLITE_OPEN_SHAREDCACHE</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_SHAREDCACHE">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_OPEN_SUBJOURNAL"><!-- --></A><H3> +SQLITE_OPEN_SUBJOURNAL</H3> +<PRE> +public static final int <B>SQLITE_OPEN_SUBJOURNAL</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_SUBJOURNAL">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_OPEN_TEMP_DB"><!-- --></A><H3> +SQLITE_OPEN_TEMP_DB</H3> +<PRE> +public static final int <B>SQLITE_OPEN_TEMP_DB</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_TEMP_DB">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_OPEN_TEMP_JOURNAL"><!-- --></A><H3> +SQLITE_OPEN_TEMP_JOURNAL</H3> +<PRE> +public static final int <B>SQLITE_OPEN_TEMP_JOURNAL</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_TEMP_JOURNAL">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_OPEN_TRANSIENT_DB"><!-- --></A><H3> +SQLITE_OPEN_TRANSIENT_DB</H3> +<PRE> +public static final int <B>SQLITE_OPEN_TRANSIENT_DB</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_TRANSIENT_DB">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_OPEN_URI"><!-- --></A><H3> +SQLITE_OPEN_URI</H3> +<PRE> +public static final int <B>SQLITE_OPEN_URI</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_URI">Constant Field Values</A></DL> +</DL> +<HR> + +<A NAME="SQLITE_OPEN_WAL"><!-- --></A><H3> +SQLITE_OPEN_WAL</H3> +<PRE> +public static final int <B>SQLITE_OPEN_WAL</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_OPEN_WAL">Constant Field Values</A></DL> +</DL> +<HR> + <A NAME="SQLITE_PERM"><!-- --></A><H3> SQLITE_PERM</H3> <PRE> @@ -1518,6 +1904,16 @@ public static final int <B>SQLITE_SELECT</B></PRE> </DL> <HR> +<A NAME="SQLITE_STATUS_MALLOC_COUNT"><!-- --></A><H3> +SQLITE_STATUS_MALLOC_COUNT</H3> +<PRE> +public static final int <B>SQLITE_STATUS_MALLOC_COUNT</B></PRE> +<DL> +<DL> +<DT><B>See Also:</B><DD><A HREF="../constant-values.html#SQLite.Constants.SQLITE_STATUS_MALLOC_COUNT">Constant Field Values</A></DL> +</DL> +<HR> + <A NAME="SQLITE_STATUS_MALLOC_SIZE"><!-- --></A><H3> SQLITE_STATUS_MALLOC_SIZE</H3> <PRE> diff --git a/lang/sql/jdbc/doc/SQLite/Database.html b/lang/sql/jdbc/doc/SQLite/Database.html index 11921e75..822a3d1d 100644 --- a/lang/sql/jdbc/doc/SQLite/Database.html +++ b/lang/sql/jdbc/doc/SQLite/Database.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> Database (SQLite Java Wrapper) </TITLE> @@ -674,7 +674,7 @@ Main class wrapping an SQLite database. <TD><CODE><B><A HREF="../SQLite/Database.html#last_error()">last_error</A></B>()</CODE> <BR> - Return the code of the last error occured in + Return the code of the last error occurred in any of the exec() methods.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> @@ -1815,7 +1815,7 @@ last_error</H3> <PRE> public int <B>last_error</B>()</PRE> <DL> -<DD>Return the code of the last error occured in +<DD>Return the code of the last error occurred in any of the exec() methods. The value is valid after an Exception has been reported by one of these methods. See the <A HREF="Constants.html">Constants</A> diff --git a/lang/sql/jdbc/doc/SQLite/Exception.html b/lang/sql/jdbc/doc/SQLite/Exception.html index c0fc1f88..b8464786 100644 --- a/lang/sql/jdbc/doc/SQLite/Exception.html +++ b/lang/sql/jdbc/doc/SQLite/Exception.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:01 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:34 CET 2013 --> <TITLE> Exception (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/Function.html b/lang/sql/jdbc/doc/SQLite/Function.html index 9013669e..20033a76 100644 --- a/lang/sql/jdbc/doc/SQLite/Function.html +++ b/lang/sql/jdbc/doc/SQLite/Function.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:01 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:34 CET 2013 --> <TITLE> Function (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/FunctionContext.html b/lang/sql/jdbc/doc/SQLite/FunctionContext.html index 931db746..fb2ce5fb 100644 --- a/lang/sql/jdbc/doc/SQLite/FunctionContext.html +++ b/lang/sql/jdbc/doc/SQLite/FunctionContext.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:01 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:34 CET 2013 --> <TITLE> FunctionContext (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/Profile.html b/lang/sql/jdbc/doc/SQLite/Profile.html index 0f7c3be7..163af918 100644 --- a/lang/sql/jdbc/doc/SQLite/Profile.html +++ b/lang/sql/jdbc/doc/SQLite/Profile.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:01 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:34 CET 2013 --> <TITLE> Profile (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/ProgressHandler.html b/lang/sql/jdbc/doc/SQLite/ProgressHandler.html index cce7c5b3..f192194b 100644 --- a/lang/sql/jdbc/doc/SQLite/ProgressHandler.html +++ b/lang/sql/jdbc/doc/SQLite/ProgressHandler.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:01 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:34 CET 2013 --> <TITLE> ProgressHandler (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/Stmt.html b/lang/sql/jdbc/doc/SQLite/Stmt.html index 61e5181f..164c8458 100644 --- a/lang/sql/jdbc/doc/SQLite/Stmt.html +++ b/lang/sql/jdbc/doc/SQLite/Stmt.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:01 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:34 CET 2013 --> <TITLE> Stmt (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/StringEncoder.html b/lang/sql/jdbc/doc/SQLite/StringEncoder.html index 07c14789..71dbe59d 100644 --- a/lang/sql/jdbc/doc/SQLite/StringEncoder.html +++ b/lang/sql/jdbc/doc/SQLite/StringEncoder.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:01 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:34 CET 2013 --> <TITLE> StringEncoder (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/TableResult.html b/lang/sql/jdbc/doc/SQLite/TableResult.html index 43272272..7df3332e 100644 --- a/lang/sql/jdbc/doc/SQLite/TableResult.html +++ b/lang/sql/jdbc/doc/SQLite/TableResult.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:01 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:34 CET 2013 --> <TITLE> TableResult (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/Trace.html b/lang/sql/jdbc/doc/SQLite/Trace.html index ec5ee031..39d7886f 100644 --- a/lang/sql/jdbc/doc/SQLite/Trace.html +++ b/lang/sql/jdbc/doc/SQLite/Trace.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:01 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:34 CET 2013 --> <TITLE> Trace (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/Vm.html b/lang/sql/jdbc/doc/SQLite/Vm.html index f0ee775a..57a53a80 100644 --- a/lang/sql/jdbc/doc/SQLite/Vm.html +++ b/lang/sql/jdbc/doc/SQLite/Vm.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:01 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:34 CET 2013 --> <TITLE> Vm (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/package-frame.html b/lang/sql/jdbc/doc/SQLite/package-frame.html index d1b71708..1e0cd8ad 100644 --- a/lang/sql/jdbc/doc/SQLite/package-frame.html +++ b/lang/sql/jdbc/doc/SQLite/package-frame.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> SQLite (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/package-summary.html b/lang/sql/jdbc/doc/SQLite/package-summary.html index 656a3efc..d2ef2851 100644 --- a/lang/sql/jdbc/doc/SQLite/package-summary.html +++ b/lang/sql/jdbc/doc/SQLite/package-summary.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> SQLite (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/SQLite/package-tree.html b/lang/sql/jdbc/doc/SQLite/package-tree.html index 606c133b..c5d3fb02 100644 --- a/lang/sql/jdbc/doc/SQLite/package-tree.html +++ b/lang/sql/jdbc/doc/SQLite/package-tree.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> SQLite Class Hierarchy (SQLite Java Wrapper) </TITLE> @@ -78,14 +78,14 @@ Class Hierarchy </H2> <UL> <LI TYPE="circle">class java.lang.<A HREF="http://java.sun.com/javase/6/docs/api/java/lang/Object.html" title="class or interface in java.lang"><B>Object</B></A><UL> -<LI TYPE="circle">class SQLite.<A HREF="../SQLite/Backup.html" title="class in SQLite"><B>Backup</B></A><LI TYPE="circle">class SQLite.Benchmark<LI TYPE="circle">class SQLite.<A HREF="../SQLite/Blob.html" title="class in SQLite"><B>Blob</B></A><LI TYPE="circle">class SQLite.<A HREF="../SQLite/Constants.html" title="class in SQLite"><B>Constants</B></A><LI TYPE="circle">class SQLite.<A HREF="../SQLite/Database.html" title="class in SQLite"><B>Database</B></A><LI TYPE="circle">class SQLite.<A HREF="../SQLite/FunctionContext.html" title="class in SQLite"><B>FunctionContext</B></A><LI TYPE="circle">class java.io.<A HREF="http://java.sun.com/javase/6/docs/api/java/io/InputStream.html" title="class or interface in java.io"><B>InputStream</B></A><UL> +<LI TYPE="circle">class SQLite.<A HREF="../SQLite/Backup.html" title="class in SQLite"><B>Backup</B></A><LI TYPE="circle">class SQLite.<A HREF="../SQLite/Blob.html" title="class in SQLite"><B>Blob</B></A><LI TYPE="circle">class SQLite.<A HREF="../SQLite/Constants.html" title="class in SQLite"><B>Constants</B></A><LI TYPE="circle">class SQLite.<A HREF="../SQLite/Database.html" title="class in SQLite"><B>Database</B></A><LI TYPE="circle">class SQLite.<A HREF="../SQLite/FunctionContext.html" title="class in SQLite"><B>FunctionContext</B></A><LI TYPE="circle">class java.io.<A HREF="http://java.sun.com/javase/6/docs/api/java/io/InputStream.html" title="class or interface in java.io"><B>InputStream</B></A><UL> <LI TYPE="circle">class SQLite.<A HREF="../SQLite/BlobR.html" title="class in SQLite"><B>BlobR</B></A></UL> <LI TYPE="circle">class SQLite.JDBC<UL> +<LI TYPE="circle">class SQLite.JDBCDataSource (implements javax.sql.<A HREF="http://java.sun.com/javase/6/docs/api/javax/sql/DataSource.html" title="class or interface in javax.sql">DataSource</A>) <LI TYPE="circle">class SQLite.JDBCDriver (implements java.sql.<A HREF="http://java.sun.com/javase/6/docs/api/java/sql/Driver.html" title="class or interface in java.sql">Driver</A>) </UL> <LI TYPE="circle">class java.io.<A HREF="http://java.sun.com/javase/6/docs/api/java/io/OutputStream.html" title="class or interface in java.io"><B>OutputStream</B></A><UL> <LI TYPE="circle">class SQLite.<A HREF="../SQLite/BlobW.html" title="class in SQLite"><B>BlobW</B></A></UL> -<LI TYPE="circle">class SQLite.Shell (implements SQLite.<A HREF="../SQLite/Callback.html" title="interface in SQLite">Callback</A>) <LI TYPE="circle">class SQLite.<A HREF="../SQLite/Stmt.html" title="class in SQLite"><B>Stmt</B></A><LI TYPE="circle">class SQLite.<A HREF="../SQLite/StringEncoder.html" title="class in SQLite"><B>StringEncoder</B></A><LI TYPE="circle">class SQLite.<A HREF="../SQLite/TableResult.html" title="class in SQLite"><B>TableResult</B></A> (implements SQLite.<A HREF="../SQLite/Callback.html" title="interface in SQLite">Callback</A>) <LI TYPE="circle">class java.lang.<A HREF="http://java.sun.com/javase/6/docs/api/java/lang/Throwable.html" title="class or interface in java.lang"><B>Throwable</B></A> (implements java.io.<A HREF="http://java.sun.com/javase/6/docs/api/java/io/Serializable.html" title="class or interface in java.io">Serializable</A>) <UL> diff --git a/lang/sql/jdbc/doc/allclasses-frame.html b/lang/sql/jdbc/doc/allclasses-frame.html index fc7d22c0..161724b8 100644 --- a/lang/sql/jdbc/doc/allclasses-frame.html +++ b/lang/sql/jdbc/doc/allclasses-frame.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> All Classes (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/allclasses-noframe.html b/lang/sql/jdbc/doc/allclasses-noframe.html index 2ceb34dc..e199a82b 100644 --- a/lang/sql/jdbc/doc/allclasses-noframe.html +++ b/lang/sql/jdbc/doc/allclasses-noframe.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> All Classes (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/constant-values.html b/lang/sql/jdbc/doc/constant-values.html index a8dbd0c3..4583ea3b 100644 --- a/lang/sql/jdbc/doc/constant-values.html +++ b/lang/sql/jdbc/doc/constant-values.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:53:59 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:32 CET 2013 --> <TITLE> Constant Field Values (SQLite Java Wrapper) </TITLE> @@ -95,7 +95,7 @@ Constant Field Values</H1> <A NAME="SQLite.Constants.drv_minor"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> <CODE>public static final int</CODE></FONT></TD> <TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#drv_minor">drv_minor</A></CODE></TD> -<TD ALIGN="right"><CODE>20110827</CODE></TD> +<TD ALIGN="right"><CODE>20130214</CODE></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <A NAME="SQLite.Constants.SQLITE_ABORT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> @@ -206,18 +206,60 @@ Constant Field Values</H1> <TD ALIGN="right"><CODE>8</CODE></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_DBSTATUS_CACHE_HIT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_DBSTATUS_CACHE_HIT">SQLITE_DBSTATUS_CACHE_HIT</A></CODE></TD> +<TD ALIGN="right"><CODE>0</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_DBSTATUS_CACHE_MISS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_DBSTATUS_CACHE_MISS">SQLITE_DBSTATUS_CACHE_MISS</A></CODE></TD> +<TD ALIGN="right"><CODE>0</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <A NAME="SQLite.Constants.SQLITE_DBSTATUS_CACHE_USED"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> <CODE>public static final int</CODE></FONT></TD> <TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_DBSTATUS_CACHE_USED">SQLITE_DBSTATUS_CACHE_USED</A></CODE></TD> <TD ALIGN="right"><CODE>1</CODE></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_DBSTATUS_LOOKASIDE_HIT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_DBSTATUS_LOOKASIDE_HIT">SQLITE_DBSTATUS_LOOKASIDE_HIT</A></CODE></TD> +<TD ALIGN="right"><CODE>0</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL">SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</A></CODE></TD> +<TD ALIGN="right"><CODE>0</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE">SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</A></CODE></TD> +<TD ALIGN="right"><CODE>0</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <A NAME="SQLite.Constants.SQLITE_DBSTATUS_LOOKASIDE_USED"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> <CODE>public static final int</CODE></FONT></TD> <TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_DBSTATUS_LOOKASIDE_USED">SQLITE_DBSTATUS_LOOKASIDE_USED</A></CODE></TD> <TD ALIGN="right"><CODE>0</CODE></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_DBSTATUS_SCHEMA_USED"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_DBSTATUS_SCHEMA_USED">SQLITE_DBSTATUS_SCHEMA_USED</A></CODE></TD> +<TD ALIGN="right"><CODE>0</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_DBSTATUS_STMT_USED"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_DBSTATUS_STMT_USED">SQLITE_DBSTATUS_STMT_USED</A></CODE></TD> +<TD ALIGN="right"><CODE>0</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <A NAME="SQLite.Constants.SQLITE_DELETE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> <CODE>public static final int</CODE></FONT></TD> <TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_DELETE">SQLITE_DELETE</A></CODE></TD> @@ -416,24 +458,66 @@ Constant Field Values</H1> <TD ALIGN="right"><CODE>0</CODE></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_AUTOPROXY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_AUTOPROXY">SQLITE_OPEN_AUTOPROXY</A></CODE></TD> +<TD ALIGN="right"><CODE>32</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <A NAME="SQLite.Constants.SQLITE_OPEN_CREATE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> <CODE>public static final int</CODE></FONT></TD> <TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_CREATE">SQLITE_OPEN_CREATE</A></CODE></TD> <TD ALIGN="right"><CODE>4</CODE></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_DELETEONCLOSE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_DELETEONCLOSE">SQLITE_OPEN_DELETEONCLOSE</A></CODE></TD> +<TD ALIGN="right"><CODE>8</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_EXCLUSIVE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_EXCLUSIVE">SQLITE_OPEN_EXCLUSIVE</A></CODE></TD> +<TD ALIGN="right"><CODE>16</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <A NAME="SQLite.Constants.SQLITE_OPEN_FULLMUTEX"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> <CODE>public static final int</CODE></FONT></TD> <TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_FULLMUTEX">SQLITE_OPEN_FULLMUTEX</A></CODE></TD> <TD ALIGN="right"><CODE>65536</CODE></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_MAIN_DB"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_MAIN_DB">SQLITE_OPEN_MAIN_DB</A></CODE></TD> +<TD ALIGN="right"><CODE>256</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_MAIN_JOURNAL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_MAIN_JOURNAL">SQLITE_OPEN_MAIN_JOURNAL</A></CODE></TD> +<TD ALIGN="right"><CODE>2048</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_MASTER_JOURNAL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_MASTER_JOURNAL">SQLITE_OPEN_MASTER_JOURNAL</A></CODE></TD> +<TD ALIGN="right"><CODE>16384</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <A NAME="SQLite.Constants.SQLITE_OPEN_NOMUTEX"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> <CODE>public static final int</CODE></FONT></TD> <TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_NOMUTEX">SQLITE_OPEN_NOMUTEX</A></CODE></TD> <TD ALIGN="right"><CODE>32768</CODE></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_PRIVATECACHE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_PRIVATECACHE">SQLITE_OPEN_PRIVATECACHE</A></CODE></TD> +<TD ALIGN="right"><CODE>262144</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <A NAME="SQLite.Constants.SQLITE_OPEN_READONLY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> <CODE>public static final int</CODE></FONT></TD> <TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_READONLY">SQLITE_OPEN_READONLY</A></CODE></TD> @@ -446,6 +530,48 @@ Constant Field Values</H1> <TD ALIGN="right"><CODE>2</CODE></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_SHAREDCACHE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_SHAREDCACHE">SQLITE_OPEN_SHAREDCACHE</A></CODE></TD> +<TD ALIGN="right"><CODE>131072</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_SUBJOURNAL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_SUBJOURNAL">SQLITE_OPEN_SUBJOURNAL</A></CODE></TD> +<TD ALIGN="right"><CODE>8192</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_TEMP_DB"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_TEMP_DB">SQLITE_OPEN_TEMP_DB</A></CODE></TD> +<TD ALIGN="right"><CODE>512</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_TEMP_JOURNAL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_TEMP_JOURNAL">SQLITE_OPEN_TEMP_JOURNAL</A></CODE></TD> +<TD ALIGN="right"><CODE>4096</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_TRANSIENT_DB"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_TRANSIENT_DB">SQLITE_OPEN_TRANSIENT_DB</A></CODE></TD> +<TD ALIGN="right"><CODE>1024</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_URI"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_URI">SQLITE_OPEN_URI</A></CODE></TD> +<TD ALIGN="right"><CODE>0</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_OPEN_WAL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_OPEN_WAL">SQLITE_OPEN_WAL</A></CODE></TD> +<TD ALIGN="right"><CODE>524288</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <A NAME="SQLite.Constants.SQLITE_PERM"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> <CODE>public static final int</CODE></FONT></TD> <TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_PERM">SQLITE_PERM</A></CODE></TD> @@ -500,6 +626,12 @@ Constant Field Values</H1> <TD ALIGN="right"><CODE>21</CODE></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<A NAME="SQLite.Constants.SQLITE_STATUS_MALLOC_COUNT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> +<CODE>public static final int</CODE></FONT></TD> +<TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_STATUS_MALLOC_COUNT">SQLITE_STATUS_MALLOC_COUNT</A></CODE></TD> +<TD ALIGN="right"><CODE>0</CODE></TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <A NAME="SQLite.Constants.SQLITE_STATUS_MALLOC_SIZE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> <CODE>public static final int</CODE></FONT></TD> <TD ALIGN="left"><CODE><A HREF="SQLite/Constants.html#SQLITE_STATUS_MALLOC_SIZE">SQLITE_STATUS_MALLOC_SIZE</A></CODE></TD> diff --git a/lang/sql/jdbc/doc/index.html b/lang/sql/jdbc/doc/index.html index 15760a68..9177dace 100644 --- a/lang/sql/jdbc/doc/index.html +++ b/lang/sql/jdbc/doc/index.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc on Thu Feb 09 06:54:00 CET 2012--> +<!-- Generated by javadoc on Sun Nov 24 12:57:33 CET 2013--> <TITLE> SQLite Java Wrapper </TITLE> diff --git a/lang/sql/jdbc/doc/overview-summary.html b/lang/sql/jdbc/doc/overview-summary.html index c06a560b..0d6fe3a6 100644 --- a/lang/sql/jdbc/doc/overview-summary.html +++ b/lang/sql/jdbc/doc/overview-summary.html @@ -2,14 +2,14 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> Overview (SQLite Java Wrapper) </TITLE> <META NAME="keywords" CONTENT="Overview, SQLite Java Wrapper/JDBC Driver <br><small> -2012-02-09 +2013-11-24 </small>"> <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style"> @@ -76,7 +76,7 @@ function windowTitle() <H1> SQLite Java Wrapper/JDBC Driver <br><small> -2012-02-09 +2013-11-24 </small> </H1> </CENTER> @@ -119,10 +119,10 @@ be generated to include support for both SQLite 2.x and 3.x and detects at runtime the type of the database. <P> The current source tarball can be downloaded from -<A HREF="http://www.ch-werner.de/javasqlite/javasqlite-20120209.tar.gz"> -javasqlite-20120209.tar.gz</A>. -It has been tested on Linux, using SQLite 2.8.17 and 3.7.9, -and JDK 1.4/1.5/1.6 from +<A HREF="http://www.ch-werner.de/javasqlite/javasqlite-20131124.tar.gz"> +javasqlite-20131124.tar.gz</A>. +It has been tested on Linux, using SQLite 2.8.17 and 3.7.15, +and JDK 1.4/1.5/1.6/1.7 from <A HREF="http://java.sun.com" TARGET="_blank">Sun</A>. The change log starting from August 2007 is <A HREF="ChangeLog">here</A>. <P> diff --git a/lang/sql/jdbc/doc/overview-tree.html b/lang/sql/jdbc/doc/overview-tree.html index 2816cebd..f3abf8df 100644 --- a/lang/sql/jdbc/doc/overview-tree.html +++ b/lang/sql/jdbc/doc/overview-tree.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> Class Hierarchy (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/overview.html b/lang/sql/jdbc/doc/overview.html index 5339d15d..d59b6e2c 100644 --- a/lang/sql/jdbc/doc/overview.html +++ b/lang/sql/jdbc/doc/overview.html @@ -25,10 +25,10 @@ be generated to include support for both SQLite 2.x and 3.x and detects at runtime the type of the database. <P> The current source tarball can be downloaded from -<A HREF="http://www.ch-werner.de/javasqlite/javasqlite-20120209.tar.gz"> -javasqlite-20120209.tar.gz</A>. -It has been tested on Linux, using SQLite 2.8.17 and 3.7.9, -and JDK 1.4/1.5/1.6 from +<A HREF="http://www.ch-werner.de/javasqlite/javasqlite-20131124.tar.gz"> +javasqlite-20131124.tar.gz</A>. +It has been tested on Linux, using SQLite 2.8.17 and 3.7.15, +and JDK 1.4/1.5/1.6/1.7 from <A HREF="http://java.sun.com" TARGET="_blank">Sun</A>. The change log starting from August 2007 is <A HREF="ChangeLog">here</A>. <P> diff --git a/lang/sql/jdbc/doc/packages.html b/lang/sql/jdbc/doc/packages.html index e561f978..7c91d3c9 100644 --- a/lang/sql/jdbc/doc/packages.html +++ b/lang/sql/jdbc/doc/packages.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:00 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:33 CET 2013 --> <TITLE> (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/serialized-form.html b/lang/sql/jdbc/doc/serialized-form.html index 358c61ce..4f317624 100644 --- a/lang/sql/jdbc/doc/serialized-form.html +++ b/lang/sql/jdbc/doc/serialized-form.html @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Thu Feb 09 06:54:01 CET 2012 --> +<!-- Generated by javadoc (build 1.4.2_03) on Sun Nov 24 12:57:34 CET 2013 --> <TITLE> Serialized Form (SQLite Java Wrapper) </TITLE> diff --git a/lang/sql/jdbc/doc/test3.java b/lang/sql/jdbc/doc/test3.java index 81af6a91..1e616434 100644 --- a/lang/sql/jdbc/doc/test3.java +++ b/lang/sql/jdbc/doc/test3.java @@ -166,14 +166,14 @@ public class test3 implements SQLite.Trace, SQLite.Profile { System.err.println("error: " + ee); } int info[] = new int[2]; - SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_MEMORY_USED, info, false); - System.out.println("INFO: status(STATUS_MEMORY_USED) = " + SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_MALLOC_COUNT, info, false); + System.out.println("INFO: status(STATUS_MALLOC_COUNT) = " + info[0] + "/" + info[1]); SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_MALLOC_SIZE, info, false); System.out.println("INFO: status(STATUS_MALLOC_SIZE) = " + info[0] + "/" + info[1]); - SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_PAGECACHE_USED, info, false); - System.out.println("INFO: status(STATUS_PAGECACHE_USED) = " + SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_MEMORY_USED, info, false); + System.out.println("INFO: status(STATUS_MEMORY_USED) = " + info[0] + "/" + info[1]); SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_PAGECACHE_OVERFLOW, info, false); System.out.println("INFO: status(STATUS_PAGECACHE_OVERFLOW) = " @@ -181,8 +181,11 @@ public class test3 implements SQLite.Trace, SQLite.Profile { SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_PAGECACHE_SIZE, info, false); System.out.println("INFO: status(STATUS_PAGECACHE_SIZE) = " + info[0] + "/" + info[1]); - SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_SCRATCH_USED, info, false); - System.out.println("INFO: status(STATUS_SCRATCH_USED) = " + SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_PAGECACHE_USED, info, false); + System.out.println("INFO: status(STATUS_PAGECACHE_USED) = " + + info[0] + "/" + info[1]); + SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_PARSER_STACK, info, false); + System.out.println("INFO: status(STATUS_PARSER_STACK) = " + info[0] + "/" + info[1]); SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_SCRATCH_OVERFLOW, info, false); System.out.println("INFO: status(STATUS_SCRATCH_OVERFLOW) = " @@ -190,15 +193,36 @@ public class test3 implements SQLite.Trace, SQLite.Profile { SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_SCRATCH_SIZE, info, false); System.out.println("INFO: status(STATUS_SCRATCH_SIZE) = " + info[0] + "/" + info[1]); - SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_PARSER_STACK, info, false); - System.out.println("INFO: status(STATUS_PARSER_STACK) = " + SQLite.Database.status(SQLite.Constants.SQLITE_STATUS_SCRATCH_USED, info, false); + System.out.println("INFO: status(STATUS_SCRATCH_USED) = " + info[0] + "/" + info[1]); - db.db_status(SQLite.Constants.SQLITE_DBSTATUS_LOOKASIDE_USED, info, false); - System.out.println("INFO: db_status(DBSTATUS_LOOKASIZE_USED) = " + db.db_status(SQLite.Constants.SQLITE_DBSTATUS_CACHE_HIT, info, false); + System.out.println("INFO: db_status(DBSTATUS_CACHE_HIT) = " + + info[0] + "/" + info[1]); + db.db_status(SQLite.Constants.SQLITE_DBSTATUS_CACHE_MISS, info, false); + System.out.println("INFO: db_status(DBSTATUS_CACHE_MISS) = " + info[0] + "/" + info[1]); db.db_status(SQLite.Constants.SQLITE_DBSTATUS_CACHE_USED, info, false); System.out.println("INFO: db_status(DBSTATUS_CACHE_USED) = " + info[0] + "/" + info[1]); + db.db_status(SQLite.Constants.SQLITE_DBSTATUS_LOOKASIDE_HIT, info, false); + System.out.println("INFO: db_status(DBSTATUS_LOOKASIZE_HIT) = " + + info[0] + "/" + info[1]); + db.db_status(SQLite.Constants.SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL, info, false); + System.out.println("INFO: db_status(DBSTATUS_LOOKASIZE_MISS_FULL) = " + + info[0] + "/" + info[1]); + db.db_status(SQLite.Constants.SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE, info, false); + System.out.println("INFO: db_status(DBSTATUS_LOOKASIZE_MISS_SIZE) = " + + info[0] + "/" + info[1]); + db.db_status(SQLite.Constants.SQLITE_DBSTATUS_LOOKASIDE_USED, info, false); + System.out.println("INFO: db_status(DBSTATUS_LOOKASIZE_USED) = " + + info[0] + "/" + info[1]); + db.db_status(SQLite.Constants.SQLITE_DBSTATUS_SCHEMA_USED, info, false); + System.out.println("INFO: db_status(DBSTATUS_SCHEMA_USED) = " + + info[0] + "/" + info[1]); + db.db_status(SQLite.Constants.SQLITE_DBSTATUS_STMT_USED, info, false); + System.out.println("INFO: db_status(DBSTATUS_STMT_USED) = " + + info[0] + "/" + info[1]); T.do_exec(db, "drop table TEST3"); T.do_exec(db, "drop table B"); T.do_select(db, "select * from sqlite_master"); diff --git a/lang/sql/jdbc/doc/title.html b/lang/sql/jdbc/doc/title.html index 90f9e820..527415bf 100644 --- a/lang/sql/jdbc/doc/title.html +++ b/lang/sql/jdbc/doc/title.html @@ -1,4 +1,4 @@ SQLite Java Wrapper/JDBC Driver <br><small> -2012-02-09 +2013-11-24 </small> diff --git a/lang/sql/jdbc/javasqlite.spec b/lang/sql/jdbc/javasqlite.spec index be818387..ea1e26ff 100644 --- a/lang/sql/jdbc/javasqlite.spec +++ b/lang/sql/jdbc/javasqlite.spec @@ -1,7 +1,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\.so$ Name: javasqlite -Version: 20120209 +Version: 20131124 Release: 1%{?dist} Summary: SQLite Java Wrapper/JDBC Driver @@ -82,5 +82,5 @@ done %{_javadocdir}/%{name} %changelog -* Sun May 1 2011 Ville Skyttä <ville.skytta@iki.fi> - 20120209-1 +* Sun May 1 2011 Ville Skyttä <ville.skytta@iki.fi> - 20131124-1 - Use rpmbuild >= 4.9's built in Provides filtering. diff --git a/lang/sql/jdbc/native/sqlite_jni.c b/lang/sql/jdbc/native/sqlite_jni.c index 265119a0..dae01d62 100644 --- a/lang/sql/jdbc/native/sqlite_jni.c +++ b/lang/sql/jdbc/native/sqlite_jni.c @@ -72,7 +72,7 @@ typedef struct { struct hbl *blobs; /* SQLite3 blob handles */ #endif #if HAVE_SQLITE3 && HAVE_SQLITE3_BACKUPAPI - struct hbk *backups; /* SQLite3 backup handles */ + struct hbk *backups; /* SQLite3 backup handles */ #endif } handle; @@ -138,6 +138,7 @@ typedef struct { /* static cached weak class refs, field and method ids */ static jclass C_java_lang_String = 0; +static jclass C_SQLite_Database = 0; static jfieldID F_SQLite_Database_handle = 0; static jfieldID F_SQLite_Database_error_code = 0; @@ -213,6 +214,21 @@ gethandle(JNIEnv *env, jobject obj) return (void *) v.l; } +static void * +getclrhandle(JNIEnv *env, jobject obj) +{ + jvalue v; + + if ((*env)->MonitorEnter(env, obj) != JNI_OK) { + fprintf(stderr, "getclrhandle: MonitorEnter failed\n"); + return 0; + } + v.j = (*env)->GetLongField(env, obj, F_SQLite_Database_handle); + (*env)->SetLongField(env, obj, F_SQLite_Database_handle, 0); + (*env)->MonitorExit(env, obj); + return (void *) v.l; +} + #if HAVE_SQLITE_COMPILE static void * gethvm(JNIEnv *env, jobject obj) @@ -223,6 +239,21 @@ gethvm(JNIEnv *env, jobject obj) return (void *) v.l; } +static void * +getclrhvm(JNIEnv *env, jobject obj) +{ + jvalue v; + + if ((*env)->MonitorEnter(env, obj) != JNI_OK) { + fprintf(stderr, "getclrhvm: MonitorEnter failed\n"); + return 0; + } + v.j = (*env)->GetLongField(env, obj, F_SQLite_Vm_handle); + (*env)->SetLongField(env, obj, F_SQLite_Vm_handle, 0); + (*env)->MonitorExit(env, obj); + return (void *) v.l; +} + #if HAVE_SQLITE3 static void * gethstmt(JNIEnv *env, jobject obj) @@ -232,6 +263,21 @@ gethstmt(JNIEnv *env, jobject obj) v.j = (*env)->GetLongField(env, obj, F_SQLite_Stmt_handle); return (void *) v.l; } + +static void * +getclrhstmt(JNIEnv *env, jobject obj) +{ + jvalue v; + + if ((*env)->MonitorEnter(env, obj) != JNI_OK) { + fprintf(stderr, "getclrhstmt: MonitorEnter failed\n"); + return 0; + } + v.j = (*env)->GetLongField(env, obj, F_SQLite_Stmt_handle); + (*env)->SetLongField(env, obj, F_SQLite_Stmt_handle, 0); + (*env)->MonitorExit(env, obj); + return (void *) v.l; +} #endif #endif @@ -244,6 +290,21 @@ gethbl(JNIEnv *env, jobject obj) v.j = (*env)->GetLongField(env, obj, F_SQLite_Blob_handle); return (void *) v.l; } + +static void * +getclrhbl(JNIEnv *env, jobject obj) +{ + jvalue v; + + if ((*env)->MonitorEnter(env, obj) != JNI_OK) { + fprintf(stderr, "getclrhbl: MonitorEnter failed\n"); + return 0; + } + v.j = (*env)->GetLongField(env, obj, F_SQLite_Blob_handle); + (*env)->SetLongField(env, obj, F_SQLite_Blob_handle, 0); + (*env)->MonitorExit(env, obj); + return (void *) v.l; +} #endif #if HAVE_SQLITE3 && HAVE_SQLITE3_BACKUPAPI @@ -255,6 +316,21 @@ gethbk(JNIEnv *env, jobject obj) v.j = (*env)->GetLongField(env, obj, F_SQLite_Backup_handle); return (void *) v.l; } + +static void * +getclrhbk(JNIEnv *env, jobject obj) +{ + jvalue v; + + if ((*env)->MonitorEnter(env, obj) != JNI_OK) { + fprintf(stderr, "getclrhbk: MonitorEnter failed\n"); + return 0; + } + v.j = (*env)->GetLongField(env, obj, F_SQLite_Backup_handle); + (*env)->SetLongField(env, obj, F_SQLite_Backup_handle, 0); + (*env)->MonitorExit(env, obj); + return (void *) v.l; +} #endif static void @@ -770,7 +846,7 @@ callback(void *udata, int ncol, char **data, char **cols) static void doclose(JNIEnv *env, jobject obj, int final) { - handle *h = gethandle(env, obj); + handle *h = getclrhandle(env, obj); if (h) { hfunc *f; @@ -782,7 +858,13 @@ doclose(JNIEnv *env, jobject obj, int final) #endif #if HAVE_SQLITE_COMPILE hvm *v; +#endif + if ((*env)->MonitorEnter(env, C_SQLite_Database) != JNI_OK) { + fprintf(stderr, "doclose: MonitorEnter failed\n"); + return; + } +#if HAVE_SQLITE_COMPILE while ((v = h->vms)) { h->vms = v->next; v->next = 0; @@ -859,6 +941,7 @@ doclose(JNIEnv *env, jobject obj, int final) bk->bkup = 0; } #endif + (*env)->MonitorExit(env, C_SQLite_Database); delglobrefp(env, &h->bh); delglobrefp(env, &h->cb); delglobrefp(env, &h->ai); @@ -866,7 +949,6 @@ doclose(JNIEnv *env, jobject obj, int final) delglobrefp(env, &h->ph); delglobrefp(env, &h->enc); free(h); - (*env)->SetLongField(env, obj, F_SQLite_Database_handle, 0); return; } if (!final) { @@ -2457,9 +2539,13 @@ Java_SQLite_Database__1trace(JNIEnv *env, jobject obj, jobject tr) static void dovmfinal(JNIEnv *env, jobject obj, int final) { - hvm *v = gethvm(env, obj); + hvm *v = getclrhvm(env, obj); if (v) { + if ((*env)->MonitorEnter(env, C_SQLite_Database) != JNI_OK) { + fprintf(stderr, "dovmfinal: MonitorEnter failed\n"); + return; + } if (v->h) { handle *h = v->h; hvm *vv, **vvp; @@ -2475,6 +2561,7 @@ dovmfinal(JNIEnv *env, jobject obj, int final) vv = *vvp; } } + (*env)->MonitorExit(env, C_SQLite_Database); if (v->vm) { #if HAVE_BOTH_SQLITE if (v->is3) { @@ -2493,7 +2580,6 @@ dovmfinal(JNIEnv *env, jobject obj, int final) v->vm = 0; } free(v); - (*env)->SetLongField(env, obj, F_SQLite_Vm_handle, 0); return; } if (!final) { @@ -2506,9 +2592,13 @@ dovmfinal(JNIEnv *env, jobject obj, int final) static void dostmtfinal(JNIEnv *env, jobject obj) { - hvm *v = gethstmt(env, obj); + hvm *v = getclrhstmt(env, obj); if (v) { + if ((*env)->MonitorEnter(env, C_SQLite_Database) != JNI_OK) { + fprintf(stderr, "dostmtfinal: MonitorEnter failed\n"); + return; + } if (v->h) { handle *h = v->h; hvm *vv, **vvp; @@ -2524,12 +2614,12 @@ dostmtfinal(JNIEnv *env, jobject obj) vv = *vvp; } } + (*env)->MonitorExit(env, C_SQLite_Database); if (v->vm) { sqlite3_finalize((sqlite3_stmt *) v->vm); } v->vm = 0; free(v); - (*env)->SetLongField(env, obj, F_SQLite_Stmt_handle, 0); } } #endif @@ -2538,9 +2628,13 @@ dostmtfinal(JNIEnv *env, jobject obj) static void doblobfinal(JNIEnv *env, jobject obj) { - hbl *bl = gethbl(env, obj); + hbl *bl = getclrhbl(env, obj); if (bl) { + if ((*env)->MonitorEnter(env, C_SQLite_Database) != JNI_OK) { + fprintf(stderr, "doblobfinal: MonitorEnter failed\n"); + return; + } if (bl->h) { handle *h = bl->h; hbl *blc, **blp; @@ -2556,12 +2650,12 @@ doblobfinal(JNIEnv *env, jobject obj) blc = *blp; } } + (*env)->MonitorExit(env, C_SQLite_Database); if (bl->blob) { sqlite3_blob_close(bl->blob); } bl->blob = 0; free(bl); - (*env)->SetLongField(env, obj, F_SQLite_Blob_handle, 0); (*env)->SetIntField(env, obj, F_SQLite_Blob_size, 0); } } @@ -3162,6 +3256,7 @@ Java_SQLite_Database_vm_1compile(JNIEnv *env, jobject obj, jstring sql, vv.j = 0; vv.l = (jobject) v; (*env)->SetLongField(env, vm, F_SQLite_Vm_handle, vv.j); + transfree(&tr); #else throwex(env, "unsupported"); #endif @@ -4567,6 +4662,7 @@ JNICALL Java_SQLite_Database__1key(JNIEnv *env, jobject obj, jbyteArray key) len = (*env)->GetArrayLength(env, key); data = (*env)->GetByteArrayElements(env, key, 0); if (len == 0) { + (*env)->ReleaseByteArrayElements(env, key, data, 0); data = 0; } if (!data) { @@ -4585,16 +4681,19 @@ JNICALL Java_SQLite_Database__1key(JNIEnv *env, jobject obj, jbyteArray key) sqlite3_key((sqlite3 *) h->sqlite, data, len); if (data) { memset(data, 0, len); + (*env)->ReleaseByteArrayElements(env, key, data, 0); } } else { if (data) { memset(data, 0, len); + (*env)->ReleaseByteArrayElements(env, key, data, 0); } throwclosed(env); } #else if (data) { memset(data, 0, len); + (*env)->ReleaseByteArrayElements(env, key, data, 0); } /* no error */ #endif @@ -4612,6 +4711,7 @@ Java_SQLite_Database__1rekey(JNIEnv *env, jobject obj, jbyteArray key) len = (*env)->GetArrayLength(env, key); data = (*env)->GetByteArrayElements(env, key, 0); if (len == 0) { + (*env)->ReleaseByteArrayElements(env, key, data, 0); data = 0; } if (!data) { @@ -4630,16 +4730,19 @@ Java_SQLite_Database__1rekey(JNIEnv *env, jobject obj, jbyteArray key) sqlite3_rekey((sqlite3 *) h->sqlite, data, len); if (data) { memset(data, 0, len); + (*env)->ReleaseByteArrayElements(env, key, data, 0); } } else { if (data) { memset(data, 0, len); + (*env)->ReleaseByteArrayElements(env, key, data, 0); } throwclosed(env); } #else if (data) { memset(data, 0, len); + (*env)->ReleaseByteArrayElements(env, key, data, 0); } throwex(env, "unsupported"); #endif @@ -4745,11 +4848,15 @@ JNIEXPORT void JNICALL Java_SQLite_Backup__1finalize(JNIEnv *env, jobject obj) { #if HAVE_SQLITE3 && HAVE_SQLITE3_BACKUPAPI - hbk *bk = gethbk(env, obj); + hbk *bk = getclrhbk(env, obj); int ret = SQLITE_OK; char *err = 0; if (bk) { + if ((*env)->MonitorEnter(env, C_SQLite_Database) != JNI_OK) { + fprintf(stderr, "SQLite.Backup.finalize: MonitorEnter failed\n"); + return; + } if (bk->h) { handle *h = bk->h; hbk *bkc, **bkp; @@ -4765,6 +4872,7 @@ Java_SQLite_Backup__1finalize(JNIEnv *env, jobject obj) bkc = *bkp; } } + (*env)->MonitorExit(env, C_SQLite_Database); if (bk->bkup) { ret = sqlite3_backup_finish(bk->bkup); if (ret != SQLITE_OK && bk->h) { @@ -4773,7 +4881,6 @@ Java_SQLite_Backup__1finalize(JNIEnv *env, jobject obj) } bk->bkup = 0; free(bk); - (*env)->SetLongField(env, obj, F_SQLite_Backup_handle, 0); if (ret != SQLITE_OK) { throwex(env, err ? err : "unknown error"); } @@ -5029,7 +5136,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { JNIEnv *env; - jclass cls; + jclass cls1, cls2; #ifndef _WIN32 #if HAVE_SQLITE2 @@ -5041,11 +5148,16 @@ JNI_OnLoad(JavaVM *vm, void *reserved) if ((*vm)->GetEnv(vm, (void **) &env, JNI_VERSION_1_2)) { return JNI_ERR; } - cls = (*env)->FindClass(env, "java/lang/String"); - if (!cls) { + cls1 = (*env)->FindClass(env, "java/lang/String"); + if (!cls1) { + return JNI_ERR; + } + cls2 = (*env)->FindClass(env, "SQLite/Database"); + if (!cls2) { return JNI_ERR; } - C_java_lang_String = (*env)->NewGlobalRef(env, cls); + C_java_lang_String = (*env)->NewGlobalRef(env, cls1); + C_SQLite_Database = (*env)->NewGlobalRef(env, cls2); return JNI_VERSION_1_2; } @@ -5057,6 +5169,10 @@ JNI_OnUnload(JavaVM *vm, void *reserved) if ((*vm)->GetEnv(vm, (void **) &env, JNI_VERSION_1_2)) { return; } + if (C_SQLite_Database) { + (*env)->DeleteGlobalRef(env, C_SQLite_Database); + C_SQLite_Database = 0; + } if (C_java_lang_String) { (*env)->DeleteGlobalRef(env, C_java_lang_String); C_java_lang_String = 0; diff --git a/lang/sql/jdbc/testg.java b/lang/sql/jdbc/testg.java new file mode 100644 index 00000000..a32942a1 --- /dev/null +++ b/lang/sql/jdbc/testg.java @@ -0,0 +1,26 @@ +import SQLite.Constants; +import SQLite.Database; +import SQLite.Exception; +import SQLite.Stmt; + +public class testg { + public static void main(String[] args) throws Exception { + Database db = new Database(); + db.open(":memory:", Constants.SQLITE_OPEN_READWRITE); + Stmt createTable = db.prepare("CREATE TABLE test (col1)"); + createTable.step(); + createTable.close(); + Stmt beginTx = db.prepare("BEGIN TRANSACTION"); + beginTx.step(); + beginTx.close(); + for (int i = 0; i < 1000000; i++) { + Stmt insert = db.prepare("INSERT INTO test VALUES ('whatever')"); + insert.step(); + insert.close(); + } + Stmt commitTx = db.prepare("COMMIT TRANSACTION"); + commitTx.step(); + commitTx.close(); + db.close(); + } +} |