svn commit: r1567392 - /subversion/trunk/subversion/libsvn_subr/sqlite.c

[br...@apache.org]

Author: breser
Date: Tue Feb 11 20:59:36 2014
New Revision: 1567392

URL: http://svn.apache.org/r1567392
Log:
Wrap the check for broken versions of SQLite in a compile time test.

Bert pointed out that the sqlite3_test_control() API is not stable,
so without this we might not build against future SQLite versions.
This removes some of the checking but it's doubtful that people will
move from say 3.9 to 3.8.3.

* subversion/libsvn_subr/sqlite.c
  (svn_sqlite__open): Only do the test for 3.8 not 3.7 or 3.9.

Modified:
    subversion/trunk/subversion/libsvn_subr/sqlite.c

Modified: subversion/trunk/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sqlite.c?rev=1567392&r1=1567391&r2=1567392&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sqlite.c Tue Feb 11 20:59:36 2014
@@ -1080,6 +1080,7 @@ svn_sqlite__open(svn_sqlite__db_t **db, 
 
   SVN_ERR(internal_open(&(*db)->db3, path, mode, scratch_pool));
 
+#if SQLITE_VERSION_NUMBER >= 3008000 && SQLITE_VERSION_NUMBER < 3009000
   /* disable SQLITE_ENABLE_STAT3/4 from 3.8.1 - 3.8.3 (but not 3.8.3.1+)
    * to prevent using it when it's buggy.
    * See: https://www.sqlite.org/src/info/4c86b126f2 */
@@ -1089,6 +1090,7 @@ svn_sqlite__open(svn_sqlite__db_t **db, 
     {
       sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS, (*db)->db3, 0x800);
     }
+#endif
 
 #ifdef SVN_UNICODE_NORMALIZATION_FIXES
   /* Create extension buffers with space for 200 UCS-4 characters. */