You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/05/21 22:16:57 UTC
svn commit: r1341189 -
/subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
Author: rhuijben
Date: Mon May 21 20:16:57 2012
New Revision: 1341189
URL: http://svn.apache.org/viewvc?rev=1341189&view=rev
Log:
* subversion/tests/libsvn_wc/wc-queries-test.c
(test_query_expectations): Simplify and consolidate sqlite capability
detection.
Modified:
subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
Modified: subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c?rev=1341189&r1=1341188&r2=1341189&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c Mon May 21 20:16:57 2012
@@ -464,7 +464,7 @@ test_query_expectations(apr_pool_t *scra
{
sqlite3_stmt *stmt;
int r;
- r = sqlite3_prepare(sdb, "EXPLAIN QUERY PLAN SELECT 101010101",
+ r = sqlite3_prepare(sdb, "EXPLAIN QUERY PLAN SELECT 1",
-1, &stmt, NULL);
if (r != SQLITE_OK)
@@ -476,8 +476,7 @@ test_query_expectations(apr_pool_t *scra
if (sqlite3_step(stmt) == SQLITE_ROW)
{
- if (sqlite3_column_count(stmt) == 1
- && sqlite3_column_int(stmt, 0) == 101010101)
+ if (sqlite3_column_count(stmt) < 4)
{
SQLITE_ERR(sqlite3_reset(stmt));
SQLITE_ERR(sqlite3_finalize(stmt));
@@ -531,16 +530,9 @@ test_query_expectations(apr_pool_t *scra
struct explanation_item *item;
/* ### The following code is correct for current Sqlite versions
- ### (tested with 3.6.x, 3.7.x), but the EXPLAIN QUERY PLAN output
+ ### (tested with 3.7.x), but the EXPLAIN QUERY PLAN output
### is not guaranteed to be stable for future versions. */
- if (sqlite3_column_count(stmt) < 4)
- {
- return svn_error_create(
- SVN_ERR_TEST_SKIPPED, NULL,
- "EXPLAIN QUERY PLAN doesn't return 4 columns");
- }
-
/* Names as in Sqlite documentation */
/*iSelectid = sqlite3_column_int(stmt, 0);
iOrder = sqlite3_column_int(stmt, 1);