diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-03-15 08:16:37 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-03-15 08:16:37 +0100 |
| commit | 8fe776dff75497f77a7cd35ebae0db063c2ca769 (patch) | |
| tree | 5d50ca53eb48da960a39a2fc9e657e5993bc3ac1 /phpBB/docs/sphinx.sample.conf | |
| parent | dc7afd05ebc91c2b1e1f7d58db42997b578c0019 (diff) | |
| download | forums-8fe776dff75497f77a7cd35ebae0db063c2ca769.tar forums-8fe776dff75497f77a7cd35ebae0db063c2ca769.tar.gz forums-8fe776dff75497f77a7cd35ebae0db063c2ca769.tar.bz2 forums-8fe776dff75497f77a7cd35ebae0db063c2ca769.tar.xz forums-8fe776dff75497f77a7cd35ebae0db063c2ca769.zip | |
[ticket/11438] Move backslash to concatenate the query strings correctly
Was broken in 03d2c6413c25b1faf7f37ff20625ce986b19eb88
PHPBB3-11438
Diffstat (limited to 'phpBB/docs/sphinx.sample.conf')
| -rw-r--r-- | phpBB/docs/sphinx.sample.conf | 90 |
1 files changed, 30 insertions, 60 deletions
diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf index ba1301942a..cb19d011e3 100644 --- a/phpBB/docs/sphinx.sample.conf +++ b/phpBB/docs/sphinx.sample.conf @@ -10,36 +10,21 @@ source source_phpbb_{SPHINX_ID}_main sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = (SELECT MAX(post_id) FROM phpbb_posts) WHERE counter_id = 1 sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts sql_range_step = 5000 - sql_query = SELECT -\ - p.post_id AS id, -\ - p.forum_id, -\ - p.topic_id, -\ - p.poster_id, -\ - CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, -\ - p.post_time, -\ - p.post_subject, -\ - p.post_subject as title, -\ - p.post_text as data, -\ - t.topic_last_post_time, -\ - 0 as deleted -\ - FROM phpbb_posts p, phpbb_topics t -\ - WHERE -\ - p.topic_id = t.topic_id -\ + sql_query = SELECT\ + p.post_id AS id,\ + p.forum_id,\ + p.topic_id,\ + p.poster_id,\ + CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,\ + p.post_time,\ + p.post_subject,\ + p.post_subject as title,\ + p.post_text as data,\ + t.topic_last_post_time,\ + 0 as deleted\ + FROM phpbb_posts p, phpbb_topics t\ + WHERE\ + p.topic_id = t.topic_id\ AND p.post_id >= $start AND p.post_id <= $end sql_query_post = sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = $maxid WHERE counter_id = 1 @@ -57,36 +42,21 @@ source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main { sql_query_range = sql_range_step = - sql_query = SELECT -\ - p.post_id AS id, -\ - p.forum_id, -\ - p.topic_id, -\ - p.poster_id, -\ - CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, -\ - p.post_time, -\ - p.post_subject, -\ - p.post_subject as title, -\ - p.post_text as data, -\ - t.topic_last_post_time, -\ - 0 as deleted -\ - FROM phpbb_posts p, phpbb_topics t -\ - WHERE -\ - p.topic_id = t.topic_id -\ + sql_query = SELECT\ + p.post_id AS id,\ + p.forum_id,\ + p.topic_id,\ + p.poster_id,\ + CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,\ + p.post_time,\ + p.post_subject,\ + p.post_subject as title,\ + p.post_text as data,\ + t.topic_last_post_time,\ + 0 as deleted\ + FROM phpbb_posts p, phpbb_topics t\ + WHERE\ + p.topic_id = t.topic_id\ AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) sql_query_pre = } |