mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-06 06:25:04 +02:00
Code Issues Releases Wiki Activity

[ticket/11438] Move backslash to concatenate the query strings correctly

Browse Source 
Was broken in 03d2c6413c25b1faf7f37ff20625ce986b19eb88

PHPBB3-11438
This commit is contained in:
Joas Schilling 2013-03-15 08:16:37 +01:00
parent dc7afd05eb
commit 8fe776dff7
1 changed files with 30 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
phpBB/docs/sphinx.sample.conf
View File

@ -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 =
}